shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,725 Commits 5 Branches 0 Tags
f26cf4e9ef5701ac5fe26a518c79b37da9e4a51c
Commit Graph

783 Commits

Author SHA1 Message Date
CitadelStationBot f26cf4e9ef Clown Toy Box + Wooden Crates 2017-06-09 11:02:37 -05:00
LetterJay 7fa05ca854 Merge pull request #1489 from Citadel-Station-13/upstream-merge-27960 
[MIRROR] [READY] Gang Points Refactor - Now stored in the gang datum
 2017-06-09 09:37:58 -05:00
LetterJay 0bd03c7fd3 Merge pull request #1504 from Citadel-Station-13/upstream-merge-28209 
[MIRROR] Moves borer completion to gamemode
 2017-06-09 09:36:00 -05:00
LetterJay 06be53ffeb Merge pull request #1405 from Citadel-Station-13/upstream-merge-28049 
[MIRROR] Only human and silicon servants can help recite multi-invoker scriptures
 2017-06-09 09:13:18 -05:00
LetterJay c3ebcf9d69 Merge pull request #1327 from Citadel-Station-13/upstream-merge-27891 
[MIRROR] Fixes black carpet recipe and sprite
 2017-06-09 09:10:08 -05:00
LetterJay 9babd38dc5 Merge pull request #1502 from Citadel-Station-13/upstream-merge-28219 
[MIRROR] Gang - Purchasing the improvised shotgun actually spawns a gun.
 2017-06-09 09:08:16 -05:00
LetterJay 662a647711 Merge pull request #1501 from Citadel-Station-13/upstream-merge-28203 
[MIRROR] Fixes clockwork armor bitflags
 2017-06-09 09:07:27 -05:00
CitadelStationBot 9e0488d2d9 Moves borer completion to gamemode 2017-06-09 09:01:03 -05:00
CitadelStationBot 99ac851f46 Gang - Purchasing the improvised shotgun actually spawns a gun. 2017-06-09 03:42:22 -05:00
CitadelStationBot ff53afcd99 Fixes clockwork armor bitflags 2017-06-09 03:26:59 -05:00
CitadelStationBot e034a6be50 Security record crime details is now a single line input box 2017-06-08 19:08:53 -05:00
CitadelStationBot 1658e48bc1 [READY] Gang Points Refactor - Now stored in the gang datum 2017-06-08 14:46:07 -05:00
LetterJay 00790c0fdd Merge pull request #1315 from Citadel-Station-13/upstream-merge-27866 
[MIRROR] Makes VV'ing ID cards easier.
 2017-06-08 03:43:31 -05:00
LetterJay 190b47983c cleanup 2017-06-08 03:39:13 -05:00
LetterJay 9b840ae323 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27891 2017-06-08 03:36:39 -05:00
LetterJay 923c5b9035 Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881 
[MIRROR] Luxury Bluespace Shelter Capsules, Take 2.
 2017-06-08 03:35:23 -05:00
LetterJay 3563459d15 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27891 2017-06-08 03:33:56 -05:00
LetterJay f367878119 Merge pull request #1277 from Citadel-Station-13/upstream-merge-27773 
[MIRROR] Splits mining_mobs.dm into separate files
 2017-06-08 03:30:13 -05:00
LetterJay 1a71a52372 Merge pull request #1474 from Citadel-Station-13/upstream-merge-28174 
[MIRROR] Moves station's starting state to ticker post setup, instead of gamemode's
 2017-06-08 03:28:18 -05:00
CitadelStationBot 7eedaa87c5 Moves station's starting state to ticker post setup, instead of gamemode's 2017-06-07 20:54:37 -05:00
CitadelStationBot e21e4eac9d Adds creamatoriums 2017-06-07 20:45:26 -05:00
LetterJay e98868e9e1 Merge pull request #1437 from Citadel-Station-13/upstream-merge-28100 
[MIRROR] Hang up holocalls with an action
 2017-06-06 13:30:19 -05:00
