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 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,122 Commits 55 Branches 0 Tags
e89e7adda4fdbcaab83085ea99df864e9d39c7d7
Commit Graph

1411 Commits

Author SHA1 Message Date
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
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03: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
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
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
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
Letter N
ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08: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
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
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
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
Putnam
81dc6c7ee5 Ports reftracking from TG. 2020-08-18 20:41:43 -07:00
Letter N
5dff3e9a04 deletes ping 2020-08-18 11:35:10 +08:00
Letter N
90cb13f6af Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-18 10:33:21 +08:00
Letter N
610e25beb7 oops updates asset cache 2020-08-17 20:51:05 +08:00
Detective Google
016fd2ac3c woo yeah yeah woo 2020-08-15 23:55:52 -05:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
silicons
1586625e6b Merge pull request #12960 from timothyteakettle/loadout-you-say 
loadout changes part 1: adds subcategories to the loadout
 2020-08-06 21:59:13 -07:00
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
silicons
ed5aa7c9f7 Merge pull request #12994 from kappa-sama/patch-37 
removes dildo
 2020-08-05 15:27:29 -07:00
silicons
2d697e1867 Merge pull request #12926 from GlitchyCore/master 
Adds a new fun round end sound
 2020-08-05 15:14:20 -07:00
kappa-sama
178976f5e5 no 2020-08-01 16:54:21 -04:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Timothy Teakettle
31963b32a4 subcategories cool 2020-07-29 17:14:07 +01:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Lin
81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental 
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
 2020-07-28 21:51:10 -05:00
Timothy Teakettle
721e018aec loadout stuff 2020-07-28 22:52:00 +01:00
GlitchyCore
cf7678c7d4 hey let's forget to add the filetype to this instead of making sure it would actually work 2020-07-27 14:41:10 -05:00