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

20411 Commits

Author SHA1 Message Date
PJBot
791d7c8f98 Automatic changelog update 2025-03-20 00:36:41 +00: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
mubururu_
752477bff3 consistent grapes (#35125) 
* grape

* seedtributions
 2025-03-19 20:09:50 -04:00
PJBot
7909f87d00 Automatic changelog update 2025-03-19 23:15:25 +00: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
PJBot
97c32d0d70 Automatic changelog update 2025-03-19 22:34:11 +00: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
Emisse
6f1642eb9a loop station minor evac fix (#35912) 2025-03-19 15:40:49 -06:00
TytosB
a4eac94670 Merge branch 'don' of https://github.com/TytosB/space-station-14-loop into don 2025-03-19 15:56:18 -05:00
TytosB
d0ce213b50 maints firelocks 2025-03-19 15:55:58 -05:00
PJBot
916661944b Automatic changelog update 2025-03-19 17:50:05 +00: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
PJBot
5b08838420 Automatic changelog update 2025-03-19 15:08:42 +00: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
PJBot
e27d4b9459 Automatic changelog update 2025-03-18 23:46:27 +00: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
TytosB
0eb30d522b Merge branch 'space-wizards:master' into don 2025-03-18 16:44:59 -05:00
TytosB
196eb0327c evac fix 2025-03-18 16:44:21 -05:00
PJBot
cbcd1091d5 Automatic changelog update 2025-03-18 20:08:15 +00:00
PJBot
0a166e2af0 Automatic changelog update 2025-03-18 08:01:51 +00:00
slarticodefast
c72fd448cd Killer tomatos take damage from weedkiller and plantbgone (#35898) 
* tomatobgone

* formatting
 2025-03-18 11:00:44 +03:00
PJBot
47dbbabe3e Automatic changelog update 2025-03-18 05:23:04 +00: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
PJBot
0c73b24da8 Automatic changelog update 2025-03-17 18:40:13 +00:00
beck-thompson
15a5cebdcd Chameleon vests now act like winter coats (#34929) 
First commit
 2025-03-17 19:39:04 +01:00
PJBot
1367ae5703 Automatic changelog update 2025-03-17 18:00:03 +00:00
SlamBamActionman
dc4e8a2972 Increase storage size of Syndicate Backpack (#35888) 2025-03-17 10:58:56 -07:00
PJBot
55f70f9d2c Automatic changelog update 2025-03-17 16:28:15 +00: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
PJBot
bf59896922 Automatic changelog update 2025-03-16 22:25:54 +00: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
PJBot
03dc35ac92 Automatic changelog update 2025-03-16 22:12:37 +00: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
PJBot
1b34884823 Automatic changelog update 2025-03-16 22:03:26 +00: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
Tayrtahn
4b9d9da074 Fix development and debug configurations for tests (#35625) 
* Move settings from debug.toml to development.toml

* Don't force disable dev config for integration tests

* Force on instead?

* Remove change to PoolManager
 2025-03-16 19:17:45 +01:00
PJBot
eabd0b7f24 Automatic changelog update 2025-03-16 18:16:49 +00:00
Myra
e0a8718f78 Stable merge (#35870) 2025-03-16 15:12:19 +01:00
Vasilis The Pikachu
1a756a6574 Merge remote-tracking branch 'upstream/staging' into stable 2025-03-16 15:09:05 +01:00
PJBot
6cd9c3e16d Automatic changelog update 2025-03-16 00:42:57 +00: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
github-actions[bot]
411a89ce31 Update Credits (#35860) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2025-03-16 01:40:44 +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
Ed
45593b1db7 Puddles on the floor sticking to the walls (#35856) 
Update puddle.yml
 2025-03-15 17:35:49 -04:00
saga3152
36f6438c8e Light replacer is back on the menu (#35857) 
Lights on
 2025-03-15 17:26:38 -04:00
PJBot
8848d74ccc Automatic changelog update 2025-03-15 16:44:56 +00:00