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

1271 Commits

Author SHA1 Message Date
LetterJay
ee910591ef Merge pull request #1521 from Citadel-Station-13/upstream-merge-28262 
[MIRROR] Fixes basic spiderlings becoming ice spiders
 2017-06-12 12:41:49 -05:00
LetterJay
a00551316b Merge pull request #1522 from Citadel-Station-13/upstream-merge-28280 
[MIRROR] MMI-in-mecha can use the mecha tools again
 2017-06-12 12:41:20 -05:00
LetterJay
b464a2dc19 Merge pull request #1517 from Citadel-Station-13/upstream-merge-28113 
[MIRROR] Adds F.R.A.M.E. cartridge
 2017-06-12 12:33:04 -05:00
LetterJay
7e2a0a7277 Merge pull request #1554 from Citadel-Station-13/upstream-merge-28336 
[MIRROR] Paper planes will be the same color as the paper used to create them.
 2017-06-12 12:18:53 -05:00
LetterJay
20e0c3d800 Merge pull request #1552 from Citadel-Station-13/upstream-merge-28335 
[MIRROR]  Ports construction paper to Initialize()
 2017-06-12 12:18:40 -05:00
LetterJay
169f206f04 Merge pull request #1545 from Citadel-Station-13/upstream-merge-28188 
[MIRROR] Adds the ability to attach papers and photos to airlocks
 2017-06-12 12:13:10 -05:00
LetterJay
d664defd89 Merge pull request #1544 from Citadel-Station-13/upstream-merge-28254 
[MIRROR] Makes arrivals shuttle slightly more juicy
 2017-06-12 12:12:48 -05:00
CitadelStationBot
07ed287787 Paper planes will be the same color as the paper used to create them. 2017-06-12 11:35:36 -05:00
CitadelStationBot
45cd30ad49 Ports construction paper to Initialize() 2017-06-12 05:34:29 -05:00
CitadelStationBot
57dc205514 Adds the ability to attach papers and photos to airlocks 2017-06-11 17:29:48 -05:00
CitadelStationBot
ea05bdbc26 Makes arrivals shuttle slightly more juicy 2017-06-11 17:28:44 -05:00
CitadelStationBot
53229bb7da If you're lucky enough to get multiple lifesteal crystal modkits you can actually make use of them 2017-06-11 08:30:29 -05:00
LetterJay
4ceea2a134 Update whitelist.dm 2017-06-10 23:28:03 -05:00
CitadelStationBot
5dd146a819 MMI-in-mecha can use the mecha tools again 2017-06-10 13:50:08 -05:00
CitadelStationBot
fb40986f89 Fixes basic spiderlings becoming ice spiders 2017-06-10 12:22:48 -05:00
CitadelStationBot
4bd99124de Adds F.R.A.M.E. cartridge 2017-06-10 12:18:31 -05:00
LetterJay
47687a6d1a cleanup 2017-06-10 09:42:08 -05:00
LetterJay
eac4854adf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-28165 2017-06-10 09:38:21 -05:00
LetterJay
522b6d917f updates 2017-06-10 09:36:39 -05:00
LetterJay
7189249f66 Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115 
[MIRROR] A large and unasked for  repath and improvement of accessories (formerly ties, but actually armbands and medals)
 2017-06-10 09:01:25 -05:00
LetterJay
8a628cf13f Delete ties.dm 2017-06-10 09:00:08 -05:00
LetterJay
1bd5b2d3ab Merge pull request #1513 from Citadel-Station-13/upstream-merge-28240 
[MIRROR] Makes dismembered heads and brains respect NOCLONE
 2017-06-10 07:58:38 -05:00
CitadelStationBot
b1b39093e9 Changes Amanitin log message 2017-06-09 20:27:10 -05:00
CitadelStationBot
b2cc05b6b5 Makes dismembered heads and brains respect NOCLONE 2017-06-09 20:08:45 -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
37c5f4858d Merge pull request #1503 from Citadel-Station-13/upstream-merge-28224 
[MIRROR] Fix related CID/IPs on player panel
 2017-06-09 09:35:29 -05:00
LetterJay
3f66d97005 Merge pull request #1402 from cebutris/oof 
oof
 2017-06-09 09:12:49 -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
d92a596b73 Merge pull request #1496 from Citadel-Station-13/upstream-merge-28198 
[MIRROR] You can no longer mount borgs while stunned.
 2017-06-09 09:06:39 -05:00
LetterJay
7fe60c0012 Merge pull request #1494 from Citadel-Station-13/upstream-merge-28194 
[MIRROR] Fixes deadmin player panel runtime
 2017-06-09 09:05:32 -05:00
LetterJay
5f1fe8b8da cleanup 2017-06-09 09:04:31 -05:00
CitadelStationBot
07cb1ab1de Fix related CID/IPs on player panel 2017-06-09 08:59:57 -05:00
CitadelStationBot
1bdda132e7 Adds Medal Commendations! 2017-06-08 20:39:15 -05:00
CitadelStationBot
54d8e3a159 You can no longer mount borgs while stunned. 2017-06-08 17:18:09 -05:00
CitadelStationBot
3deb4c0eff Fixes deadmin player panel runtime 2017-06-08 17:18:01 -05:00
CitadelStationBot
1658e48bc1 [READY] Gang Points Refactor - Now stored in the gang datum 2017-06-08 14:46:07 -05:00
CitadelStationBot
7b6c76525c Trims whitelist entries and makes them use ckey() 2017-06-08 09:45:45 -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
ad97147dfe Merge pull request #1314 from Citadel-Station-13/upstream-merge-27870 
[MIRROR] Fixes ghosts using marker beacon
 2017-06-08 03:31:22 -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
d79bd3988c Merge pull request #1473 from Citadel-Station-13/upstream-merge-28158 
[MIRROR] Adds creamatoriums
 2017-06-08 03:27:35 -05:00
CitadelStationBot
d341334118 [s] Fixes IRC ahelps 2017-06-07 21:27:14 -05:00
CitadelStationBot
e21e4eac9d Adds creamatoriums 2017-06-07 20:45:26 -05:00
CitadelStationBot
9725329268 A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) 2017-06-07 03:06:15 -05:00
LetterJay
b332506cf2 Merge pull request #1442 from Citadel-Station-13/upstream-merge-28105 
[MIRROR] Fixes logged out spawning new_players
 2017-06-06 23:33:35 -05:00
LetterJay
cc24b6e3a7 Merge pull request #1443 from Citadel-Station-13/whitelist 
testing
 2017-06-06 14:48:48 -05:00
LetterJay
ccd1235599 testing 2017-06-06 14:48:19 -05:00