LetterJay 8a9db7b4d2 Merge pull request #1432 from Citadel-Station-13/upstream-merge-28094 
[MIRROR] Fixes 28060 : emergency shields have a hit effect instead of setting opacity to 1
 2017-06-06 13:06:23 -05:00
CitadelStationBot 5b53514452 Hulks now take 10 hits to destroy dominators up from 2 2017-06-06 10:40:10 -05:00
CitadelStationBot 98e2a659f4 Hang up holocalls with an action 2017-06-06 10:34:58 -05:00
LetterJay 35b56f3075 Merge branch 'master' into upstream-merge-27773 2017-06-06 09:05:26 -05:00
LetterJay 71bb6c930c Merge pull request #1274 from Citadel-Station-13/upstream-merge-27652 
[MIRROR] [Centcom] Nanotrasen Private Security 2.0
 2017-06-06 09:01:33 -05:00
LetterJay 36a0fe00c3 Merge pull request #1244 from Citadel-Station-13/upstream-merge-27728 
[MIRROR] The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it
 2017-06-06 09:00:27 -05:00
CitadelStationBot 369d8f1142 Fixes 28060 : emergency shields have a hit effect instead of setting opacity to 1 2017-06-06 07:13:05 -05:00
LetterJay fc1017fa14 Merge pull request #1287 from Citadel-Station-13/upstream-merge-27801 
[MIRROR] Holocall cleanup
 2017-06-05 23:19:23 -05:00
LetterJay 2feab0a411 cleanup 2017-06-05 23:18:40 -05:00
LetterJay 962177c423 Merge branch 'master' into upstream-merge-27652 2017-06-05 23:16:40 -05:00
LetterJay 54549d43a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728 2017-06-05 23:07:52 -05:00
LetterJay 0158eded16 Merge pull request #1240 from Citadel-Station-13/upstream-merge-27712 
[MIRROR] Fixes revision stat tracking
 2017-06-05 23:06:50 -05:00
LetterJay b2d288d1f8 Merge pull request #1225 from Citadel-Station-13/upstream-merge-27611 
[MIRROR] Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value
 2017-06-05 23:06:18 -05:00
LetterJay 3d750adbd7 master cleanup 2017-06-05 22:50:31 -05:00
LetterJay b36e3065e0 Merge branch 'master' into upstream-merge-27712 2017-06-05 22:46:25 -05:00
CitadelStationBot 4d25a6e299 Only human and silicon servants can help recite multi-invoker scriptures 2017-06-04 19:23:18 -05:00
CitadelStationBot e8663bee81 Refactors the latejoin list 2017-06-04 15:08:35 -05:00
CitadelStationBot e0b5221ebd The Crafting Menu now has subcategories! (#1364) 2017-06-04 09:09:59 -07:00
CitadelStationBot 6e632190b3 Planned Spaceparenthood would like to apologize for mislabeling their cloning pod ejection buttons. (#1366) 2017-06-04 09:09:44 -07:00
CitadelStationBot 79f28a732d Buffs chemical grenades (#1372) 2017-06-04 09:08:50 -07:00
CitadelStationBot b5d2cf3c99 [READY] Stacks will change item_states and w_class based on how full they are. (#1370) 2017-06-04 09:08:33 -07:00
CitadelStationBot c1adecc0e2 Fix AI status displays to use a list instead of the world list (#1391) 2017-06-04 09:08:04 -07:00
CitadelStationBot 7ec36019d5 Refactor another spawned cooldown var (#1383) 2017-06-04 09:07:49 -07:00
CitadelStationBot 8fcbf20c79 Another spawn timer (#1388) 2017-06-04 09:07:16 -07:00
CitadelStationBot 63f9657d9b Refactors a cooldown var to not require a spawn or sleep (#1381) 2017-06-04 09:06:47 -07:00
CitadelStationBot e57863cfe1 Refactor another spawn cooldown (#1385) 2017-06-04 09:06:38 -07:00
CitadelStationBot 1e12557776 Remove spawns in favour of stacktrace calls, which don't stop the called (#1382) 2017-06-04 09:06:27 -07:00
CitadelStationBot 6def6cddda Refactors yet another spawn cooldown (#1384) 2017-06-04 09:06:14 -07:00