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,202 Commits 55 Branches 0 Tags
42263a435a1f9dd3314bc0b3b22feb9458fc0ac6
Commit Graph

11647 Commits

Author SHA1 Message Date
Lin
42263a435a Merge pull request #10489 from Seris02/chameleonthing 
Fixes and improvements for chameleon clothes
 2020-01-11 01:12:43 +00:00
Lin
fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing 
modular citadel file destruction but only slightly
 2020-01-11 00:30:58 +00:00
Lin
cd8e83e7c0 Merge pull request #10486 from Seris02/observe 
moves observe to ghost tab instead of sticking it in the ooc tab
 2020-01-10 23:56:46 +00:00
kevinz000
8f60099595 Merge pull request #10488 from Xantholne/xantholne-cowboy02 
Red Dead Redemption 2 but it's a crappy 2D space man game
 2020-01-10 14:01:06 -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
Unknown
753c572a5e I'm about to go into a comma 2020-01-09 11:21:00 -07:00
Seris02
3f7a0f4b7c fixes chameleon cloak icon 2020-01-09 15:07:43 +08:00
Seris02
adfb077a0a chameleon fixes 2020-01-09 15:05:46 +08:00
Unknown
62396bffb1 Clothesmate vending 2020-01-08 22:47:28 -07:00
Unknown
8a8d0bf6da Merge branch 'master' into xantholne-cowboy02 2020-01-08 20:36:22 -07:00
Unknown
afc0ca44f2 Merge branch 'master' into xantholne-cowboy02 2020-01-08 20:35:36 -07:00
deathride58
0b9d566076 Merge pull request #10469 from kevinz000/fail2topic 
Ports fail2topic from Aurora
 2020-01-08 22:19:22 -05:00
Seris02
c7790aba1a moves observe to ghost tab 2020-01-09 10:46:18 +08:00
Ghom
dd6e85ddac Merge pull request #10483 from Putnam3145/fix_limbs 
Fix limb damage
 2020-01-09 03:04:44 +01:00
Putnam
df572996b3 fix limb damage 2020-01-08 15:40:35 -08:00
kappa-sama
f69c67cf5c tabs 2020-01-08 17:03:48 -05:00
kappa-sama
ceea7cd021 moves these over too 2020-01-08 16:47:22 -05:00
kappa-sama
38015d0d02 moves this 2020-01-08 16:45:52 -05:00
kappa-sama
341e076d40 refill 2 2020-01-08 16:43:47 -05:00
kappa-sama
18b78e7671 refill 2020-01-08 16:43:33 -05:00
kappa-sama
ebf8d048fd perhaps? 2020-01-08 16:42:16 -05:00
kappa-sama
c88f58bb67 hm 2020-01-08 16:41:44 -05: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
kappa-sama
933916a386 e 2020-01-08 09:46:58 -05:00
Unknown
4773a3e374 Fuggin Cowboy Clothes 2020-01-08 07:15:42 -07: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