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
25,341 Commits 55 Branches 0 Tags
bf562de84ec84c7accc0cd1e428c7b51aee2c06c
Commit Graph

25341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YakumoChen
0845c6915e adds beanbag to sec lathe 2019-10-26 10:19:01 +00:00
BlackMajor
90d28b7202 whoops 2019-10-26 23:00:12 +13:00
BlackMajor
f3cbd43d8b What if engiborgs could actually build machines 2019-10-26 22:58:28 +13:00
Poojawa
4820efd047 Merge branch 'master' into access-clarifications 2019-10-25 22:24:56 -05:00
CitadelStationBot
b9bf7b726d Automatic changelog generation for PR #9513 [ci skip] 2019-10-25 22:17:32 -05:00
deathride58
8f479492db Merge pull request #9513 from Citadel-Station-13/kevinz000-patch-98 
medibots are now TOXINLOVER (so slimes) friendly
 2019-10-25 23:17:30 -04:00
nik707
b324b8bd51 Merge pull request #9408 from Citadel-Station-13/kevinz000-patch-89 
adminhelp tickets now show the names of admins who use resolve actions on them
 2019-10-25 22:16:27 -05:00
CitadelStationBot
01a01f053f Automatic changelog generation for PR #9539 [ci skip] 2019-10-25 22:16:11 -05:00
deathride58
53fe02e2fc Merge pull request #9539 from Citadel-Station-13/kevinz000-patch-100 
TALLY HO! (adds claymores to the uplink)
 2019-10-25 23:16:09 -04:00
CitadelStationBot
b1dcfad15f Automatic changelog generation for PR #9572 [ci skip] 2019-10-25 22:16:04 -05:00
nik707
187ea6476b Merge pull request #9572 from Citadel-Station-13/canReachInto_1 
Fixes a bunch of CanReach/storage related bugs ("You can no longer stick your hands inside other people and take their things")
 2019-10-25 22:16:02 -05:00
deathride58
be4d694080 Merge pull request #9329 from Citadel-Station-13/kevinz000-patch-87 
makes sprinting take more stamina when buffer is empty to compensate for added regen
 2019-10-25 23:15:11 -04:00
CitadelStationBot
d83b131d09 Automatic changelog generation for PR #9599 [ci skip] 2019-10-25 22:13:07 -05:00
kevinz000
daf4acbceb Merge pull request #9599 from Ghommie/Ghommie-cit264 
Ports "New Revenant icons"
 2019-10-25 20:13:05 -07:00
CitadelStationBot
be084f911f Automatic changelog generation for PR #9603 [ci skip] 2019-10-25 22:12:38 -05:00
kevinz000
49e52eee05 Merge pull request #9603 from Ghommie/Ghommie-cit267 
Unmodularize lavaknights and emags.
 2019-10-25 20:12:35 -07:00
kevinz000
08d139ee2c Merge pull request #9608 from Ghommie/Ghommie-cit272 
Unmodularize Eutactic Blades.
 2019-10-25 20:11:01 -07:00
kevinz000
275ecbf468 Merge pull request #9604 from Ghommie/Ghommie-cit268 
Unmodularize job types
 2019-10-25 20:10:39 -07:00
kevinz000
4eca1ca5ad Merge pull request #9605 from Ghommie/Ghommie-cit269 
Unmodularize vox sounds
 2019-10-25 20:09:52 -07:00
kevinz000
8b22c95479 Merge pull request #9606 from Ghommie/Ghommie-cit270 
Unmodularize research.
 2019-10-25 20:09:26 -07:00
kevinz000
9b7b2ce0b2 Merge pull request #9607 from Ghommie/Ghommie-cit271 
Unmodularize events
 2019-10-25 20:07:48 -07:00
