juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,142 Commits 57 Branches 0 Tags
LocalHelperRefactor
Commit Graph

166 Commits

Author SHA1 Message Date
Ed
955145a9a5 Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream 
# Conflicts:
#	Resources/Changelog/Changelog.yml
#	Resources/Credits/GitHub.txt
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
 2024-11-06 16:53:24 +03:00
Ed
16a0b99daf Magic crystal lanterns + Aftertest balance (#532) 
* lamp visual update

* deleete ice floor spell

* mana gift spell

* magic lantern

* wallmount crystal lamps

* QoL

* crafting

* Update StyleNano.cs

* examining simplify

* rings name

* remove snakes modifier

* trinkets update

* remove snakes, add boars and rabbits to demiplans

* Update flashlight.yml

* fix

* Update test.yml

* Update migration.yml

* ыы
 2024-11-04 00:55:15 +03:00
Ed
51f4ec84d5 Demiplan polishing v3 (#529) 
* Wizden PR copy

* sync

* Update DungeonJob.PostGenBiome.cs

* Update DungeonJob.PostGenBiome.cs

* some rebalance

* required exits and enters!

* room fill fix

* snakes nerf

* enable En-US localization for playtest

* guidebook update

* hotfix!!!
 2024-11-02 17:46:19 +03: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
Ed
ae3cbd6092 Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream 
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Temperature/Systems/TemperatureSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
 2024-10-29 11:16:56 +03: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
Ed
35baaacbce Blue amanita flower, mana potions! (#478) 
* merge bloodgrass and red flowers

* delete sprites

* add blue amanita sprites

* restruct alchemy reactions folders

* mana heal and damage reagent

* add gatherable to worldgen

* fixes

* Update sewing_table.yml

* Update Alchemy.xml

* Update Alchemy.xml

* Update migration.yml
 2024-10-04 19:19:13 +03:00
Ed
1df3ed177b Merge remote-tracking branch 'upstream/master' into ed-27-09-2024-upstream 
# Conflicts:
#	Content.Server/Explosion/EntitySystems/TriggerSystem.cs
 2024-09-27 10:22:05 +03:00
Ed
038201bfde Ed 26 09 2024 server fix 2 (#460) 
* fix server rules

* update tavern map, add arena

* Update exp_tavern.yml

* Update arenas.yml
 2024-09-26 19:14:47 +03:00
Ed
622f1a23f3 fix Game map, set only Sandbox Gamemode, add game rules (#459) 
* fix map and gamemod, add rule file

* move
 2024-09-26 17:35:21 +03: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
Ed
cc02a133e0 Merge remote-tracking branch 'upstream/master' into ed-17-09-2024-upstream2 
# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs
 2024-09-17 11:54:36 +03: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
Ed
5b2020d708 Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
 2024-09-08 21:20:54 +03:00
Ian
9989f5bbaf guide on agrichem and botanicals guidebook update (#31896) 2024-09-07 16:23:00 +10:00
Ed
ca656b3c10 Merge remote-tracking branch 'upstream/master' into ed-29-08-2024 
# Conflicts:
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Maps/reach.yml
 2024-08-29 14:32:09 +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
Ed
c82b17a65e Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Traits/speech.yml
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml
 2024-08-19 19:06:38 +03:00
c4llv07e
df6dbd2ac7 Add reaction randomization. (#308) 
* Add random products datafield to the reaciton prototype.

One of the items in the list will be used as additional products as a
result of the reaction and will be persistent per round.

Resolves #245

* Another try

Add getter and setter for the reaction products field and
add random products there.

* There is no such product as CP14BasicEffectHealHeat

* Try to visualize random products in the guidebook

* experimental recipes

* fix

* file restructurization

* Guidebook alchemy update

* Update Alchemy.xml

* fix

* Update mixing_simple.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-08-19 18:04:12 +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
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
Ed
d9336781f1 Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream 
# Conflicts:
#	Content.Shared/Inventory/InventorySystem.Equip.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
 2024-08-12 14:40:15 +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
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
Ed
fb40f8cd25 Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml
 2024-07-28 20:58:48 +03:00
Errant
eab5030c39 Add vox naming convention to Rules (#30284) 
vox naming conventions
 2024-07-26 10:19:12 -05:00
Ed
2367085160 Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Client/Clothing/ClientClothingSystem.cs
#	Content.Client/Hands/Systems/HandsSystem.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Hands/Components/HandsComponent.cs
#	Content.Shared/Inventory/InventoryComponent.cs
#	Content.Shared/Storage/StorageComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/saltern.yml
 2024-07-23 12:24:42 +03: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
Ed
ca843bd84a Merge remote-tracking branch 'upstream/master' into ed-19-07-2024-upstream-walls 
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
 2024-07-19 11:23:38 +03:00
kbailey-git
c7ea0490a6 Updated slime storage capacity text in guidebook (#30121) 2024-07-17 15:54:08 -07:00
Ed
02275a0237 Merge remote-tracking branch 'upstream/master' into ed-17-07-2024-upstream 2024-07-17 23:25:31 +03: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
Ed
0931c9e7d1 Merge remote-tracking branch 'upstream/master' into ed-12-07-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
 2024-07-12 12:53:42 +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
Ed
04d29b6268 Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml
 2024-06-17 14:20:38 +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
Ed
8ff09f552b Merge remote-tracking branch 'upstream/master' into ed-13-06-2024-upstream2 
# Conflicts:
#	Content.Client/Guidebook/GuidebookSystem.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Guidebook/GuideEntry.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/arenas.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/debug.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/reach.yml
#	Resources/Prototypes/Maps/saltern.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/lobbyscreens.yml
 2024-06-13 12:35:00 +03:00
Ed
5e78ac2c22 Revert "Ed 09 06 2024 upstream (#230)" 
This reverts commit 50470c3aaa.
 2024-06-11 15:20:47 +03:00
Ed
bb3c74d557 Revert "Revert "Ed 09 06 2024 upstream (#230)" (#233)" 
This reverts commit b89117f8e6.
 2024-06-11 15:19:52 +03:00
Ed
b89117f8e6 Revert "Ed 09 06 2024 upstream (#230)" (#233) 
This reverts commit 50470c3aaa.
 2024-06-11 15:19:27 +03:00