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

30497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hatterhat
b2e3243760 there's no way this should have worked 2020-02-13 21:32:27 -06:00
Hatterhat
c8d0cacf51 bad recipe 2020-02-13 21:08:38 -06:00
Hatterhat
1276453dc4 initial commit - preservahyde 2020-02-13 21:01:28 -06:00
YakumoChen
5c246fd389 diamond ring changes 
More code I stole from RP
 2020-02-14 03:00:31 +00:00
YakumoChen
3f155a9f13 less shitty rings 
stolen from RP
 2020-02-13 21:55:32 -05:00
Detective Google
6c4c4b3f81 removes the crocin from the valentines candy 2020-02-13 19:59:38 -06:00
kevinz000
f3ac55e182 Merge branch 'stuff' of github.com-kevinz000:kevinz000/Citadel-Station-13 into stuff 2020-02-13 15:40:36 -07:00
kevinz000
3865224e78 fine 2020-02-13 15:40:30 -07:00
Arturlang
cf980b52ac Fuck valentines 2020-02-14 00:01:07 +02:00
Linzolle
790b7bf9cc sanity check 2020-02-13 15:20:01 -06:00
Linzolle
083a6e4c19 runtime? 2020-02-13 13:29:07 -06:00
Linzolle
9a87087378 message unnecessary 2020-02-13 13:26:19 -06:00
Linzolle
f890317810 maybe this will work 2020-02-13 13:02:51 -06:00
Linzolle
d22631700c update the fucking craft component because artur forgot to 2020-02-13 12:59:56 -06:00
Artur
7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
Ghom
071c3a143f Update cards_ids.dm 2020-02-13 18:13:14 +01:00
Ghom
bcc7949034 Update names.dm 2020-02-13 18:02:42 +01:00
Ghom
1628934b9f Update cards_ids.dm 2020-02-13 18:00:12 +01:00
Artur
0e4d4811db Rebuild 2020-02-13 17:53:21 +02:00
Artur
c01f78b8e8 Conflict fix 2020-02-13 17:52:28 +02:00
CitadelStationBot
821496e67c Automatic changelog generation for PR #11044 [ci skip] 2020-02-13 09:50:13 -06:00
Ghom
8b44b02f2d Merge pull request #11044 from Arturlang/TGUI_Next_Uplink 
TGUI Next Uplinks
 2020-02-13 16:50:10 +01:00
CitadelStationBot
73fa603aca Automatic changelog generation for PR #10913 [ci skip] 2020-02-13 09:49:05 -06:00
Ghom
28a6384427 Merge pull request #10913 from Feasel/patch-3 
[Balance Pass - Dissection Early Game Buff]
 2020-02-13 16:49:01 +01:00
CitadelStationBot
dedcfc35ca Automatic changelog generation for PR #11035 [ci skip] 2020-02-13 09:42:13 -06:00
Ghom
91824571ff Merge pull request #11035 from Citadel-Station-13/kevinz000-patch-11 
fixes ctf claymores not spawning and buffs them to be armor pierce + less stamina
 2020-02-13 16:42:10 +01:00
CitadelStationBot
fc873f9626 Automatic changelog generation for PR #10997 [ci skip] 2020-02-13 09:40:15 -06:00
Ghom
121b37410a Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20 
Sprites, Tweaks, and Snacks, QoL
 2020-02-13 16:40:12 +01:00
CitadelStationBot
3d181e4616 Automatic changelog generation for PR #11022 [ci skip] 2020-02-13 08:06:30 -06:00
Ghom
a4a9701c98 Merge pull request #11022 from kevinz000/ssprofiler 
ports auto profiler subsystem from tg
 2020-02-13 15:06:27 +01:00
CitadelStationBot
61a6f3e95e Automatic changelog generation for PR #11038 [ci skip] 2020-02-13 08:05:54 -06:00
Ghom
7198637463 Merge pull request #11038 from Citadel-Station-13/kevinz000-patch-7 
STOP_PROCESSING now also removes from currentrun
 2020-02-13 15:05:51 +01:00
Ghommie
23f7879057 taste spam 2020-02-13 14:57:08 +01:00
Artur
be30ca1642 Tweaks the blood type and volume, plus hopefully fixes the lag exploit. 2020-02-13 15:48:37 +02:00
Ghommie
747b84d255 Thank you fermis very cool 2020-02-13 14:47:53 +01:00
Ghommie
d8415aa634 Fixing tongue organ damage spam. 2020-02-13 14:44:08 +01:00
Artur
8c37cfef24 Should work now 2020-02-13 15:26:18 +02:00
Ghommie
c5b4cf0e6b Ok. 2020-02-13 14:06:05 +01:00
Ghommie
315b0a9645 Fixes halved flavor text max length and removing some crappy code. 2020-02-13 14:05:40 +01:00
kevinz000
481f038e01 Update item_attack.dm 2020-02-13 05:40:36 -07:00
kevinz000
5d3f39b1ae Update DNA.dm 2020-02-13 05:39:59 -07:00
kevinz000
87097fb059 Update storage.dm 2020-02-13 05:30:44 -07:00
kevinz000
3aa3fc3614 Update storage.dm 2020-02-13 05:15:19 -07:00
Ghom
fdbef6a93c Update bin.dm 2020-02-13 13:10:36 +01:00
Ghommie
a0dc21b01c ok. 2020-02-13 12:50:08 +01:00
Ghommie
b8cebf8953 Fixing some privates overlays 2020-02-13 12:41:36 +01:00
kevinz000
c1f59512da Merge branch 'stuff' of github.com-kevinz000:kevinz000/Citadel-Station-13 into stuff 2020-02-13 04:15:37 -07:00
kevinz000
863ce5152b Merge remote-tracking branch 'citadel/master' into stuff 2020-02-13 04:14:44 -07:00
kevinz000
4345f01322 Merge pull request #11021 from Ghommie/Ghommie-cit571 
Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.
 2020-02-13 04:11:01 -07:00
kevinz000
4b2624b932 Update interaction_flags.dm 2020-02-13 03:09:56 -07:00