lzk
7cf982ff53
update rules ( #2667 )
2024-10-14 01:24:03 +02:00
lzk
f6c0c84219
я просто ахуел от этого пул реквеста! (Port Corporate Law in guidebook) ( #2572 )
2024-10-14 01:37:43 +03:00
Morb0
d9bfc5cdcb
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Maps/cog.yml
# Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png
# Resources/Textures/Structures/Walls/solid.rsi/meta.json
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png
# Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png
# Resources/Textures/Structures/Walls/solid.rsi/solid0.png
# Resources/Textures/Structures/Walls/solid.rsi/solid1.png
# Resources/Textures/Structures/Walls/solid.rsi/solid2.png
# Resources/Textures/Structures/Walls/solid.rsi/solid3.png
# Resources/Textures/Structures/Walls/solid.rsi/solid4.png
# Resources/Textures/Structures/Walls/solid.rsi/solid5.png
# Resources/Textures/Structures/Walls/solid.rsi/solid6.png
# Resources/Textures/Structures/Walls/solid.rsi/solid7.png
2024-09-11 10:56:49 +03:00
lzk
7ab08cf690
LRP rules for main ( #2574 )
2024-09-10 21:43:48 +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
Morb0
721f7bfecf
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# SpaceStation14.sln
2024-08-28 16:40:36 +03: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
Morb0
f0c098a6f6
Fix upstream
2024-08-23 10:00:37 +03: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
Morb0
8572f60456
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Voice/disease_emotes.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
# Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/Networking.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Medical/Chemist.xml
# Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
# Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml
# Resources/ServerInfo/Guidebook/Science/APE.xml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
2024-08-19 08:18:59 +03: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
Morb0
92b31a4f3f
Fix upstream
2024-08-16 15:05:20 +03:00
Morb0
a0bce916fb
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Guidebook/rules.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/europa.yml
# Resources/Prototypes/Maps/origin.yml
2024-08-16 14:29:08 +03: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
Morb0
acf1ff4ec0
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/StatusIcon/faction.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
# Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
2024-08-12 13:18:43 +03: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
lzk
d409865403
Update rules ( #2419 )
2024-08-09 17:16:01 +03: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
Arthur Asimov
b97dcf215a
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# .github/labeler.yml
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json
# Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/Textures/Structures/Power/apc.rsi/base.png
# Resources/Textures/Structures/Power/apc.rsi/broken.png
# Resources/Textures/Structures/Power/apc.rsi/display-charging.png
# Resources/Textures/Structures/Power/apc.rsi/display-full.png
# Resources/Textures/Structures/Power/apc.rsi/display-lack.png
# Resources/Textures/Structures/Power/apc.rsi/display-remote.png
# Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
# Resources/Textures/Structures/Power/apc.rsi/frame.png
# Resources/Textures/Structures/Power/apc.rsi/static.png
2024-08-02 11:29:44 +03: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
Morb0
a5980baa7d
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
# Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/court.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/law.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/security.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/space.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png
# Resources/migration.yml
2024-07-21 07:20:43 +03: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
lapatison
1f776d15f3
Translate Upstream #2401 ( #2402 )
...
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-07-12 00:26:25 +02:00
Morb0
62d69ffeca
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Guidebook/species.yml
# Resources/ServerInfo/Guidebook/Mobs/Species.xml
2024-07-09 19:24:53 +03: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
mhamster
fd7c530fae
Fix Cyborgs.xml typo ( #2313 )
2024-06-21 13:02:12 +02:00
lzk
ae6ed32d03
NewPlayer guidebooks translate ( #2265 )
...
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
2024-06-18 14:52:14 +03:00
lzk
6be1a1bf13
Fix typo in rules ( #2279 )
2024-06-17 23:02:58 +02:00
lzk
aa38ae118a
Move rules to xml ( #2215 )
2024-06-15 12:28:38 +03:00
Morb0
da4af61aee
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs
# Resources/Prototypes/GameRules/events.yml
# Resources/Textures/Objects/Devices/nuke.rsi/meta.json
2024-06-15 10:39:49 +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
Morb0
9888f8fa57
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
# Content.Client/Lobby/LobbyUIController.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Antags/revolutionary.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Antags/zombie.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
# Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/ServerInfo/Guidebook/Controls/Controls.xml
# Resources/ServerInfo/Guidebook/Controls/Radio.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Medical/Chemist.xml
# Resources/ServerInfo/Guidebook/Medical/Medical.xml
# Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
# Resources/ServerInfo/Guidebook/Science/Science.xml
# Resources/ServerInfo/Guidebook/Security/Security.xml
# Resources/ServerInfo/Guidebook/Service/Bartender.xml
# Resources/ServerInfo/Guidebook/Service/Chef.xml
# Resources/ServerInfo/Guidebook/SpaceStation14.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2024-06-14 19:48:52 +03: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
Nemanja
b51e787fd7
new station and shifts guide ( #28799 )
2024-06-09 14:03:47 -04:00
Nemanja
1490fc36d3
Redo new player & controls guidebooks ( #28794 )
2024-06-09 14:02:35 -04:00
UBlueberry
c6ff1e44fb
Guidebook Updates for the Amateur Spessman ( #28603 )
...
* Created NewPlayer.xml
* Created NewPlayer.yml and added it to guides.ftl
* shifted some controls from Space Station 14 to New? Start here!, as well as made a character creation xml to be written later
* switched some stuff between the New? entry and the Space Station 14 entry
* Made everything so nice!!!!!!!!!!!!!!
* fixed formatting inconsistencies
* added a How to use this guidebook section
* build correction and guidebook clarification for other servers
* wrote character creation ig probs fo shizzle
* added new terms to the glossary and alphabetized it
* meh this seems important enough to add
* okay no more shitsec bad idea
* I HATED Roleplaying.xml ANYWAY!!!
* I REALLY REALLY HATED IT ACTUALLYLLL
* Moved Controls and Radio into newplayer.yml, making meta.yml and radio.yml obsolete
* Separated the character creation bits that are just cosmetic from the ones that matter
* also put all the related new player xml files in their own folder
* expanded Radio.xml, kinda fixed survival.xml
* removed the line that mighta maybe sorta possibly could encourage self antag
* thought about this randomly but ICK OCK
* talking is no longer a key part of this game
* moves stuff around, a lot of stuff. basically moves everything but the jobs themselves around
* ah probably should make sure this works first also me when i lie on the internet
* don't be such a grammar nukie
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* okay nevermind that's justified
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* prepare. it is coming. the great reorganization...
* yesyes that's all well and goo- THE REORG IS COMING. THE REORG IS COMING. WAKE UP.
* rename that real quick
* step one begins. first, consolidate existing service entries into their own yaml. this makes botany.yml obsolete.
* update shiftandcrew.yml to only have departments as children also fuck it alphabetization
* consolidated salvage into cargo
* made a new entry for command
* gave salvage a home and service an existence
* made some XML files to be filled out later
* quick rename...
* took some stuff from Intro.txt and i think Gameplay.txt and put it in NewPlayer.xml
* The Great Writing about Departments (25XX, black and white)
* added a bunch of links everywhere
* biochemical is no longer a thing
* service formatinaaaaaaa
* shiny...,,,,,,,,, colo(u)rz..,,,,,,,,,,,,,
* let's get that fixed
* second time i made a typo there as well
* we hate fun around here
* grammar?!???/
* various fixes and more linkings
* oops
* wewlad lol!!
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
2024-06-09 01:00:43 +02:00
Flareguy
f37060fc1b
Ports the singularity's values from vgstation ( #28720 )
...
* ports the singularity values from vgstation
* guidebook fix
* 5000 energy level 6 singulo
2024-06-07 22:15:13 -04:00
Chief-Engineer
b3debf449a
rule fixes first pass ( #28701 )
...
update
2024-06-07 09:03:22 -05:00
