juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,945 Commits 57 Branches 0 Tags
83f15bfada5ebc2fe293fbf8d8eb8d4c20c5ea2b
Commit Graph

22274 Commits

Author SHA1 Message Date
Hitlinemoss
83f15bfada Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo 2025-07-07 18:09:10 -04:00
PJBot
6eec2c5c51 Automatic changelog update 2025-07-07 21:44:41 +00:00
slarticodefast
46ec3b402a New science unlock: the H.A.R.M.P.A.C.K (#38824) 2025-07-07 23:43:33 +02:00
PJBot
41f737e8f3 Automatic changelog update 2025-07-07 19:20:35 +00:00
Голубь
114ec579f5 JumpBoots Attempt №2 (#36862) 
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: unknown <wainzor1337@gmail.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
 2025-07-07 21:19:28 +02:00
PJBot
1c59e087d5 Automatic changelog update 2025-07-07 18:54:25 +00:00
Smugman
f1902ad0e2 Branded lighters addition (#35514) 
* newlighters

* port complete

* donk pocket box addition

* should fix test fail, proper credit

* captalisation issue

* fixed

* typo corrected

* removed accidental change to combat bakery

* fixed lock message, made NT flippo start fueled.

* Requested changes

* fixed discount dan

* moved matchbox

* requested changes, discount dan more broken than ever (somehow)

* unbungle

* uhhhhh

* maybe fixes?

* changed inheritance

* fixed enum?

* nevermind

* finally fixed

* breaking changes

* inheritance unbungled
 2025-07-07 14:53:17 -04:00
slarticodefast
7b2346563f Merge stable into master (#38825) 2025-07-07 19:19:47 +02:00
SlamBamActionman
2181585030 Add Breach of Permanent Confinement to Space Law (#38663) 
* Initial commit

* Fix category in text
 2025-07-07 19:01:52 +02:00
Winkarst-cpu
ae3b3b6173 Cleanup: Remove `TelephoneComponent.RequiresPower` (#38823) 
* Cleanup

* Forgot about yml
 2025-07-07 17:55:09 +02:00
slarticodefast
b1fb01fed5 Stable merge (#38822) 2025-07-07 14:39:12 +02:00
PJBot
b2866de07a Automatic changelog update 2025-07-07 05:09:01 +00:00
AsnDen
021551ede3 Golden pai (#38549) 
* Golden pai

* Make golden PAI public and rare

* Golden PAI = legendary salvage
 2025-07-07 01:07:52 -04:00
PJBot
52a8414f71 Automatic changelog update 2025-07-06 23:51:17 +00:00
Andrew Malcolm O'Neill
c183458056 Reducing the amount of space in the gogo hat (#38808) 
Reducing the amount of space in the hat from 7*4 to 4*3 to make a bit more sense with the fact it is only a hat.

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-07-07 01:50:11 +02:00
PJBot
2aca49bb55 Automatic changelog update 2025-07-06 23:43:20 +00:00
Hannah Giovanna Dawson
5f7db3b151 Scurret displacement map fixes (#38775) 2025-07-07 00:42:13 +02:00
Hannah Giovanna Dawson
f5fd2dcb76 Scurret naming fixes (#38776) 
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-07-07 00:30:44 +02:00
Vasilis The Pikachu
575694e5b5 Changelog removal 2025-07-07 00:10:04 +02:00
Vasilis The Pikachu
87b8f1c7df Revert "Readds the Hypereutactic Blade for traitors, adds Hypereutatic blade for Nukies (#37182)" 
This reverts commit c03afeb29c.

Please check the maintainer meeting for details
 2025-07-07 00:02:16 +02:00
Vasilis The Pikachu
b650d3298e Revert "HoP's beret (#38601)" 
This reverts commit e9c90fe66d.

Please check the maintainer meeting for details
 2025-07-07 00:01:55 +02:00
PJBot
51ccaa7ab4 Automatic changelog update 2025-07-06 16:55:27 +00:00
slarticodefast
22e3d533d3 Catchable items, playable basketball (#37702) 
* catching

* fix

* improve

* fix linter

* cleanup

* fix prediction

* do the same here

* fix comment
 2025-07-06 09:54:20 -07:00
slarticodefast
cb21b72600 merge staging into master (#38799) 2025-07-06 15:21:26 +02:00
lzk
81a4429189 fix centcom pda (#38796) 2025-07-06 15:20:57 +02:00
Hannah Giovanna Dawson
654a459351 Scurrets get emergency EVA suit access (#38778) 
* Scurrets - spacing protection via adorable outfits

* ALPHABETIZATION!!
 2025-07-06 15:08:56 +02:00
poklj
8f381157b3 Move moth movement modifiers to the Base (#38795) 2025-07-06 14:07:55 +02:00
PJBot
2ba10ce02c Automatic changelog update 2025-07-06 01:00:41 +00:00
Nemanja
ab201b6e82 Stasis bed cleanup and bugfixes. (#38762) 
* Stasis bed sent to shed

* Code Review

* Code Review 2
 2025-07-06 02:59:31 +02:00
Andrew Malcolm O'Neill
7aaccb5b98 Fixing incorrect headset being given to QM visitor (#38785) 2025-07-06 02:57:31 +02:00
github-actions[bot]
08e76606a9 Update Credits (#38786) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2025-07-06 02:56:41 +02:00
Boaz1111
bd0b4857da Meta.json cleanup - pins.rsi (#38781) 
cleanup
 2025-07-05 23:40:02 +02:00
slarticodefast
5ec8f86541 merge staging into master (#38779) 2025-07-05 22:34:16 +02:00
Hannah Giovanna Dawson
3540e2e44a Scurret PDA slot fix (#38777) 2025-07-05 22:15:54 +02:00
PJBot
750ce78965 Automatic changelog update 2025-07-05 09:30:06 +00:00
PJBot
94fa94d4d4 Automatic changelog update 2025-07-05 06:30:03 +00:00
Perry Fraser
6cefc412a3 fix: spellbooks can have infinite charges (#38376) 
* fix: spellbooks can have infinite charges

* refactor: indicate infinite spellbook charges with null

Not sure if I like this much better...
 2025-07-04 23:28:56 -07:00
Kyle Tyo
78e8d98137 UnlockNode command to LEC. (#38751) 
* commit

* Update UnlockNodeCommand.cs

* commit

* move command locale to its own file.

* Update Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-07-05 01:14:12 +02:00
PJBot
24d0453609 Automatic changelog update 2025-07-04 23:08:03 +00:00
Mora
edbde7b7b9 Vox scars (#38592) 
* Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl

* Revert "Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl"

This reverts commit c73da55ba3b39ddf93b493aecd85604c54dd8a15.

* locale key fix

* Changed top surgery scar names to be more generalized

* Adjusted face scars

* Formatting fixes

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
 2025-07-04 19:06:55 -04:00
PJBot
a4ac8eec82 Automatic changelog update 2025-07-04 21:51:51 +00:00
Perry Fraser
4905e097c8 feat: allow mopping evaporating puddles (#38743) 2025-07-04 23:50:44 +02:00
Arthur Fiorese de Andrade
c3267c6db0 Fix Hristov description - remove inaccurate technical specs (#38746) 
- Removes inaccurate 'armor piercing 14.5mm shells' reference
- Replaces it with a more funny description, matching the style of the other snipers and guns
- Keeps ammunition type '.60 anti-materiel ammo' specification
- Fixes issue #38590

Co-authored-by: Arthur Fiorese de Andrade <aandrade@cmcxs.gov.br>
 2025-07-04 22:41:49 +02:00
Minerva
d5d3864784 Typofixes for figurine dialogue (#38737) 
* Typofixes for figurine dialogue

* Forgot two
 2025-07-04 14:46:23 +02:00
PJBot
7b6cc535dd Automatic changelog update 2025-07-04 05:09:52 +00:00
Velken
e82064916a [BUGFIX] Fixed revenant malfunction ability not working properly only MediBots and Stasis bed (#38664) 
* fixed

* clean up

* orks fix smart

* review fix 1

* more requested changes

* less cursed

* more descriptive description

* better wording
 2025-07-03 22:08:45 -07:00
PJBot
a2ac401db3 Automatic changelog update 2025-07-04 02:03:42 +00:00
Tiniest Shark
71d839fec4 Janitor Tool: Wire Brush (#38667) 
* Wow! It's -brush-

* spacing.

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

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

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

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

* fixed changes

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-07-03 19:02:35 -07:00
Minerva
fba22e831d Fixes missing underwear FTLs (#38720) 2025-07-03 17:50:00 -07:00
PJBot
22b2b0561a Automatic changelog update 2025-07-04 00:05:33 +00:00