Commit Graph

29118 Commits

Author SHA1 Message Date
Cojoke
620aed5939 Fix QSI Link Range (#30332) 2024-07-24 13:57:45 -07:00
lzk
f210325460 Update Atlas (#30331)
* Update Atlas

connect missed atmos devices (part of #29025)
replace fans in fridge

* remove invalid
2024-07-24 14:52:34 -06:00
lzk
9def96d762 Update Box (#30329)
* Update Box

replace missed tiny fans with directional

* add two more security hardsuits
2024-07-24 14:17:29 -06:00
lzk
687e2c5844 Update Fland (#30330)
replace tiny fans with directional
connect missed external airlocks
2024-07-24 14:12:55 -06:00
lzk
bd4020bdfc Update Cluster (#30327)
replace tiny fans in fridge
2024-07-24 14:12:28 -06:00
lzk
ee641c2dff Update Marathon (#30328)
fans
external airlocks
one escape pod
more airlocks in arrivals
2024-07-24 14:12:21 -06:00
lzk
4536a527df Update Bagel (#30326)
replace tiny fans
fix #29482
2024-07-24 14:11:42 -06:00
Brandon Hu
492fb529df fix(Meta): Resolve every issue. (#30308)
* https://www.ncbi.nlm.nih.gov/pmc/articles/PMC4369587/

* https://www.epa.gov/indoor-air-quality-iaq/what-epas-position-childrens-exposure-secondhand-smokeaerosol
2024-07-24 14:01:24 -06:00
osjarw
aa886ca494 Make NeedHand modifiable for injectorSystem (#29870)
* Get needhand from yml

* MovementThreshold modifiable + inheritdoc
2024-07-24 12:26:52 -07:00
Ed
08f1aa9fa1 Crew goals update (#355)
* randomization goals support

* maps update
2024-07-24 20:52:05 +03:00
Nim
bb20f3a1bc fix Mannequin (#354) 2024-07-24 19:14:18 +03:00
Brandon Hu
c4dcc90972 tweak(GunRequiresWield): State the requirement for gun wielding in the description. (#30301)
* https://en.wikipedia.org/wiki/List_of_LASD_deputy_gangs

* https://knock-la.com/tradition-of-violence-lasd-gang-history/

* https://coc.lacounty.gov/deputy-gangs/
2024-07-24 08:33:14 -04:00
Killerqu00
688a46f903 Move some disabilities traits into a new category (#30102)
split traits into disabilities and quirks
2024-07-24 06:50:19 -04:00
Ed
9c84ce9be0 Currency collect goal (#352)
* simple currency comp

* stack support + weapon cost dnd port

* add collect currency objective conditions

* clean up
2024-07-24 13:28:27 +03:00
Brandon Hu
343496faf8 tweak(chameleon): Add clown suit to chameleon tech (#29307) 2024-07-24 02:04:20 -07:00
PJBot
fc0954085f Automatic changelog update 2024-07-24 08:58:11 +00:00
BombasterDS
8b27ef8a78 Fix: Shelfs and Mannequin disassemble (#30313)
fix shelfs
2024-07-24 01:57:03 -07:00
Ed
bf93349b73 Female bodies support (#350)
* port female parts

* boobs support!

* tiefling boobs confirmed

* Update female_shirt.png

* Update female_shirt.png
2024-07-24 09:11:31 +03:00
mkanke-real
e1f3bdc748 Add spicy rock pizza (#30116)
* Added all the parts to implement spicy rock pizza

* Added sprites for pizza

* Fixed coma formatting in meta.json for pizzas

* Fix formatting and rebalance reagent quantities in pizza.yml

* Flipped Uranium and Radium values to be the correct ratio

* Updated meta.json file to have credit for sprite
2024-07-23 16:22:11 -07:00
PJBot
4f8b634f38 Automatic changelog update 2024-07-23 21:03:13 +00:00
Benjamin Velliquette
a32f9ff711 Fix Reagent Grinder being able to do work without being powered (#30267)
* Check if grinder is powered before doing work

* Use existing extention method.
2024-07-23 14:02:07 -07:00
Ed
c5a6f75def Merge pull request #348 from crystallpunk-14/ed-23-07-2024-upstream
Ed 23 07 2024 upstream
2024-07-23 22:01:51 +03:00
Ed
8c477a67c1 Update centcomm.yml 2024-07-23 21:50:00 +03:00
Ed
3b5e0003c3 Create centcomm.yml 2024-07-23 21:45:41 +03:00
Ed
ea753e5227 Update PostMapInitTest.cs 2024-07-23 21:17:41 +03:00
PJBot
ec071ceca7 Automatic changelog update 2024-07-23 17:48:15 +00:00
Scribbles0
7381df4335 Handless mobs can no longer wipe devices (#30149)
add check for hands
2024-07-23 10:47:07 -07:00
Ko4ergaPunk
e7aa97645b Change drawdepth of some wall-mounted objects (#30274)
drawdepth
2024-07-23 17:41:15 +03:00
Ed
3187006641 disable NukeOps test 2024-07-23 14:19:28 +03:00
Ed
526238bac5 fix 2024-07-23 14:04:13 +03:00
Ed
f348213750 Update arenas.yml 2024-07-23 13:46:57 +03:00
Ed
ed3e896cb8 Update debug.yml 2024-07-23 13:40:19 +03:00
Ed
0190e366a3 maps fix 2024-07-23 13:27:58 +03:00
Ed
9826b9ff38 Update goblin.yml 2024-07-23 13:16:49 +03:00
Tornado Tech
86b746217d Fix all shit 2024-07-23 20:12:10 +10:00
Ed
17d0e6326e Create cp14-ignoredPrototypes.yml 2024-07-23 12:51:48 +03:00
Ed
ab8655040b Update InventoryComponent.cs 2024-07-23 12:34:48 +03:00
Ed
f71dffb746 update displacements 2024-07-23 12:30:49 +03: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
Ed
918709cb47 Displacement maps big update (#30093)
* split logic into own system

* add support for different size displacement maps

* some clothes may not use displacement maps

* displacement maps spport hand sprites

* Update DisplacementMapSystem.cs

* rename things

* fuck stencilmask

* fix bugs

* no masks

* Update jumpsuits.yml

* fix species specific sprites

* Update ClothingSystem.cs

* shoes + ears displacement, some bugfix

* Update DisplacementMapSystem.cs
2024-07-23 12:04:09 +03:00
Tornado Tech
e806655c9d Wave shader WIP (#288)
* Created wave shader

* more to _CP14 folders

* add to tree

* fix

* pipiipi

* Provided shader uniform to component fields

* Fixed wave shader shit

* goodies

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
2024-07-23 11:27:09 +03:00
lzk
4ff34458cf Lowercase some prototypes names (#29990)
* Lowercase some prototypes names

* huh

* return altar

* apply

* meta map
2024-07-23 11:16:11 +03:00
PJBot
629cd432b9 Automatic changelog update 2024-07-23 08:14:25 +00:00
TheKittehJesus
1f29a5ad36 Fix: Syndie borg can now wield DEsword (#30229)
* Syndie borg can now wield DEsword

* Made child of EnergySwordDouble for borgs
* Made ESword borg module use this new borg DESword

* Removed name property of CyborgDESword so that it now inherits from DESword and added a suffix to differentiate the two in spawn menu
2024-07-23 01:13:18 -07:00
Ed
9f1b4fc51c Melting molds (#347)
* temp tweak

* add metall bars

* melting molds

* add sawing molds table

* sawing sounds

* fix
2024-07-23 10:29:41 +03:00
PJBot
046aa54d0d Automatic changelog update 2024-07-23 06:37:13 +00:00
Errant
eb861d173f Wrong magazine popup (#29046)
* wrong magazine

* a single typo

* removed GunSystem solution

* magazine misfit warnings
2024-07-22 23:36:05 -07:00
PJBot
99c3341dc9 Automatic changelog update 2024-07-23 03:24:10 +00:00
Cojoke
3ab6d5daff Makes the QSI Popup Nicer (#30265) 2024-07-22 20:23:04 -07:00
PJBot
d65c78746e Automatic changelog update 2024-07-23 02:34:47 +00:00