cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-25 09:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,497 Commits 55 Branches 0 Tags
901b54b7e8d79d59eb51b9387d2bf4d4aaa1628c
Commit Graph

6963 Commits

Author SHA1 Message Date
Trilbyspaceclone
4b7e5916bf Update crates.dm 2020-02-01 01:09:35 -05:00
Trilbyspaceclone
fa40490915 Update sheet_types.dm 2020-02-01 01:08:14 -05:00
Ghom
e7589715a8 Fixing chap armaments beacon. 2020-02-01 05:13:29 +01:00
Ghommie
7ce0369e48 Oh man. 2020-02-01 05:05:07 +01:00
Ghommie
07b6d278a1 fixed and brutalized clown op slippery weapons a little. 2020-02-01 04:48:40 +01:00
ShadeAware
c46c683664 FIXES FANCY SWITCHBLADES 
ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!!
 2020-01-31 21:12:08 -05:00
Ghom
3519fbc909 F 2020-02-01 02:16:52 +01:00
Ghom
c9e315a9e6 Merge pull request #10781 from r4d6/RPD 
RPD icon reorder, less building pixelhunting
 2020-02-01 01:48:59 +01:00
Ghom
fddd79b466 Merge pull request #10777 from Citadel-Station-13/kevinz000-patch-4 
Gangs can now only tag with GANG spraycans, rather than lathed spraycans
 2020-02-01 01:44:19 +01:00
Ghom
327bfcac2f Merge pull request #10786 from Commandersand/frick 
made the centcomm suit syndies order be a variant with no sensors
 2020-02-01 01:42:55 +01:00
Ghommie
ab4aa29576 clown ops infiltrator consistency. 2020-02-01 00:02:31 +01:00
Artur
54cd2585cf Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-01-31 23:18:51 +01:00
Putnam
425f532f76 WHOOPS 2020-01-31 13:12:50 -08:00
Putnam
809f57a15d also added kill-once objectives 2020-01-31 12:25:19 -08:00
Putnam
29e0ac52c4 fuzzy objectives 2020-01-31 11:52:05 -08:00
Tupinambis
5f58173038 I kinda completely fucked my original stunbaton PR. This is just a rePR of it. 2020-01-31 11:55:52 -06:00
YakumoChen
4c4fda8091 line ending 2020-01-31 14:14:34 +00:00
YakumoChen
89134d8b30 updates fancy 
the boxes actually work now
 2020-01-31 08:52:45 -05:00
Arturlang
d26ca9dbf0 Fixes this 2020-01-31 13:57:30 +01:00
YakumoChen
1ed4b90e5f update fancy 2020-01-31 07:14:58 -05:00
YakumoChen
065691ca1e adds ring boxes to fancy 2020-01-31 06:33:13 -05:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Seris02
81039b131b fixes 2020-01-31 09:49:08 +08:00
Tupinambis
ffa7590203 Status Displays should now actually work 2020-01-30 16:07:26 -06:00
Ghom
15e5f0ef5d Merge pull request #10644 from ShadeAware/master 
Craftable Switchblades: The Finale
 2020-01-30 21:30:55 +01:00
Ghommie
fe9f86d7c2 A 2020-01-30 20:25:37 +01:00
Ghommie
d84798ff32 rogue one. 2020-01-30 19:47:08 +01:00
Arturlang
83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
Ghommie
d2520ee5f4 Topic_input helper removal. 2020-01-30 19:45:01 +01:00
Commandersand
27c915ec75 honk 2020-01-30 02:04:48 -06:00
Seris02
dbb6218e0d merp 2020-01-30 14:54:07 +08:00
kevinz000
e6e545b1f2 Merge pull request #9860 from Ghommie/Ghommie-cit374 
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
 2020-01-29 20:15:22 -07:00
Ghom
1caa2af4cf Update weaponry.dm 2020-01-30 04:05:35 +01:00
Ghommie
05567e2292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit538 2020-01-30 03:42:50 +01:00
Ghom
793cc26ddc Update weaponry.dm 2020-01-30 03:28:47 +01:00
Ghom
096d9e01e1 Update weaponry.dm 2020-01-30 03:19:04 +01:00
Ghom
b2ca380a13 Update weaponry.dm 2020-01-30 03:15:24 +01:00
r4d6
58b969b8c6 Update RPD.dm 2020-01-29 20:34:57 -05:00
Ghommie
0dba1b5102 added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP. 2020-01-30 02:17:02 +01:00
kevinz000
0e1c46150f Merge pull request #10767 from KeRSedChaplain/gangnerf 
Removes stim packs from gangs
 2020-01-29 16:24:51 -07:00
kevinz000
0f4e30c2db Update crayons.dm 2020-01-29 16:13:29 -07:00
Ghom
7839724013 Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2 
Brain surgery can now fix an abductee's mindsnap objectives
 2020-01-29 05:34:49 +01:00
Ghom
44c141f009 Merge branch 'master' into hugbox_meteor_time 2020-01-29 02:28:12 +01:00
Putnam
d358913bde linter is right, whoops 2020-01-28 17:26:32 -08:00
Ghom
3671f58612 Merge pull request #10751 from Citadel-Station-13/kevinz000-patch-14-1 
traitor+bro now have a minimum population of 25
 2020-01-29 02:16:38 +01:00
Ghom
cf3466252e Merge pull request #10694 from Citadel-Station-13/kevinz000-patch-4 
[s] more reasonable reagent logging
 2020-01-29 01:59:09 +01:00
kevinz000
3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527 
Ported further runtime fixes by AnturK.
 2020-01-28 17:57:26 -07:00
kevinz000
3d3086ac23 Merge pull request #10736 from Citadel-Station-13/Ghommie-patch-3 
An oversight with one of the new area helper procs.
 2020-01-28 17:55:39 -07:00
KeRSe
9c18d4fdad makes stimulants no longer purchasable by gangs 2020-01-28 15:53:29 -05:00
Ghom
fbe79edc24 Merge pull request #10752 from Owai-Seek/cargocratetglass 
6 More Crates
 2020-01-28 18:08:58 +01:00