Commit Graph

158 Commits

Author SHA1 Message Date
slarticodefast
8785085be6 Merge stable into master (#35669) 2025-03-04 22:24:29 +01:00
nikthechampiongr
e8c13fe325 Make implants unshielded (#35667) 2025-03-04 21:56:44 +01:00
slarticodefast
6f1df2b62f Merge stable into master (#35626) 2025-03-02 21:36:14 +01:00
Errant
7bf09bfdb5 add altered silicon to rules (#35455)
* add altered silicon to rules

* skreee

Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>

---------

Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
2025-03-02 20:41:07 +01:00
SlamBamActionman
9c970d203d Remove cellular resistance for slimes (#35583)
* Remove cellular resistance for slimes

* Update guidebook
2025-03-01 21:24:54 +01:00
keronshb
68de58eb66 THE WIZARD (#35406)
* Adds Survivor Antag

* Adds Survivor Role

* Adds Survivor Rule ECS, adds a survivor role event, adds make antagonist to  random global spawn spell

* Moves Survivor Ensurecomp to event handler. Makes Add Survivor Role a broadcast. Adds Survivor Component. Removes redundant briefing.

* Adds Survivor Antagonist role type for admins to keep track of this easier, adds it to Survivor.

* Adds access to survivor game rule system

* Adds Survivor Rule

* Adds end of round survivor text

* Adds end of round reporting logic. Adds logic to start the survivor rule.

* Changes desc from centcomm to shuttle

* survivor (S)

* Checks if they're alive on the shuttle instead of centcomm.

* ftl text selection based on number of survivors.

* Removed Survivor Antagonist, replaced it with Free Agent.

* Adds InvalidForGlobalSpawnSpell tag, checks for it on spawnspell, and adds it to a zombified person.

* Changes logic so we launch the game rule if it hasnt launched yet. Moves rule logic starting to server. Moved survivor rule logic out of event and into Start method.

* Fixes invalid entity issue

* Descs for Survivor Rule and Survivor comps

* Moves Survivor Rule to its own yml

* Checks for dead survivors, changes survivor checks for mind. Adds survivor comp to mind to fix any mindswap issues. Same for invalid survivor tag

* Changes shuttle xform call to just mapid

* Protoid fix

* THE WIZARD

* Wizard spawner

* adds the correct state

* Wizard preset and weight

* Fixes wizard rule

* Weight back to 100%

* Adds Random Metadata

* Wizard locs

* Puts requirements in the right place

* Adds wiz ghost spawner and mob

* wizard spawnpoint fix + shuttle mapping

* wizard loadout + fix wizard spawning + wizard random name

* comment

* Adds Wizard testing

* FIXES SHUTTLE ISSUE BASED REI

* THE WIZARD LOBBY SONG. Special thanks to song creator Chris Remo for allowing us to use this.

* Free Objective ECS + Base Free Objective

* Space Wizard Federation for Wiz Obj issuer.

* Wizard Objectives

* Moves wizard shuttle to base wizard rule. Gives Wizard their objectives. Removes WizardRule

* Renames midround to subgamemodes. Adds wizard sub game mode.

* Adds SubWizard to SubGameModesRule. Adds a SubGameMode with no wizard. Adds No SubGamemodeRule for Wizard preset

* Wizard midround event

* Fixes wizard midround

* Wizard Guidebook

* Removes todo

* Fixes text

* Removes wizard rule ECS, not needed

* Wizard jetpack

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2025-02-25 22:34:07 -07:00
pathetic meowmeow
b7414d85b4 Add microwave recipes to the guidebook (#34105) 2025-02-23 16:24:44 +01:00
GrownSamoyedDog
91678f75da Fixed Guidebook Sorting / Ordering (#34960)
* fixed all yml and cs

* Subjective Rearranging

* fixed my accidentally removed xml endline

* Accidentally included for a different PR

* Added .ThenBy and cleaned up newplayer.yml
2025-02-23 02:00:10 +01:00
ArtisticRoomba
ef4f5cf0a1 Engineering guidebook improvements (#34695)
* engineering guidebook improvements

* whoops

* Changes

* this game is en-US, so it shall be gasses, not gases

* make changes to AccessConfigurator.xml, SolarPanels.xml, TeslaEngine.xml

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-02-14 19:59:19 -08:00
GrownSamoyedDog
8ff90a6d20 Guide Control Button Now Redirects Properly (#34914)
fixed control button - a single line of code
2025-02-06 11:16:57 -08:00
nikthechampiongr
aa83689b1b Implement mrp rule changes pursuant to community votes (#34772) 2025-01-30 20:06:42 +01:00
James Simonson
b9424386c7 Criminal Records Computer Better UX + Filtering (#32352)
* First pass at new Criminal Records Computer

need buttons to highlight.

* Filter status tabs/buttons now activate correctly via UpdateState

* Removed unneeded Directives

* Fix typo + undo VSCode changes

* Implement Emo Feedback

Loc NA and use inject deps
Cannot use inject deps on sprite system.

* try to undo vscode launch.json change

* Added requests + Filter dropdown list + jobs

Fixed maintainer fix requests,
Added Job to announcement channel output
Removed toggle buttons in-place of a dropdown list

* Fixed missed merge conflict

+ fixed an bug with filterstatus not showing on re-open ui

* Update criminal-records.ftl

Fixed lint error. whoops.

* Update Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs

typo

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* impliment chromiumboy feedback

hopefully this will do it....

---------

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
2025-01-29 13:34:49 +03:00
ArtisticRoomba
98c606d760 Engineering guidebook megaupdate v2 (#33062)
Significantly updates the Engineering guidebook (more explicitly the Atmos section) to have a lot more relevant and useful information.

Right now engineering has been getting update after update with no real change to the relevant guidebook entry. This has lead to a lot of out of date information and bad practices being prevalent in the guidebook, something that pains me to read.
2025-01-27 11:42:27 -08:00
Alpaccalypse
b4e2a3693f Special reagents now appear in the guidebook (#34265)
* Special reagents now appear in the guidebook

* Improved guidebook wording for reagent category
2025-01-07 18:45:02 +01:00
nikthechampiongr
2d78b6c930 Implement approved rule changes (#34233) 2025-01-07 17:58:28 +01:00
Booblesnoot42
2c41ed0939 Corrected Cotton Dough Recipe (#33988) 2024-12-29 02:56:23 +01:00
Ed
af7e552d3c Flora clean up (#33839)
* first migrate

* clean up prototypes

* Update polymorph.yml

* Update flora.yml

* and this one

* and this one x2

* and this one x3

* Update migration.yml
2024-12-16 20:20:36 +01:00
Winkarst
48f62da2dc Update APE guidebook to contain Sigma particles, Transformation and colors for effects (#33558)
* Update APE guidebook

* Lang error

* Update Resources/ServerInfo/Guidebook/Science/APE.xml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/ServerInfo/Guidebook/Science/APE.xml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/ServerInfo/Guidebook/Science/APE.xml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/ServerInfo/Guidebook/Science/APE.xml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
2024-12-12 15:24:34 +01:00
Errant
2d6e52b21c vox guidebook update poison regen (#33739)
* vox guidebook regen update

* damage number

* skreee
2024-12-06 09:43:11 +01:00
Saphire
f75be07a05 Merge hotfix #33287 from "stable" into "master"
- Rule amendment - Remove role abandonment aHelp requirement. (#33287)
- Merges PR #33324
2024-11-15 10:11:54 +06:00
Repo
530a741b7b Rule amendment - Remove role abandonment aHelp requirement. (#33287)
* Role abandonment aHelp requirement.

* disable roundstart chat message

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-11-15 13:54:20 +11:00
Pieter-Jan Briers
1bebb3390c Borg type switching. (#32586)
* Borg type switching.

This allows borgs (new spawn or constructed) to select their chassis type on creation, like in SS13. This removes the need for the many different chassis types, and means round-start borgs can actually play the game immediately instead of waiting for science to unlock everything.

New borgs have an additional action that allows them to select their type. This opens a nice window with basic information about the borgs and a select button. Once a type has been selected it is permanent for that borg chassis.

These borg types also immediately start the borg with specific modules, so they do not need to be printed. Additional modules can still be inserted for upgrades, though this is now less critical. The built-in modules cannot be removed, but are shown in the UI.

The modules that each borg type starts with:

* Generic: tools
* Engineering: advanced tools, construction, RCD, cable
* Salvage: Grappling gun, appraisal, mining
* Janitor: cleaning, light replacer
* Medical: treatment
* Service: music, service, clowning

Specialized borgs have 3 additional module slots available on top of the ones listed above, generic borgs have 5.

Borg types are specified in a new BorgTypePrototype. These prototypes specify all information about the borg type. It is assigned to the borg entity through a mix of client side, server, and shared code. Some of the involved components were made networked, others are just ensured they're set on both sides of the wire.

The most gnarly change is the inventory template prototype, which needs to change purely to modify the borg hat offset. I managed to bodge this in with an API that *probably* won't explode for specifically for this use case, but it's still not the most clean of API designs.

Parts for specific borg chassis have been removed (so much deleted YAML) and specialized borg modules that are in the base set of a type have been removed from the exosuit fab as there's no point to printing those.

The ability to "downgrade" a borg so it can select a new chassis, like in SS13, is something that would be nice, but was not high enough priority for me to block the feature on. I did keep it in mind with some of the code, so it may be possible in the future.

There is no fancy animation when selecting borg types like in SS13, because I didn't think it was high priority, and it would add a lot of complex code.

* Fix sandbox failure due to collection expression.

* Module tweak

Fix salvage borg modules still having research/lathe recipes

Engie borg has regular tool module, not advanced.

* Fix inventory system breakage

* Fix migrations

Some things were missing

* Guidebook rewordings & review

* MinWidth on confirm selection button
2024-11-14 11:08:35 -06:00
UBlueberry
3382743086 Minor antagonist guidebook changes (#32824)
* took a two month nap. accidentally pushed too many buttons. let's try this again. added thieves to antagonists.xml

* even after that nap, i don't feel well-rested at all.

* please don't kill me for using webedit

* capitalization, typo

* Apply suggestions from code review (more period moving)

Thanks Evan, very cool

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* guess you could say im not pro-proper noun

* typo

* Update Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml

* ok

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
2024-11-02 01:42:20 +01:00
Errant
23e4f81b30 Traitor activation fix for missing PDA (#30359)
* Implant the uplink if no PDA is found

* comments

* tidy up loose ends

* Whoops usually I start with the namespace, how did I forget it, shame shame

* Consistent data type for starting TC balance, misc changes

* Implant briefing, guidebook

* Update AutoTraitor, add uplink, codeword and briefing parameters to TraitorRuleComponent,  no pda for reinforcements

* engine 5c0ce43

* pass pda to AddUplink

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* nicer string handling

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* case typo 1

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* case typo 2

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* case typo 3

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* minor layout changes

* removed redundant implant check

* minor cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-10-18 14:55:43 +02:00
Calecute
ed83593948 Fix guidebook cakebatter recipe (#32276)
Bugfix: Add 5 milk to cake batter recipe in the guidebook to correctly reflect new recipe
2024-09-18 17:15:34 +02:00
Tayrtahn
320135347f Add guidebook protodata tag: embed prototype values in guidebook text (#27570)
* First clumsy implementation of guidebook protodata

* Support for Properties, format strings

* Better null

* Rename file

* Documentation and some cleanup

* Handle errors better

* Added note about client-side components

* A couple of examples

* DataFields

* Use attributes like a sane person

* Outdated doc

* string.Empty

* No IComponent?

* No casting

* Use EntityManager.ComponentFactory

* Use FrozenDictionary

* Cache tagged component fields

* Iterate components and check if they're tagged
2024-09-12 13:31:56 +03:00
ArtisticRoomba
8894e32a10 Budget insuls leaves behind frayed insulative fibers instead of insulative fibers (#31886)
* Adds fibers-insulative-frayed to fibers.ftl and relevant fibers-insulative-frayed components to budget insuls

* +1 to the "different types of fibers in the game" info under the forensics guidebook entry (pray this is actually correct and accurate)
2024-09-09 12:30:24 +02:00
Ian
9989f5bbaf guide on agrichem and botanicals guidebook update (#31896) 2024-09-07 16:23:00 +10:00
lzk
2871e69268 Moff cooking. Part one. (#30668)
* yml part

* guidebook

* commit

* some fixes

* a little

* change
2024-08-26 12:46:16 +10:00
Boaz1111
2f923d88e4 New head of security weapon:Energy Shotgun (#30643)
* Reset hopefully?

* removes the emergency security orders

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Rewrites the description based on review

Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>

* 7 shots, recharge taking 42 seconds

* minor renaming :godo:

* please work

* Revert "please work"

This reverts commit e84a2618d95ec17f5fd608331176df2ab8b0966c.

* please fix

---------

Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>
2024-08-19 21:14:30 +10:00
Killerqu00
2c98d0a519 clarify what is an important role in rule 12 (#30818)
clarify what is an important role
2024-08-18 21:39:45 -06:00
UBlueberry
2577eb10fd Guidebook updates for Antagonist entries (#31075)
* main antag page + minor antags

* nuuk operatives (greenland)

* "coup d'flop" = "flukies" but for revs

* manifest edgelord

* traitor tot (potato)

* they're coming to get you, barbara

* general changes. posters.

* tfw last minute commit

* traitoration rewritification

* created thieves.xml

* thieves, wow!!
2024-08-18 21:16:05 -06:00
Iztok Bajcar
031ddc0420 Guidebook typo fixes (#31159)
* Fixed typo: access --> accessed

* Fixed typo: 'access restricted' --> 'access-restricted'

* Fixed typo: added 'be'

* Fixed typo: added 'a'

* Fixed typo: 'Asssistants' --> 'Assistants'

* Fixed typo: 'overpressure' --> 'overpressurize'

* Fixed typo: 'outisde' --> 'outside'

* Fixed typo: added a comma

* Fixed typo: added a comma

* Fixed typo: 'aformentioned' --> 'aforementioned'

* Fixed typo: added a comma

* Fixed typo: added a comma

* Fixed typo: 'radition' --> 'radiation'

* Fixed typo: 'turing' --> 'turning'

* Fixed typo: 'appropiate' --> 'appropriate'

* Fixed typo: added 'the'

* Fixed typo: added a dot to ellipsis

* Fixed typo: 'aswell' --> 'as well'

* Fixed typo: 'permanant' --> 'permanent'

* Fixed typo: 'flammmable' --> 'flammable'

* Fixed typo: 'recommmended' --> 'recommended'

* Fixed typo: 'recipies' --> 'recipes'

* Fixed typo: 'pre-adminsitered' --> 'pre-administered'

* Fixed typo: 'resusitated' --> 'resuscitated'

* Fixed typo: 'types' --> 'type'

* Fixed typo: `someones` --> `someone's`

* Fixed typo: 'appy' --> 'apply'

* Fixed typo: added 'to'

* Fixed typo: 'CentCom' --> 'CentComm' (as per https://github.com/space-wizards/space-station-14/pull/29217)

* Fixed typo: 'emergencys' --> 'emergencies'

* Fixed typo: removed a dash
2024-08-18 11:31:48 -04:00
Ed
e659eb992f Custom Taco & Kebabs - FoodSequence 2 (#30905)
* control layer ordering

* sprite update

* taco!

* taco naming gen

* fix separator naming

* some proto fixes

* default naming separation

* fix taco naming

* rat update

* hamsterburger

* organs taco

* remove from spawners

* fixes

* fix separators and lemons

* Update food-sequence.ftl

* randomization offset

* fix

* kebabs refactor

* fix

* skewer weapon

* Update food_single.yml

* Update migration.yml

* suppermatter

* hamlet centered

* hamsburger

* Update dead-0.png

* 20 -> 4 burger layers max

* Update burger.yml

* canReact: false

* capfruit update

* Update burger.yml

* Update burger.yml

* Update produce.yml

* some fixes

* Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* chicken

* Update food-sequence.ftl

* documentation

* fixes

* Update meat.yml

* Update meat.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-08-14 15:04:00 +02:00
Chief-Engineer
691e37c0db Update space law for contraband upate (#30937)
* update space law

* missed a thing
2024-08-12 04:58:20 -05:00
Brandon Hu
dea9a637fb chore(grammar): correct some mistakes (#30916) 2024-08-12 08:25:45 +10:00
strO0pwafel
35819e4ba5 more consistent CentComm naming (#29217)
* first-commit

* second commit

* i think i get git kinda maybe

* all of resources i think

* last easy changes

* oops

* Update Resources/Prototypes/Entities/Clothing/Head/hoods.yml

---------

Co-authored-by: stroopwafel <j.o.luijkx@student.tudelft.nl>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-08-08 20:04:19 +10:00
Errant
eab5030c39 Add vox naming convention to Rules (#30284)
vox naming conventions
2024-07-26 10:19:12 -05:00
IProduceWidgets
9bc9b6b696 Amend spacelaw to allow zookeepers to have tranq shotguns. (#30237)
In loving memory of Harambe May 27, 1999 – May 28, 2016
2024-07-22 04:33:02 -05:00
JIPDawg
aedf52f8ec Removed references to pipestacking and changed example setup in Guidebook (#30181)
Removed references to pipestacking and changed example setup

Co-authored-by: JIP <jipdawg93@gmail.com>
2024-07-19 23:00:00 -04:00
deepdarkdepths
b8ee458188 Remove geras description in Slime Person guidebook page (#30140)
remove entry
2024-07-19 12:04:43 +03:00
kbailey-git
c7ea0490a6 Updated slime storage capacity text in guidebook (#30121) 2024-07-17 15:54:08 -07:00
Nemanja
13bec7a0e9 Sign Resprite (#29806)
* Redone signage

* Signs

* ok this thing now

* alright ig?

* big data

* cryo sign

* new sign
2024-07-17 14:35:18 +10:00
Errant
149b6a89ca Vox guidebook entry (#29713)
* vox guidebook entry

* skreee

* Removed incorrect diet reference
2024-07-09 10:28:33 +10:00
JIPDawg
c8a87ceaab Fixed the guide book entry for Diona's blood type (#29805)
Fixed the entry for Diona's blood type

Co-authored-by: JIP <jipdawg93@gmail.com>
2024-07-08 18:30:41 +10:00
end
84ff5e334b nuke biochem (#29751)
Nuke biomchem again
2024-07-06 00:52:27 +03:00
dffdff2423
05cc7541dd Rename generic drugs (#28989)
* Rename generic drugs

Space Drugs and Stimulents cause quite a bit of confusion.

* Ensure everything is updated to the new names.
2024-06-14 12:53:48 -04:00
MjrLandWhale
222d3b532d Override under-pressure lock-out in air alarm "Fill" mode (#28909) 2024-06-13 15:25:02 -08:00
Zonespace
bc5a6279f5 Fixes a typo in the glossary (#28818)
independance -> independence

Co-authored-by: John Doe <johndoe@gmail.com>
2024-06-10 09:19:24 -04:00
Thomas
fffa1dfd3f Update Cargo Guidebook (#28775) 2024-06-09 14:28:46 -04:00