JTGSZ
f97e244cc9 Update deployable.dm 2019-10-25 21:23:52 -04:00
deathride58
6cce995f77 Makes jukeboxes work again after 512.1459's changes to SOUND_UPDATE 2019-10-25 20:59:10 -04:00
Ghommie
d792c25767 resprited wooden and critter crates. 2019-10-26 01:23:00 +02:00
Linzolle
5bafab9447 missing period 2019-10-25 16:34:32 -05:00
MMMiracles
8fb0a68feb Adds Hat Throwing (#45355) 
* adds hat throwing on people and borgs

* clothing flags, hats can knock off non-items, borg hat blacklist check

* prevents hats with items in them from being able to land on heads

* removes extra equip, hats can go on the hatless again, tinfoil fix

* if

* bit flag
 2019-10-25 16:19:19 -05:00
Linzolle
9e89e898ee not again 2019-10-25 15:58:10 -05:00
Ghommie
ce0ba51b61 Fixing schlongs and death. 2019-10-25 12:52:32 +02:00
Ghommie
79c3700d25 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-25 12:42:28 +02:00
Ghommie
cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
Ghommie
514b023779 kev request: admin ooc is no bigger. 2019-10-25 12:30:05 +02:00
Ghommie
c1f84da39e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272 2019-10-25 12:26:17 +02:00
kevinz000
c37088a767 Merge pull request #9609 from BlackMajor/master 
Fixes hilbert hotel sometimes creating a chain reaction that obliterates reality.
 2019-10-25 03:18:18 -07:00
BlackMajor
885b866130 Merge pull request #15 from BlackMajor/BlackMajor-patch-1 
Fixes hilbert hotel starting a chain reaction that obliterates reality sometimes.
 2019-10-25 23:03:15 +13:00
BlackMajor
1705765555 Update hilbertshotel.dm 2019-10-25 23:02:09 +13:00
BlackMajor
2c4cb6f2c4 Merge pull request #14 from Citadel-Station-13/master 
Update base
 2019-10-25 23:00:58 +13:00
CitadelStationBot
e55cb64b78 Automatic changelog generation for PR #9549 [ci skip] 2019-10-24 21:15:39 -05:00
kevinz000
4af2233c5f Merge pull request #9549 from Ghommie/Ghommie-cit252 
Fixes identity transfer not copying digi legs.
 2019-10-24 19:15:33 -07:00
CitadelStationBot
cc0162b5a9 Automatic changelog generation for PR #9579 [ci skip] 2019-10-24 21:13:56 -05:00
kevinz000
bd9443252a Merge pull request #9579 from YakumoChen/shapeshift 
Ports #41638 and #43784, "Wizard Shapeshift now converts damage taken while transformed"
 2019-10-24 19:13:54 -07:00
CitadelStationBot
e87997d753 Automatic changelog generation for PR #9593 [ci skip] 2019-10-24 21:10:19 -05:00
kevinz000
7beb00abba Merge pull request #9593 from Ghommie/Ghommie-cit263 
Fixing gulag teleporter stripping the user of stuff it really shouldn't.
 2019-10-24 19:10:17 -07:00
CitadelStationBot
30d201ee3a Automatic changelog generation for PR #8654 [ci skip] 2019-10-24 21:07:35 -05:00
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54 
ports in the Hilbert's Hotel.
 2019-10-24 19:07:33 -07:00
CitadelStationBot
cea6728e9e Automatic changelog generation for PR #9535 [ci skip] 2019-10-24 21:05:27 -05:00
kevinz000
da502aa31d Merge pull request #9535 from Ghommie/Ghommie-cit247 
Fixing sniper rifles scope datum action oddity.
 2019-10-24 19:05:25 -07:00
CitadelStationBot
debe707432 Automatic changelog generation for PR #9568 [ci skip] 2019-10-24 21:04:17 -05:00
kevinz000
2a57a7c8a6 Merge pull request #9568 from r4d6/patch-3 
[Fix]Make Cells not a viable replacement for the Stock Part Cheese
 2019-10-24 19:04:15 -07:00
kevinz000
236cf328d1 Merge pull request #9567 from BlackMajor/Yote 
Clockwork golems can now use guns
 2019-10-24 19:03:49 -07:00
CitadelStationBot
d301aa1b70 Automatic changelog generation for PR #9594 [ci skip] 2019-10-24 20:57:01 -05:00