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-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,146 Commits 55 Branches 0 Tags
36a6daa26f3e389ced2655c13919cac3ae288545
Commit Graph

11631 Commits

Author SHA1 Message Date
Putnam
36a6daa26f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos 2020-01-09 19:09:38 -08:00
Putnam
bdda3f940c it works 2020-01-09 18:55:56 -08:00
Lin
e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490 
Ports reagents id removal and typepath usage.
 2020-01-10 01:34:39 +00:00
Lin
c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447 
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
 2020-01-10 01:31:20 +00:00
Ghommie
825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
Lin
ee5d6a3d4a Merge pull request #10449 from Ghommie/Ghommie-cit498 
Improves the set_APTFT verb into a proc.
 2020-01-10 00:38:06 +00:00
Putnam
a7cf509230 relief valve. 2020-01-09 03:43:06 -08:00
deathride58
0b9d566076 Merge pull request #10469 from kevinz000/fail2topic 
Ports fail2topic from Aurora
 2020-01-08 22:19:22 -05:00
Ghom
dd6e85ddac Merge pull request #10483 from Putnam3145/fix_limbs 
Fix limb damage
 2020-01-09 03:04:44 +01:00
Putnam
fdbbcfe59a it's functional, sprite time 2020-01-08 17:05:43 -08:00
Putnam
df572996b3 fix limb damage 2020-01-08 15:40:35 -08:00
kevinz000
6a350d5d58 Merge pull request #10442 from Trilbyspaceclone/patch-264 
Halfs the nutriments in sugar
 2020-01-08 13:40:39 -08:00
kevinz000
2944a902c6 Merge pull request #10447 from Arturlang/Bloodsucker_tweaks 
[READY] Bloodsucker tweaks
 2020-01-08 13:36:24 -08:00
kevinz000
5f03f5e3d8 Merge pull request #10457 from r4d6/Voice-Copy 
Add a playback device and make the Voice Analyzer actually care about languages.
 2020-01-08 13:33:54 -08:00
kevinz000
1e6d05dc59 Merge pull request #10470 from deathride58/deletesminers 
[s] adds a cooldown to area creation attempts
 2020-01-08 13:29:36 -08:00
Arturlang
cc174d91ec Reviewer suggestion 
Co-Authored-By: Lin <linzolle@gmail.com>
 2020-01-08 22:02:50 +02:00
Artur
e16f1d2f21 Makes regen coles not heal instead of affecting aheal 2020-01-08 21:01:37 +01:00
Artur
039248dac7 Kills legion core healing 2020-01-08 20:29:30 +01:00
Ghom
f263a3ea31 Merge pull request #10474 from Putnam3145/fix-traitor-again 
[s] Fixes traitors
 2020-01-08 13:48:12 +01:00
Putnam
26064e0992 crap 2020-01-07 17:37:57 -08:00
Putnam3145
b09ef97ae3 Merge pull request #10305 from BlackMajor/Yeehaw 
Various Mining borg changes. And some extras.
 2020-01-07 16:50:21 -08:00
BlackMajor
05a644cc41 Revert "Merge branch 'master' into Yeehaw" 
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
 2020-01-08 12:26:45 +13:00
BlackMajor
972c03f79f Merge branch 'master' into Yeehaw 2020-01-08 12:25:50 +13:00
BlackMajor
b41c9cd844 Sync with master 2020-01-08 12:25:22 +13:00
Artur
cff6a094d7 Aaand buffs stakes 2020-01-07 21:21:12 +01:00
Artur
97a9ad4714 Nerfs cloak some more 2020-01-07 19:22:39 +01:00
Artur
81f1349cea Nerf Stamina and cloneloss 2020-01-07 18:41:17 +01:00
Artur
7141223f49 All ready now, forgot how stat worked 2020-01-07 18:39:13 +01:00
deathride58
6f2cf0b636 [s] adds a cooldown to area creation attempts 2020-01-07 10:04:09 -05:00
kevinz000
ab2292dfd5 Fail2Topic 2020-01-07 04:48:39 -08:00
kevinz000
4599abde4a Merge pull request #10420 from MrJWhit/radiation-plasma-usage 
Increase radiation plasma usage in radiation collector
 2020-01-06 19:46:42 -08:00
BlackMajor
5a97259ba9 Fix a couple of bugs, add wrapping paper and destination tagger 2020-01-07 15:33:16 +13:00
Lin
2ce3b7fbf5 Merge pull request #10455 from Ghommie/Ghommie-cit501 
Porting some runtime fixes.
 2020-01-07 01:00:25 +00:00
Lin
46420a693d Merge branch 'master' into Ghommie-cit425 2020-01-07 00:28:37 +00:00
Ghom
d07d436ba2 Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo 
cargo tweaks, new shit, why do digitigrade sprites exist
 2020-01-06 21:47:15 +01:00
Artur
d283532d97 Removes tresspass handcuff removal 2020-01-06 20:49:14 +01:00
Artur
41f96c0dc9 Whoopsie 2020-01-06 20:31:55 +01:00
Artur
4fc6aa10be Adds a cooldown for revival 2020-01-06 20:29:10 +01:00
Artur
8a193304ee Buffs torpor without coffin 2020-01-06 20:22:39 +01:00
Artur
b0cb6aab5c Final commit hopefully 2020-01-06 17:26:36 +01:00
Artur
00d0d8c415 Whoops indentation 2020-01-06 12:31:54 +01:00
r4d6
f6099f341b Allow Voice Analyzers to recognize languages 2020-01-05 23:55:31 -05:00
r4d6
6d3345d166 Add the Playback Device 2020-01-05 23:32:44 -05:00
Lin
7ad6021472 Merge pull request #10437 from Ghommie/Ghommie-cit497 
Fixes roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!
 2020-01-06 03:49:52 +00:00
Ghommie
dcb2ae77fa Porting some runtime fixes. 2020-01-06 02:14:25 +01:00
Ghommie
75d47c2a0d Improves the set_APTFT verb into a proc. 2020-01-05 23:51:42 +01:00
Ghom
869ed7a4aa Merge pull request #10427 from Hatterhat/beakers-but-quirky 
beaker tweaks: setting transfer values verb on altclick, value tweaks
 2020-01-05 23:08:23 +01:00
Ghom
e18244671f Merge pull request #10350 from Putnam3145/dojo-ghostrole 
Ghost cafe quality-of-life, plus making ghost role eligibility an element
 2020-01-05 23:05:13 +01:00
Ghom
a8741a8462 As you command. 2020-01-05 23:01:35 +01:00
Ghommie
592422ee70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-05 22:53:00 +01:00