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-20 06:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,497 Commits 55 Branches 0 Tags
901b54b7e8d79d59eb51b9387d2bf4d4aaa1628c
Commit Graph

19666 Commits

Author SHA1 Message Date
Putnam
3d9e84a3f8 Tweaks and fixes 2020-02-01 00:23:45 -08:00
Seris02
3c8dcbbcd2 merp 2020-02-01 16:02:30 +08:00
Trilbyspaceclone
4625d4f25d Update sheet_types.dm 2020-02-01 01:56:41 -05:00
Ghommie
8923810de2 Something about runtime errors. 2020-02-01 07:19:49 +01:00
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
Ghommie
c75774e67a Actual var. 2020-02-01 06:20:23 +01:00
Ghommie
ef3789eeb2 Playback device peeve. 2020-02-01 06:18:22 +01: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
Seris02
fc70b88b06 actually we only need it here 2020-02-01 11:51:15 +08:00
Seris02
20308b54dd exploit fix 2020-02-01 11:48:55 +08:00
Ghommie
07b6d278a1 fixed and brutalized clown op slippery weapons a little. 2020-02-01 04:48:40 +01:00
necromanceranne
66862db7ab Last change to this, now the damage is respected by energy armor 2020-02-01 14:07:23 +11:00
Winter Flare
599185654f Rename, Add item to Loadout 
Renamed scrubs based on color, added Mailman Hat to loadout.
 2020-01-31 21:54:21 -05:00
ShadeAware
c46c683664 FIXES FANCY SWITCHBLADES 
ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!!
 2020-01-31 21:12:08 -05:00
Hatterhat
be525e3f58 good ol twoliner prs 2020-01-31 20:05:27 -06:00
Artur
b4763d947e Kills macrotier 2020-02-01 03:03:55 +01:00
Ghom
3519fbc909 F 2020-02-01 02:16:52 +01:00
Ghom
1745308cc5 Forgot about this. 2020-02-01 02:14:14 +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
5257ab2e00 Merge pull request #10559 from Seris02/custompie 
custom reagent pie smite
 2020-02-01 01:46:15 +01:00
Ghom
7fdabe81ab Merge pull request #10776 from Hatterhat/hecksuitgolres 
heck suit resistances - goliath resistance and also acid-proof
 2020-02-01 01:44:54 +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
Ghom
1c5fe85545 Merge pull request #10793 from Tupinambis/MaskBugFix 
Masks are now PROPERLY hidden my headgear that hides masks (Spacesuits, Hardsuits, Rad Hoods, Etc.)
 2020-02-01 01:41:36 +01:00
YakumoChen
74fd722871 Update ring.dm 2020-02-01 00:28:04 +00:00
YakumoChen
0020977891 this line ending shit is legitimate cancer 2020-01-31 19:05:23 -05:00
IronEleven
fa7b38d3bd Stat Changes 
Changes symptom stats to match tg
 2020-01-31 19:03:30 -05:00
IronEleven
d2e6f4abf0 Comment Typo Fix 
Might as well fix that while I'm in here
 2020-01-31 19:02:59 -05:00
YakumoChen
c120221234 Update ring.dm 2020-01-31 23:13:58 +00:00
Ghommie
af9060cc15 clown ops uplink consistency. 2020-02-01 00:03:58 +01:00
Ghommie
ab4aa29576 clown ops infiltrator consistency. 2020-02-01 00:02:31 +01:00
YakumoChen
35e16c5cd5 Update ring.dm 2020-01-31 22:58:05 +00:00
YakumoChen
6d44e59497 Update ring.dm 2020-01-31 22:56:34 +00:00
Artur
54cd2585cf Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-01-31 23:18:51 +01:00
Lin
235ac2d27c Merge pull request #10815 from Putnam3145/locales-are-bad 
stop it with the unicode spam in the atmos defines
 2020-01-31 22:13:56 +00:00
Artur
256c84a985 Revert "Testmerge fix" 
This reverts commit 3505202ad6.
 2020-01-31 22:36:51 +01:00
Putnam
e70dac7c54 stop it with the unicode spam 
god
 2020-01-31 13:35:17 -08:00
Artur
880e8c3e04 Whoopsie 2020-01-31 22:34:01 +01:00
Artur
3505202ad6 Testmerge fix 2020-01-31 22:31:33 +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
Ghommie
335fd6ffa1 a 2020-01-31 19:32:35 +01:00
Ghommie
7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01: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
Artur
dd1083e7da How did i fuck up this bad 2020-01-31 18:32:12 +01:00
Artur
d0b03877ea Should be right now 2020-01-31 18:24:49 +01:00
Artur
bcb2bfca02 Why did tg remove this 2020-01-31 18:21:00 +01:00