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

338 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
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
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
CitadelStationBot
e21e4eac9d Adds creamatoriums 2017-06-07 20:45:26 -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
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
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
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
8fcbf20c79 Another spawn timer (#1388) 2017-06-04 09:07:16 -07:00
CitadelStationBot
9023e0ff67 refactor another spawn cooldown (#1392) 2017-06-04 09:05:12 -07:00
CitadelStationBot
e59e7f8d06 Fixes bsa not showing up (#1396) 2017-06-04 09:03:30 -07:00
CitadelStationBot
f8505883d4 Removes dragoontomb ruin and loot. (#1290) 2017-06-03 06:39:11 -07:00
CitadelStationBot
043d9b478e Gives the janitor a flyswatter in their roundstart equipment (#1354) 2017-06-03 06:37:08 -07:00
kevinz000
8e7b6adff0 Update cardboard_cutouts.dm 2017-06-02 21:54:59 -07:00
kevinz000
86d11b3bce Delete cardboard_cutouts.dm.rej 2017-06-02 21:54:49 -07:00
CitadelStationBot
bdd4f9d17f Allows explorer webbings to hold marker beacons (#1219) 2017-06-02 21:35:41 -07:00
CitadelStationBot
2c7e3ad4f7 Makes op belts less brown (#1336) 2017-06-02 21:18:26 -07:00
LetterJay
7b346b6241 Merge pull request #1342 from Citadel-Station-13/upstream-merge-27932 
[MIRROR] Attempts to add items to a storage container beyond its slots limit will obtain a failure message again.
 2017-06-02 22:47:01 -05:00
CitadelStationBot
6e563e7a53 Attempts to add items to a storage container beyond its slots limit will obtain a failure message again. 2017-06-02 06:42:23 -05:00
CitadelStationBot
d53044aa10 Fixes black carpet recipe and sprite 2017-06-01 08:38:41 -05:00
CitadelStationBot
d36bc75074 Fixes posters 2017-05-31 19:29:20 -05:00
CitadelStationBot
1fd718cf29 Makes VV'ing ID cards easier. 2017-05-31 08:50:11 -05:00
LetterJay
8f06db65c9 Merge pull request #1131 from Citadel-Station-13/upstream-merge-27534 
[MIRROR] Replaced mob spawner vars with outfits
 2017-05-30 21:43:31 -05:00
CitadelStationBot
4f9c8a0869 Luxury Bluespace Shelter Capsules, Take 2. 2017-05-30 17:05:54 -05:00
LetterJay
81e4f39733 Merge branch 'master' into upstream-merge-27669 2017-05-30 17:02:11 -05:00
LetterJay
976086e490 Merge branch 'master' into upstream-merge-27534 2017-05-30 16:45:59 -05:00
LetterJay
b33d26c67f Merge pull request #1307 from Citadel-Station-13/upstream-merge-27846 
[MIRROR] Flamethrower fixes
 2017-05-30 15:48:44 -05:00
LetterJay
f2730839d4 Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361 
[MIRROR]  Refactors explosions
 2017-05-30 15:15:51 -05:00
CitadelStationBot
d4af5004a6 Flamethrower fixes 2017-05-30 14:55:42 -05:00
LetterJay
ae22a1876a 41 files changed, original only had 4. SPACES. 2017-05-30 14:36:11 -05:00
LetterJay
aa6d89df07 Merge pull request #1291 from Citadel-Station-13/upstream-merge-27769 
[MIRROR] Increase plasmaman tank volume
 2017-05-29 14:58:56 -05:00
CitadelStationBot
94fdea8866 Some pAI fixes 2017-05-29 14:42:48 -05:00
CitadelStationBot
b05d56d9fa Increase plasmaman tank volume 2017-05-29 11:07:23 -05:00
CitadelStationBot
afbfb66386 Splits mining_mobs.dm into separate files 2017-05-29 01:17:13 -05:00
CitadelStationBot
ee638d81a5 Fixes projectile dampening fields being on infinite cooldown (#1263) 2017-05-28 15:20:00 -07:00
CitadelStationBot
e3d228aa00 [MIRROR] ID card mapping aid (#1223) 
* ID card mapping aid

* Update cards_ids.dm

* lf
 2017-05-28 15:19:46 -07:00