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

2001 Commits

Author SHA1 Message Date
LetterJay
ee2ca2d4ba Merge pull request #1512 from Citadel-Station-13/upstream-merge-28239 
[MIRROR] Fixes communications consoles
 2017-06-10 07:59:05 -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
LetterJay
01c9923050 Merge pull request #1514 from Citadel-Station-13/upstream-merge-28233 
[MIRROR] Adds /image/proc/copy_overlays
 2017-06-10 07:58:19 -05:00
CitadelStationBot
b1b39093e9 Changes Amanitin log message 2017-06-09 20:27:10 -05:00
CitadelStationBot
9a8778b16f Adds /image/proc/copy_overlays 2017-06-09 20:11:51 -05:00
CitadelStationBot
b2cc05b6b5 Makes dismembered heads and brains respect NOCLONE 2017-06-09 20:08:45 -05:00
CitadelStationBot
7658deae09 Fixes communications consoles 2017-06-09 20:08:42 -05:00
LetterJay
12ea900051 Merge pull request #1487 from Citadel-Station-13/upstream-merge-28189 
[MIRROR] Fixes #8044, being able to hold defib paddles while dead, by removing NODROP from them
 2017-06-09 15:55:30 -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
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
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
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
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
LetterJay
36997bdb80 Merge pull request #1498 from Citadel-Station-13/upstream-merge-28204 
[MIRROR] Security record crime details is now a single line input box
 2017-06-09 09:06:58 -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
98d948e2d4 Merge pull request #1495 from Citadel-Station-13/upstream-merge-28197 
[MIRROR] Diseases can now only spread to mobs with an atmos line of sight
 2017-06-09 09:05:49 -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
9e0488d2d9 Moves borer completion to gamemode 2017-06-09 09:01:03 -05:00
CitadelStationBot
07cb1ab1de Fix related CID/IPs on player panel 2017-06-09 08:59:57 -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
54d8e3a159 You can no longer mount borgs while stunned. 2017-06-08 17:18:09 -05:00
CitadelStationBot
d859e3a637 Diseases can now only spread to mobs with an atmos line of sight 2017-06-08 17:18:06 -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
24bfaa9b56 Fixes #8044, being able to hold defib paddles while dead, by removing NODROP from them 2017-06-08 10:58:31 -05:00
CitadelStationBot
7b6c76525c Trims whitelist entries and makes them use ckey() 2017-06-08 09:45:45 -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
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
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
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
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
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
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
CitadelStationBot
c5143880d2 Fixes logged out spawning new_players 2017-06-06 13:28:23 -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