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

9245 Commits

Author SHA1 Message Date
āda
1b74de6dbb Fix Wizard/Librarian PDA flashlight visual (#36064) 
the other light
 2025-03-25 02:21:59 +01:00
āda
2bc3561868 Fix misplaced pixel on Wizard/Librarian PDA (#36060) 
* nudge that pixel

* new base

* whoops, leftovers
 2025-03-25 01:11:04 +01:00
slarticodefast
9502ca0d23 Fix thermal regulation this time for real (#36062) 2025-03-24 16:55:16 -07:00
Emisse
b1af9ac89e Relic improvements (#35507) 2025-03-24 10:36:44 -06:00
Vortebo
4530749f1d lol im dum 2025-03-23 20:05:55 -05:00
Vortebo
b566eef796 pickup truck and beds 2025-03-23 16:56:30 -05:00
ScarKy0
c8f5b480cb Package loot tables part 2: Engineering (#36026) 
* MAIL!!!!

* changes
 2025-03-23 19:46:58 +01:00
ScarKy0
9e1a150829 Package loot tables part 1: Medical (#35895) 
* :3

* oops

* moved file, comments
 2025-03-23 14:53:02 +01:00
ScarKy0
1859975ae6 Chemistry bottle cleanup (#35911) 
* init

* clean

* god save me

* fuck relic

* i HATE HATE  HATE relic

* make it stop

* please make it stop

* CEASE

* PLEASE

* Revert "PLEASE"

This reverts commit 47d34f3c1e657adf869d84a5349f9c18fc33bfea.

* Revert "CEASE"

This reverts commit 147ab6697807b98e24b0e1ee05571a1995f3c41c.

* Revert "please make it stop"

This reverts commit f2a4f63e5f5b017f2b4ad3511e8c77700abed58b.

* Revert "make it stop"

This reverts commit b10c6344bd9e9e3f1989b29fc46a8de7829e382e.

* Revert "i HATE HATE  HATE relic"

This reverts commit a05d60c0055fa003f7746be7aec2ebf4acd6e136.

* Revert "fuck relic"

This reverts commit e44f3368bc8aa5938095dc5a60e9390fbaf8aba3.
 2025-03-23 13:24:55 +01:00
RedBookcase
64faddf77a Fixed some unintended salvage changes. (#36013) 
* Fixed some unintended salvage changes.

* Update Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml

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

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-03-23 01:21:29 +01:00
Vortebo
113e335ca8 Merge remote-tracking branch 'upstream/master' into relic-improvements 
need to merge
 2025-03-22 15:08:21 -05:00
Boaz1111
559d22c86c unrevivable lets you be cloned again (#36008) 
weh
 2025-03-22 15:42:20 +01:00
YoungThug
c2963d47a0 Prisoner Jumpsuit Description (#36005) 
* PrisonerJumpsuitFix

* Update jumpskirts.yml
 2025-03-22 00:39:33 -07:00
āda
2dc7236a71 Recolor some machine boards (#35715) 
* recolor

* Revert for easier review

This reverts commit 20709a6e1f1ac9c99cb030ee56156c8ed4bcc291.

* spacing

* colors

* Revert "spacing"

This reverts commit 92d2d4fc6ee918d13cc8f1f82ce720b94e25d4a8.
 2025-03-21 12:40:35 +03:00
TeenSarlacc
6e82ac9f81 Add a crate with foam force weapons to the cargo catalog (#35824) 
* made up a nice lil crate

* changed rifle count to 4, added to cargo console

---------

Co-authored-by: TeenSarlacc <baddiepro123@gmail.com>
 2025-03-21 12:39:54 +03:00
Tiniest Shark
e72a086815 Grenade + Throwable Inhands (#35974) 
* Added inhands to grenades, bolas, ninja stars, and some bombs.

* whoops bolas were wrong hands

* Couple more quick fixes whoops
 2025-03-21 12:37:02 +03:00
ArtisticRoomba
280ac8b3ed Fix thermoregulation (#35981) 
* fix thermoregulation

* req
 2025-03-21 12:36:16 +03:00
K-Dynamic
8a3ae8e5ca dragon ai faction fix (#35578) 
* dragon ai faction fix

* xeno faction
 2025-03-21 01:13:00 +01:00
SonicHDC
4415c2448d More coat zips! (#35029) 
* Update meta.json

* Sprites Exp

* Update meta.json

* More zips for coats
 2025-03-20 22:46:51 +01:00
SlamBamActionman
43d08100b9 "New player" admin logging improvements (#35961) 
* Initial commit

* Adjust a whoooole bunch of logs

* Also spears

* Track going crit

* Review fix

* Review fixes
 2025-03-20 20:56:51 +01:00
Ed
07a8a02522 vox inhands displacements (#35947) 
vox inhands
 2025-03-20 18:01:39 +01:00
psykana
98730a5485 C4 helmet unequip delay (#35922) 2025-03-20 09:33:47 -07:00
metalgearsloth
9292e3a43c Sloth's subfloor vismask adventure (#35347) 
* Add a subfloor vismask

Significantly cuts down on sent entity count.

* More optimisations

* Fix command

* Fixes

* namespace cleanup

* Review

* Vismasks

* Content update

* Bandaid

* awewa

* Revert these

* reh

* Update Content.Shared/SubFloor/TrayScannerComponent.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-03-21 00:57:04 +11:00
paige404
2e7f01b99e Fix broken layer hiding on clothes with multiple equipment slots (#34080) 
* Fix broken layer hiding on clothes with multiple equipment slots

* Refactor ToggleVisualLayers, HideLayerClothingComponent, and ClothingComponent to allow more
precise layer hide behavior and more CPU efficient layer toggling.

* Adjust HumanoidAppearaceSystem to track which slots are hiding a given layer (e.g. gas mask and welding mask)
Add documentation
Change gas masks to use the new HideLayerClothingComponent structure as an example of its usage

* Fix the delayed snout bug

* Misc cleanup

* Make `bool permanent` implicit from SlotFlags

any non-permanent visibility toggle with `SlotFlags.None` isn't supported with how its set up. And similarly, the slot flags argument does nothing if permanent = true. So IMO it makes more sense to infer it from a nullable arg.

* Split into separate system

Too much pasta

* Remove (hopefully unnecessary) refresh

* Fisk mask networking

AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Keep old behaviour, use clearer names?

I'm just guessing at what this was meant to do

* english

* Separate slot name & flag

* dirty = true

* fix comment

* Improved SetLayerVisibility with dirtying logic suggested by @ElectroJr

* Only set mask toggled if DisableOnFold is true

* FoldableClothingSystem fixes

* fix bandana state

* Better comment

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
 2025-03-21 00:30:47 +11:00
SeamLesss
a0c78e7b18 Medical Item In-Hand Sprites (#34984) 
* Bruizepack fix and Gauze

* tourniquet sprites added

* medipen sprites

* bodybag sprites

* handheld crew moniter sprites

* implanter sprites

* rollerbed sprites

* health analyzer sprite

* bloodpack sprite

* small rollerbed change

* attributuions + spacing fix

* fixed?

* RAAAAAGH ITS DONE

* actually good code

* Update Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json

* Update Resources/Textures/Objects/Specific/Medical/healthanalyzer.rsi/meta.json
 2025-03-19 22:18:01 -04:00
GaussiArson
672c96ef6c Removed the heat damage from disablers and disabler SMGs (#35834) 
removed the heat damage from disablers and disabler SMGs
 2025-03-19 18:50:18 -07:00
mubururu_
d3ee9f8bc5 some robotics inhands (#33676) 
* real

* spacing stuff and fix tiny issue
 2025-03-19 21:43:00 -04:00
Velken
003b667aa6 Mail Bag (#35702) 
* mail bag

* fix

* cute envelope in the bag sprite

* Update Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/meta.json

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-03-19 18:32:39 -07:00
SeamLesss
4bb1a62f22 Add In-hand Sprites for miscellaneous items (#35433) 
* guh???

* Merge branch 'master' of https://github.com/SeamLesss/space-station-14

* incomplete baseball bat

* bling

* attribution

* camera bug

* damp rag

* cap cap

* centcom cap

* Update Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
 2025-03-19 21:04:41 -04:00
mubururu_
eb5610b745 inhand sprites for Produce (#35151) 
* awakening

* fix test fail

* attribution fix

* tomater killer inhandered

* extrorange inhand spin rate nerfed

* fuck webedit
 2025-03-19 20:53:48 -04:00
MisterImp
7a539b3568 Fix recipe and animation for copypasta (#35925) 
* Fixed animation and recipe for Copypasta

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-03-19 17:35:34 -07:00
Tiniest Shark
b1c89d059c snake can now be seen inhand and worn on neck like friend (#35323) 
* snake can now be seen inhand and worn like friend

* Roomba's additions

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Update Resources/Textures/Objects/Fun/toys.rsi/meta.json

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Spacing adjustment

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-03-19 16:14:17 -07:00
āda
ef9c896972 Donk Co. Microwave heats twice as fast (#35937) 
hot donk!
 2025-03-19 15:33:02 -07:00
slarticodefast
988cb08760 Add a code comment to the trait prototype files (#35936) 
code comment
 2025-03-19 15:25:53 -07:00
SlamBamActionman
1d4ff1b0d1 Metagame improvements to antag-before-job selection system (#35830) 
* Initial commit

* Update the selection to only count for people who have one of the preferences assigned; latejoin on delay no longer applies pre-selection.
 2025-03-19 18:28:25 +01:00
claustro305
2516868bdc Adjust small light hitbox (#35920) 2025-03-19 16:07:35 +01:00
YoungThug
097b93886b Renaming the "Mime Cap" to "White Cap" (#35901) 
* MimeCapRename

* FixedTheName

* FIXITAGAIN
 2025-03-18 16:54:02 -07:00
Smith
a5027e430c Smite Vendor Restock and General Soda Machine Balance (#35144) 
* Inventory Buff and Enabling Restock

* Smite rebalance

* Rebalance and swapping contraband inventory positions

* Yet another rebalance

* Spaceup rebalanced, removed Smite from machine.
 2025-03-18 16:45:19 -07:00
slarticodefast
c72fd448cd Killer tomatos take damage from weedkiller and plantbgone (#35898) 
* tomatobgone

* formatting
 2025-03-18 11:00:44 +03:00
slarticodefast
6c46fe5307 Paradox Clones receive the implants the original has (#35906) 
* copy implants to paradox clones

* Minor fixes

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
 2025-03-17 22:21:56 -07:00
beck-thompson
15a5cebdcd Chameleon vests now act like winter coats (#34929) 
First commit
 2025-03-17 19:39:04 +01:00
SlamBamActionman
dc4e8a2972 Increase storage size of Syndicate Backpack (#35888) 2025-03-17 10:58:56 -07:00
Errant
2b83d9bf89 add missing unknown shuttle ghostrole mindroles (#35892) 2025-03-17 17:27:08 +01:00
MilenVolf
f8ccff1363 Localize criminal records reason placeholder dataset (#35810) 
* Localize criminal records reason placeholder dataset

* Forgor
 2025-03-16 19:43:37 -04:00
slarticodefast
197ee78bfa make paradox clone receive the original's objectives (#35829) 
* make paradox clone receive the original's objectives

* remove redundant indexing

* Minor comment change

* fix ninja objectives

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
 2025-03-16 15:24:47 -07:00
Errant
29cbc4a190 Mark all hostile mind roles as antag (#35832) 
* dummy antag prototypes

* I'll deal with YOU later!

* remove redundant soloantag definitions

* doctor, we left the scalpel in the patient

* minor cleanup
 2025-03-16 23:11:31 +01:00
slarticodefast
d8ed9fe152 Paradox clones get all storage items the original has. (#35838) 
* recursive storage copying

* include slime storage

* future proofing

* remove survival box
 2025-03-16 15:02:19 -07:00
Kyle Tyo
b378c5e455 Fix holopads phasing through walls. (#34300) 
* change holopad mask from subfloormask lowimpassable to tabletopmachinemask opaque

* change masks to prevent laser collisions

followed the artifact analyzer for this one. I don't quite understand how fixtures work so I'm a bit perplexed by this.

* Boolean I command you: LOWERCASE
 2025-03-16 01:41:50 +01:00
slarticodefast
d5372db359 Merge staging into master (#35859) 2025-03-15 23:25:04 +01:00
slarticodefast
b878e80929 HOTFIX: Fix paradox clone event (#35858) 
fix paradox clone event
 2025-03-15 23:10:24 +01:00