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-14 20:02:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,498 Commits 55 Branches 0 Tags
a797436f455a5a8a733b51cbbbc839459deedcb5
Commit Graph

423 Commits

Author SHA1 Message Date
silicons
b7650f3dea Merge pull request #13398 from timothyteakettle/wound-config 
wound config values, wound bonus for how damaged a limb is
 2020-10-01 03:02:35 -07:00
silicons
822f1c9bf3 fix 2020-09-27 03:07:51 -07:00
silicons
2dddb2253e tweak 2020-09-21 21:03:28 -07:00
silicons
4ab064a50d fix 2020-09-21 20:58:33 -07:00
silicons
31791df2bd fixes 2020-09-21 20:38:43 -07:00
silicons
2c4dc4d1a9 ok 2020-09-21 19:08:21 -07:00
silicons
ddc7f10de7 fixes 2020-09-21 18:35:42 -07:00
silicons
7249fe058f config based 2020-09-21 17:36:30 -07:00
Enric Gabriel
4de9baf690 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-21 14:10:28 -03:00
silicons
9fef16964c Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-21 03:13:51 -07:00
silicons
c5403b5ef4 fixes 2020-09-20 02:49:42 -07:00
timothyteakettle
c3bea5f77b wounds 2020-09-15 23:50:26 +01:00
timothyteakettle
7be15afb32 config 2020-09-15 23:20:11 +01:00
Artur
c79e9fbc0b https://github.com/tgstation/tgstation/pull/53263 2020-09-02 18:48:09 +03:00
Enric Gabriel
c10471fac9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 01:42:29 -03:00
Letter N
fe17bee28e reverts thing kev said about 2020-08-29 14:36:41 +08: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
Enric Gabriel
b0cf18fc5a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-20 13:29:24 -03:00
Letter N
2dd3d71b19 config&copypaste chang. 2020-08-20 16:36:24 +08:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
silicons
91484356c5 Merge pull request #13183 from SmArtKar/shuttle_hotfix 
Shuttle hotfix so now you can make huge shuttle things
 2020-08-19 21:03:58 -07: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
SandPoot
66541bbe67 Adds tgstation's fix air for admins (#49) 2020-08-17 14:55:59 -03:00
Letter N
610e25beb7 oops updates asset cache 2020-08-17 20:51:05 +08:00
SmArtKar
e087845745 reee 2020-08-17 13:32:18 +03:00
Enric Gabriel
06496434a4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-16 23:30:53 -03:00
SmArtKar
dd64dcc4ea Return of the King(and the limits) 2020-08-16 16:21:17 +03:00
SmArtKar
0a6eca818c Succesfull removal of shuttle limit 2020-08-16 15:59:31 +03:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Enric Gabriel
372b486daf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-01 10:07:19 -03:00
Unknown
16722c47c3 CentCom Galactic Ban DB 2020-07-29 21:39:58 -05:00
Enric Gabriel
05593f84a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 22:13:13 -03:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
Enric Gabriel
310b0e4e91 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 14:53:25 -03:00
Letter N
2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Enric Gabriel
beec77b17d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-11 20:04:30 -03:00
Lin
955d9fa0cc Merge pull request #12624 from Citadel-Station-13/policy 
policy configuration & support hooks for clone memory disorder
 2020-07-11 16:40:38 -05:00
Letter N
05684e7196 no config filter thing yet, but the code for it is "ready" 2020-07-08 16:36:58 +08:00
Letter N
f757e54db9 muh immursion 2020-07-08 15:59:44 +08:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Enric Gabriel
83522c8571 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-04 17:18:13 -03:00
Ghom
871993ce14 Merge pull request #12593 from silicons/autobunker 
adds verb to auto bunker override on linked servers
 2020-07-04 18:36:59 +02:00
silicons
e2975a44a1 Merge branch 'master' into policy 2020-07-02 01:23:19 -07:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Enric Gabriel
a7ce0b7ece Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-29 17:35:25 -03:00
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800 
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
 2020-06-29 12:44:33 -07:00
silicons
c88b7721ad Update policy.dm 2020-06-29 05:03:45 -07:00
silicons
836391075f Update config_entry.dm 2020-06-29 05:03:13 -07:00
silicons
2a0b3ce036 typo 2020-06-26 23:48:56 -07:00