cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-21 20:28:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
16840 Commits
Author SHA1 Message Date
lolman360 8085ab01d9 culst! 2020-08-18 15:38:59 +10:00
lolman360 6f21b23a87 Fixes Shit. 2020-08-18 14:28:57 +10:00
lolman360andGitHub f2a86f2c42 Update medical_designs.dm 2020-08-18 14:23:09 +10:00
SandPootandGitHub 4d105bb50f A few fixes and stuff (#51) 2020-08-18 01:22:14 -03:00
lolman360andGitHub 8027706bea Update _box_magazine.dm 2020-08-18 13:45:44 +10:00
Letter N 5dff3e9a04 deletes ping 2020-08-18 11:35:10 +08:00
lolman360andGitHub 2d1edc9fa2 Update _box_magazine.dm 2020-08-18 13:30:49 +10:00
lolman360andGitHub 8356dbf20a Update medical_designs.dm 2020-08-18 13:26:32 +10:00
siliconsandGitHub 50eca19658 Revert "load_delay var for /obj/item/ammo_box, nerfs shotgun stripper clips (hatter why'd you pr them)" 2020-08-17 20:20:04 -07:00
Letter N 83df9159de GOONCHAT IS DEAD! LONG LIVE THE KING! 2020-08-18 10:51:13 +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
Enric Gabriel 0aea0b2303 updat 2020-08-17 23:06:41 -03:00
lolman360andGitHub 32c0335a17 Update medical_designs.dm 2020-08-18 10:35:56 +10:00
timothyteakettle d312a5d639 fix tails 2020-08-18 01:32:06 +01:00
lolman360 93fa8b72b8 w e w 2020-08-18 10:05:54 +10:00
lolman360 bb86003510 w e w 2020-08-18 10:04:52 +10:00
timothyteakettle 47424be1c0 tail fix 2020-08-18 00:46:05 +01:00
Enric Gabriel 97796c2141 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-17 14:58:00 -03:00
SandPootandGitHub 66541bbe67 Adds tgstation's fix air for admins (#49) 2020-08-17 14:55:59 -03:00
siliconsandGitHub d35cba095f Merge pull request #13108 from Hatterhat/357-dumdum 
.357 DumDum Rounds (they're adminspawn only don't worry)
 2020-08-17 08:58:00 -07:00
Enric Gabriel cf2c21ea52 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-17 12:06:32 -03:00
Letter N 55bd3ecc26 actual tgui code 2020-08-17 21:07:09 +08:00
Letter N 610e25beb7 oops updates asset cache 2020-08-17 20:51:05 +08:00
lolman360andGitHub 2f14d8998b Update autohydro.dm 2020-08-17 22:42:41 +10:00
SmArtKar e087845745 reee 2020-08-17 13:32:18 +03:00
siliconsandGitHub 3d69f65c6b Merge pull request #13185 from Hatterhat/large-demons 
slaughter demons to MOB_SIZE_LARGE
 2020-08-17 03:15:16 -07:00
siliconsandGitHub 7d2d4d870c Merge pull request #13179 from Detective-Google/if-chain-begoen 
kills an ugly if-chain in inventory code (probably)
 2020-08-17 03:13:48 -07:00
Putnam3145andGitHub 23b4ba3714 Merge pull request #13063 from silicons/supermatter 
Ports /tg/ supermatter - no more infinite stunlock death on charge inertia delaminations
 2020-08-17 03:13:14 -07:00
Putnam 8e9fb8eaae Buffs/hugboxes slaughter demons 2020-08-17 01:39:51 -07: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
Enric Gabriel 7898f1fe3e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-16 23:24:11 -03:00
Timothy TeakettleandGitHub f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
siliconsandGitHub 4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
silicons 8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons 1f0f5d621a Merge branch '13176' 2020-08-16 18:52:48 -07:00
silicons 83b41b1a0f Merge branch '13174' 2020-08-16 18:52:33 -07:00
silicons 384e5ae311 Merge branch '13167' 2020-08-16 18:51:48 -07:00
silicons a1a26d6941 Merge branch '13159' 2020-08-16 18:51:07 -07:00
silicons 66322c4d38 Merge branch '13156' 2020-08-16 18:50:29 -07:00
silicons 451d5e52de Merge branch '13148' 2020-08-16 18:49:57 -07:00
siliconsandGitHub b8686ab0f9 Update _vehicle.dm 2020-08-16 18:49:49 -07:00
silicons bc1fad653b Merge branch '13147' 2020-08-16 18:48:57 -07:00
silicons b767c99bac Merge branch '13144' 2020-08-16 18:48:14 -07:00
silicons 38959b6120 Merge branch '13141' 2020-08-16 18:46:33 -07:00
silicons 9602f0742e Merge branch '13135' 2020-08-16 18:46:06 -07:00
silicons b7b13403b9 Merge branch '13130' 2020-08-16 18:45:54 -07:00
lolman360 09fc795f3b AnPrim 2020-08-17 11:45:24 +10:00
silicons fe7d8860f5 Merge branch '13124' 2020-08-16 18:45:23 -07:00
silicons 53fe2c95c5 Merge branch 'pr-13122' 2020-08-16 18:45:01 -07:00
silicons b56742beb5 Merge branch 'pr-13110' 2020-08-16 18:40:23 -07:00