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-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,025 Commits 55 Branches 0 Tags
8a0c932d554f95b83ef133ab22b32e3dbadb9e82
Commit Graph

1888 Commits

Author SHA1 Message Date
silicons
7249fe058f config based 2020-09-21 17:36:30 -07:00
Putnam
e89e7adda4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments 2020-09-21 03:31:35 -07:00
silicons
9fef16964c Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-21 03:13:51 -07:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
silicons
c5403b5ef4 fixes 2020-09-20 02:49:42 -07:00
Ghom
868e464b40 fixes linter issues, removes acid degrading armor (#13399) 
* fix

* more

* Update brawn.dm

* Update ticketmachine.dm
 2020-09-19 15:04:48 +02:00
Artur
74533d3f9d fiiix shit 2020-09-16 11:16:39 +03:00
silicons
ca8b13b86a Merge pull request #13255 from timothyteakettle/limbs 
you can choose limbs to be prosthetic/amputated
 2020-09-16 00:31:18 -07:00
silicons
95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
timothyteakettle
c3bea5f77b wounds 2020-09-15 23:50:26 +01:00
timothyteakettle
7be15afb32 config 2020-09-15 23:20:11 +01:00
Putnam
b06f19cf5c Brought reactions to extools again; now including debug symbols. 
This time they work!
 2020-09-14 19:32:31 -07:00
Putnam
372be3bf5c Fixed all the problems. 2020-09-14 02:37:07 -07:00
Putnam
3ea7f0defa Added a gas mixture counter and fixed a segfault on exit. 2020-09-10 17:42:49 -07:00
Putnam
373f6a1068 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments 2020-09-10 04:57:43 -07:00
Putnam
fb17f0cc75 Somehow made monstermos over 100x as fast 2020-09-10 04:48:55 -07:00
Artur
12fbd67b6d Stupid shit 2020-09-09 21:27:32 +03:00
Artur
ff4c94c2d5 Fixes some verbs and gateway 2020-09-09 21:08:16 +03:00
silicons
07b28f40de Merge pull request #13359 from Ghommie/Ghommie-cit838 
Turf visuals fix plus corrected names of a couple things.
 2020-09-07 13:42:05 -07:00
Hatterhat
e157125033 hrhnghnghn dreamcheckerrrrr 2020-09-07 03:55:37 -05:00
Hatterhat
52678a7e28 doktor...turn off my cringe inhibitors........ 2020-09-06 18:51:13 -05:00
Hatterhat
76df5b0efe travis rerun and test messages gone 2020-09-06 18:00:19 -05:00
Ghommie
4a04b22b72 Turf visuals fix plus corrected names of a couple things. 2020-09-06 18:53:01 +02:00
BlackMajor
1943a2fdd7 Merge pull request #13246 from silicons/anomaly_manufacturing 
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
 2020-09-06 17:53:35 +12:00
Timothy Teakettle
8f6c353ad0 memory leak bad 2020-09-05 21:35:02 +01:00
timothyteakettle
cdaef63fa1 sorry travis 2020-09-03 23:07:19 +01:00
timothyteakettle
90eef6efc9 Merge remote-tracking branch 'upstream/master' into limbs 2020-09-03 22:46:32 +01:00
timothyteakettle
9e2ee588c9 rp prosthetics 2020-09-03 22:05:21 +01:00
Artur
c79e9fbc0b https://github.com/tgstation/tgstation/pull/53263 2020-09-02 18:48:09 +03:00
Artur
542453a7f1 Fixes shidd not working 2020-09-02 18:04:36 +03:00
Artur
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
Hatterhat
00bc4202f7 what the fuck was i thinking coding this 2020-08-29 23:08:51 -05:00
Hatterhat
34861d55a8 fuck it two megas standard 2020-08-29 21:38:31 -05:00
Letter N
fe17bee28e reverts thing kev said about 2020-08-29 14:36:41 +08:00
Letter N
ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
Hatterhat
2c0964a138 god this feels so much worse 2020-08-28 18:31:41 -05:00
Timothy Teakettle
fe25046410 Merge branch 'master' into limbs 2020-08-27 18:06:35 +01:00
silicons
973839dee4 ports my baystruments updates from tg (#13219) 
* subsystem

* fix

* e

* update

* fix
 2020-08-25 21:04:42 +02:00
timothyteakettle
cd7293a9a2 limbs 2020-08-24 03:19:36 +01:00
Timothy Teakettle
e2aeaf8a5b dont need this anymore 2020-08-23 21:55:21 +01:00
Timothy Teakettle
a7a6489f58 loadout loading 2020-08-23 21:48:38 +01:00
silicons
bd5766a8be changes 2020-08-23 05:27:53 -07:00
silicons
7737e76b32 Merge pull request #13224 from Ghommie/Ghommie-cit835 
Removing priority overlays, update_icon() splitup for guns.
 2020-08-22 15:19:07 -07:00
Hatterhat
4364d2c85f thanks travis 2020-08-22 16:17:34 -05:00
Hatterhat
98935054bb lets try not 2 overload it 2020-08-22 15:19:07 -05:00
Letter N
0b159b218a revert moment 2020-08-22 16:30:56 +08:00
Hatterhat
f50390ef80 wow i hate this fucking subsystem 2020-08-22 01:55:20 -05:00
Letter N
afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
silicons
120bcfc00c Merge pull request #13178 from lolman360/plumb 
[READY] ports plumbing (no more waiting for tgui4)
 2020-08-20 21:32:26 -07:00
Hatterhat
463ff6393e uhh remind me to poke at this again 2020-08-20 21:48:05 -05:00