Rinary
591a3c4a50
Новые предметы, фикс супер материи, правки ( #515 )
...
* permission changes
* super matter changes
* NT backpack energy dome
* energy dome is contraband
* fix singularity
* upd
* upd supermatter
* reflector
* upd
* upd
* add meta.json
* fix announcement
* upd
* fix rsi
* fix ids
* return checking for double actions
* fix hydro assembly
* fix x2 hydroponics and chemistry airlock
* upd
* У всех хардсьютов временно забран пнв(переработка хардсьютов под пнв момент)
* peace parts
* clown parts
* upd parts meta
* akms bigger price
* fix
* fix x2
* add clown, peace parts
---------
Co-authored-by: darkrell <rc-alh@outlook.com>
2024-10-30 10:19:36 +03:00
Rinary
42f9ac0dbd
Ребаланс Мехов ( #482 )
...
* Initial commit
* mechs has reflect
* all mechs has powercagehigh
* mechs can only powered by power cages
* powercages on protolathes
* magboots on mechs
* fire cost upped x2
* battery on guns has 200 energy by basic, adds ion gun
* mecha x-ray gun add
* mecha vindictor here
* added amlg 90
* added uvm31
* localization
* burst fire on Ultra
* fix vindictor no desc
* mech has prying
* add scale 1.08
* add scale 1.08 to combat mechs
* Mechs has collision
* buff chain sword
* upd
* some fixes
* fix weapon charging
* Fix UVM-31 "Drake" Sound and Proto particle
* Fix Mech collision, mechs can't stop peoples any more(some thing issues creates if collision is on)
* AMLG90 Has bigger damage
* Stunner uses hos stun spread
---------
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2024-10-10 20:11:43 +03:00
Rinary
e39dfe9e64
Мехи ( #415 )
...
* initial commit
* some sprites
* mech weapons
* syndi mechs to nuke ops uplink
* some loadouts to Nanotrasen mechs
* spawn mark filled mechs
* construction graphs
* researchable mechs
* i forgor
* locale changes
* aaa
* minor translate(big, later)
* fix items in hands
* fix
* upd translate
* translate electronics
* translate mech weapons
* translate
* translate const
* fix rsi
* fix
* fix
---------
Co-authored-by: NULL882 <gost6865@yandex.ru>
Co-authored-by: VigersRay <vigersray@gmail.com>
2024-10-02 06:39:12 +03:00
VigersRay
0a91b468b4
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Client/Voting/UI/VotePopup.xaml.cs
# Content.Client/Voting/VoteManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Power/EntitySystems/BatterySystem.cs
# Content.Server/Radio/EntitySystems/RadioSystem.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
# Content.Server/Voting/Managers/VoteManager.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/Voting/MsgVoteData.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Recipes/Crafting/crates.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
2024-09-26 20:17:14 +03:00
Ed
2ea54b1913
Flora anomaly seeds ( #31987 )
...
* content
* Update meta.json
* Update mobspawn.yml
* Update mobspawn.yml
* Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
* Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
* Update Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
* Update Resources/Prototypes/Entities/Effects/mobspawn.yml
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-21 21:54:56 +02:00
VigersRay
aa38c32b65
upstream
2024-09-16 12:40:23 +03:00
slarticodefast
0d40b0b3e0
Add extradimensional orange, holymelon, meatwheat, worldpeas mutations ( #27624 )
...
* new mutations
* translation string fix
* add haloperidol to plant
* fix
* add FoodSequence
* food sequence fixes
2024-09-14 00:02:54 +10:00
Ed
230ea9be46
Metamorphosis - FoodSequence 3 ( #31012 )
...
* setup some data
* cheeseburger recipe
* Update FoodSequenceSystem.cs
* finalize cheseburger recipe
* remove fun
* return old taco sprites
* full foodsequence data refactor
* return tacos
* well done
* add cutlets to burger
* chickenburger recipe
* +2 burger recipes
* more fun
* Update brain.png
* some slice produce added
* documentation
* watermelon
* skewer work
* flipping
* tomato
* skewer watermelon
* Update skewer.yml
* oopsie, ok, im go to sleep
* fix checks
* Update produce.yml
* screwed
* cheeeeeeeese
* all cooked meat added
* produce added
* aaaaand suppermatter
* key to Tag
* More
* proto string remove
* raw snail
* fix
* Update FoodMetamorphableByAddingComponent.cs
* fixes
* fix3
* fififififx
2024-09-08 02:22:27 -04:00
Nemanja
8599251825
Mineral Scanner ( #31390 )
...
* Mineral Scanner
* doink
* review
* sunday funday
* review and fix bugs i think?
* Update MiningOverlay.cs
2024-09-07 00:05:53 +10:00
VigersRay
c705713fb0
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
# Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json
# Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json
2024-08-29 16:01:10 +03:00
RumiTiger
d9b1369dae
Cherry ( #28962 )
...
* Add files via upload
* Update produce.yml
* Update produce.yml
* Update seeds.yml
* Update flavor-profiles.ftl
* Update flavors.yml
* Update meal_recipes.yml
* Update food_produce.yml
* Update meta.json
* Update seeds.yml
* Update botany.yml
* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json
* Create meta.json
* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json
* Create meta.json
* Update produce.yml
* Update produce.yml
* Update produce.yml
* Update food_produce.yml
* Update food_produce.yml
* Update produce.yml
* Apply suggestions from code review
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Update seeds.yml
* Update juice.yml
* Update juice.ftl
* Update seeds.ftl
* Update seeds.yml
* Update cargo_botany.yml
* Update cargo_botany.yml
* Update cargo_botany.yml
* Update cargo_vending.yml
* Update cargo_vending.yml
* Update seeds.yml
* Update seeds.yml
* Update meta.json
* Update produce.yml
* Cherry Tree
* Alphabetical order
* Update food_produce.yml
* Update food-sequence.ftl
* Update food-sequence.ftl
* Update produce.yml
* Update produce.yml
* Update food-sequence.ftl
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-08-29 11:30:58 +10:00
lzk
98680ce0f2
Change my copyright ( #31599 )
2024-08-28 21:12:09 +02:00
VigersRay
0441b8b814
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Launcher/LauncherConnecting.cs
# Content.Client/Launcher/LauncherConnectingGui.xaml
# Content.Client/Launcher/LauncherConnectingGui.xaml.cs
# Content.Server/Administration/Managers/BanManager.cs
# Content.Server/Medical/Components/HealthAnalyzerComponent.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Content.Server/StationEvents/Events/RandomSentienceRule.cs
# Content.Shared/Interaction/Components/BlockMovementComponent.cs
# Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
# Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Objectives/stealTargetGroups.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Species/human.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/migration.yml
2024-08-22 06:50:04 +03:00
potato1234_x
1952618203
Tea Plant and Blue Pumpkin ( #25092 )
...
* tea plant, blumpkin
* fix linter
* fix tests pls
* bloompkin
* forgor rsi
* work please
* WORK PLEASE
* migration of the blumpkins
* it is now glumpkin
* lowercase
* uppercase
* adjust values and fix blorbo
wtf when did blumpkin donut turn into blorbo donut what
* fix test
* update
* fix stupid mistake
* Update meta.json
* totally not a webedit
* not a webedit 2
* nitpicks
2024-08-18 16:28:18 -06:00
VigersRay
67c8ba2471
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs
# Content.Server/Light/EntitySystems/PoweredLightSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
# Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
# Content.Server/StationEvents/Events/StationEventSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.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/Fun/pai.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# 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/ert.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/OuterClothing/Hardsuits/medical.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png
# 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
# Resources/migration.yml
2024-08-14 19:55:44 +03:00
Ubaser
135d52406a
Add capfruit, a gatfruit mutation. ( #30850 )
...
* add base
* add fake suffix and flavor fix
* address some reviews
* parent it
* fix test fail
* add FoodSequence support and address small review
2024-08-13 13:08:40 +02:00
mhamster
e26e662023
Small json files fixes ( #30907 )
...
Small json fixes
Resources/Textures/Interface/Default/meta.json: trailing comma
Resources/Textures/Objects/Specific/Hydroponics/attribution.json: proper json
Resources/Textures/Tiles/Planet/Snow/meta.json: trailing commas
2024-08-11 23:26:45 +10:00
Ed
4d75cb54c8
Custom burgers - FoodSequence system ( #30755 )
...
* setup foodsequence
* name generation and max layers limit
* move to nutrition
* move code to serverside
* move to appearance data
* marked fields as required
* Update foodsequence.yml
* b
* burgeers!
* Update produce.yml
* Update meat.yml
* Update burger.yml
* fix duplicate naming
* Update Resources/Locale/en-US/nutrition/components/food-sequence.ftl
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* merge flavor profiles
* make food trash List<>
* merge trash
* Update FoodComponent.cs
* Update FoodComponent.cs
* organs and cannabis support
---------
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
2024-08-10 22:31:32 +03:00
MureixloI
3f4e093eaf
[Sprites/Fix] In hand for BlueSpace beaker & CMO's equipped cloak ( #28719 )
...
* [Fix] CMO's equipped cloak
* [Fix] CMO's equipped cloak
* [Sprites] In hands for bluespace beaker
* [Sprites] In hands for bluespace beaker
* [Sprites] In hands for bluespace beaker
* [Sprites] In hands for bluespace beaker
2024-08-09 22:02:26 +10:00
VigersRay
31b2d24e30
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/MagicMirror/MagicMirrorComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Entities/Stations/base.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/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/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/OuterClothing/Coats/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# 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/migration.yml
2024-07-31 03:54:09 +03:00
Alzore
517a62a6dd
Recolor the defibrillator ( #29964 )
...
* tide-ification
* metajoson
2024-07-30 00:41:21 -04:00
BombasterDS
de7df2a760
Some plant mutations ( #28993 )
...
* Some new plants mutations
* glasstle inhand
* gapple trico increase ↑
1-10 to 3-16
* replace trico with doc delight
2024-07-27 18:08:49 +03:00
Vigers Ray
4ee05b0350
Продвинутые борги ( #247 )
...
* Ну типа всё
* InnateItemSystem и фичи для пИИ
2024-07-27 10:23:34 +03:00
VigersRay
5245c5ddcb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
# Resources/Prototypes/Entities/Stations/nanotrasen.yml
# Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.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/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.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/OuterClothing/Coats/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
# 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-monkey.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/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.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/hos.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.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/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit-full.png
# Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit.png
# Resources/migration.yml
2024-06-21 05:04:06 +03:00
Ghagliiarghii
b90c6acacd
golden plunger ( #29043 )
...
* golden plunger
* Add wood material (the handle is still wood)
* 52 hours
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-06-21 00:24:36 +10:00
Ko4ergaPunk
c9e5efce7e
Chemistry bottle resprite ( #2118 )
...
(cherry picked from commit bbebf8bcaf3ec525fc90cbca4fe9430ab32b2679)
2024-06-11 06:47:10 +03:00
VigersRay
fe511dac3e
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-06-04 23:38:42 +03:00
Tayrtahn
a4881f56b0
Add "fill level" sprites to mops and damp rag ( #28590 )
2024-06-04 14:48:24 -04:00
Vigers Ray
5775d4cdef
Merge sunrise build ( #2 )
...
* commit
2024-05-31 02:16:18 +03:00
Mangohydra
8afae8a1f1
Martyr Cyborg Module, borg law 2 explode ( #25815 )
...
* borg law 2 explode
* attributions fix + CL fix
* please dear god work i beg you
* maybe this will work :godo:
* 50% off deal + disc change
* absolving merge conflict
* merge conflict fix
* Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
* Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
* Update Resources/Audio/Effects/Grenades/SelfDestruct/attributions.yml
* Apply suggestions from code review
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2024-04-28 21:16:04 -07:00
potato1234_x
cd90c05ce5
Rainbow Weed ( #25759 )
...
* rainbow weed
* Lipolicide
* psicodine + mannitol
* happiness
* ground + dried + smokables
* damn you notepad++
* fix
WHY NOT TELL ME ALL THE PROBLEMS AT THE SAME TIME!!!
* work
* work i beg you
* recipe good
* possibly fix merge conflict
* remove reagents
2024-04-28 21:06:27 -07:00
Ubaser
008935f6ec
New plant mutation: Pyrotton ( #27200 )
...
* WIP
* sprites n stuff
* flavour
* maybe fix
* add stack
* fix parent
2024-04-28 13:07:36 +02:00
Terraspark4941
34ab1e760d
The Honored Quran (Sprite addition) ( #27400 )
...
The Honored Quran
2024-04-28 02:36:04 +10:00
Gyrandola
fa5b93871f
chili/chilly peppers sprite alignment fix & minor refactorization ( #25971 )
...
* png alignment and minor refactorization
* Update migration.yml
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-20 12:06:48 +10:00
Ed
f3a97fc0c5
Killer tomatoes ( #26053 )
...
* make tomatoes
* many friends! many mommies
* finish
* renaming system
* fix
* Update miscellaneous.yml
* Update Content.Server/NPC/Systems/NPCImpritingBehaviourSystem.cs
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
* N
* deleete exception?
* merge conflict fix
* fix?
* fuck you
* sloth fixes
* fixess?
* fix
---------
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-18 21:21:56 +10:00
Verm
96ad9002f1
You can now see paper on crates (with color!) ( #26834 )
...
* Implement changes on not-cooked branch
* Made it work
* Fix update appearance calls
* Fix extra indents, clean-up code, fix tests hopefully
* Fix hammy cagecrate
* Fix messing up the yml, add artifact crate specific labels back in
* Visual Studio hates yml, sad
* Seperate the colors for cargonia
* sorry json
* make label move with artifact door
* Apply suggestion changes
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Fix remaining crate offsets, add a few for livestock and graves (why are you labeling graves) and coffin label sprites (why are you labeling coffins??)
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-04-14 13:39:02 +10:00
lzk
d5052697aa
Remake hairflowers ( #25475 )
...
* Add more lily usage (orange hairflower and flowercrown)
* comit 2
* ee
* more fixes
* w
* im stupid
* bring poppy in authodrobe
* weh
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-03-31 16:33:23 +11:00
Pieter-Jan Briers
89db4409a4
Remove CRLF, enforce with workflow ( #26401 )
...
* Check for CRLF in actions workflow
Make emisse weep
* Copy paste bottom text
* I would like to thank StackOverflow for this spite PR.
* Mention file name in message because the workflow tab doesn't display it.
* dos2unix everything
2024-03-24 22:06:17 +01:00
Alzore
e5f05b735d
Remove the blue tint from the health analyzer ( #26101 )
...
nomoreblue
2024-03-13 22:04:29 -04:00
metalgearsloth
d0df5ed5fa
Revert "Remove handheld crew monitor ( #24761 )" ( #25439 )
...
* Revert "Remove handheld crew monitor (#24761 )"
This reverts commit bbc6d29d21
2024-02-22 22:00:35 +11:00
potato1234_x
33153aaa2e
Spaceman's Trumpet and Lily ( #25090 )
...
* trumpet + lily +polypy
* trumbet
2024-02-20 23:49:39 -07:00
MjrLandWhale
114f2aa543
Resprite & hand position correction of Nettle & Death Nettle ( #25421 )
...
Resprite of Nettle & Death Nettle. Corrected R & L hand locations for all orientations of both plants.
2024-02-20 18:58:08 -05:00
Moomoobeef
07b796d6d2
Added Evidence Markers for the Detective! ( #25255 )
...
* added evidence markers
* box tweak
* fixed a spelling mistake
* new sprites, tweaked yml too
2024-02-17 15:49:16 -05:00
MilenVolf
c7870882f6
LockVisualizer ( #25224 )
...
* LockVisualizer
* Fix state
* Clean some code
* Make it component, fix tests fail
* Fix for StateUnlocked
Now it is possible to manually set the unlocked state and it will work!
* Optimize LockVisualizer, add check for unlocked state
* No todo I guess
2024-02-16 16:52:31 -07:00
PoorMansDreams
655c7bd677
Buyable Jani Trolley ( #25139 )
...
Trolley
2024-02-11 23:35:19 -07:00
potato1234_x
667cebef52
Laughin' Peas ( #25089 )
...
* laughter
* make clownmobs bleed laughter
* laughin syrup and laughter recipe
* add laughin peas
2024-02-10 00:21:44 -08:00
PoorMansDreams
bd4e2c35ec
Added Tourniquets to stop bleeds ( #23198 )
...
* Fixed Error with RobustToolbox Edits. Removed the addition of secbelt tag from assault belt.
* Resprite of the monstrosity
* Resprite of the tourniquet NO LONGER PHALLUS SHAPED
* too bright, now darker and edgier
* Tourniquet resprite
* metajson yay
2024-02-09 17:57:42 -08:00
metalgearsloth
bbc6d29d21
Remove handheld crew monitor ( #24761 )
...
* Remove handheld crew monitor
- It's supposed to be a CMO computer.
- It's getting powercrept and added everywhere.
* These too
* And this
2024-01-31 22:23:49 +11:00
themias
bd100344a2
Add inhand fill visuals ( #24495 )
...
* Add inhand fill visuals
* oops
* remove unused import
2024-01-28 20:38:06 -05:00
Tayrtahn
424d3c8dc6
Add broken sprites for Vim ( #24458 )
...
* Add broken state sprites for Vim
* And the actual file too
2024-01-23 17:26:30 -05:00
