Commit Graph

200 Commits

Author SHA1 Message Date
LetterJay
fc1017fa14 Merge pull request #1287 from Citadel-Station-13/upstream-merge-27801
[MIRROR] Holocall cleanup
2017-06-05 23:19:23 -05: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
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
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
kevinz000
b9c4873ee9 Merge branch 'master' into upstream-merge-27801 2017-06-03 06:38:57 -07:00
CitadelStationBot
fa305c2aec [MIRROR] Fix NOPOWER being set incorrectly for holopads (#1300)
* Fix NOPOWER being set incorrectly for holopads

* Update hologram.dm

* Delete hologram.dm.rej
2017-06-03 06:37:30 -07:00
LetterJay
976c1244dd Config shit for cards (#1310) 2017-06-02 21:56:08 -07:00
kevinz000
224f1d8bd1 Delete hologram.dm.rej 2017-06-02 21:50:17 -07:00
kevinz000
c483767431 Update hologram.dm 2017-06-02 21:50:11 -07:00
CitadelStationBot
2dc13e6242 makes machineguns pass their users to their fire helpers instead of the floor (#1256) 2017-06-02 21:46:15 -07:00
CitadelStationBot
55f8700a8c Fix some camera Initializes (#1337) 2017-06-02 21:18:07 -07:00
LetterJay
c36ca8a434 Merge pull request #1344 from Citadel-Station-13/upstream-merge-27945
[MIRROR] Fixes airlocks not updating icon properly
2017-06-02 22:46:38 -05:00
CitadelStationBot
b676e7b5ae Fixes airlocks not updating icon properly 2017-06-02 12:14:17 -05:00
CitadelStationBot
4eb5a9bf21 Mapped active shieldgens 2017-05-31 08:56:07 -05:00
LetterJay
976086e490 Merge branch 'master' into upstream-merge-27534 2017-05-30 16:45:59 -05:00
LetterJay
377d3ffbf9 Merge pull request #1184 from Citadel-Station-13/upstream-merge-27631
[MIRROR] Turret bases will properly layer under turret covers
2017-05-30 15:47:00 -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
LetterJay
7750095289 Merge pull request #1281 from Citadel-Station-13/upstream-merge-27770
[MIRROR] AI holocall hangups
2017-05-29 15:01:43 -05:00
CitadelStationBot
86123e0271 Fixes holopads not returning an initialize hint 2017-05-29 11:03:08 -05:00
CitadelStationBot
0349f8c908 Holocall cleanup 2017-05-29 11:03:03 -05:00
CitadelStationBot
d60e7c9d2a AI holocall hangups 2017-05-29 06:38:24 -05:00
CitadelStationBot
53fb384b63 Emagging a cloner drops bits, cloners don't keep extra flesh (#1264) 2017-05-28 15:22:10 -07:00
CitadelStationBot
fa42d8631a Comm Console Fix 2017-05-27 23:27:19 -05:00
CitadelStationBot
833c0c549c Make dance machine mob dancing asynchronous (#1221) 2017-05-27 13:35:52 -07:00
CitadelStationBot
740f172772 Fixes airlocks having two Initializes (#1198) 2017-05-27 13:32:49 -07:00
CitadelStationBot
c9ab875da9 Ports clonepods to Initialize (#1230) 2017-05-27 13:26:59 -07:00
LetterJay
ef018fb14d Merge pull request #1182 from Citadel-Station-13/upstream-merge-27627
[MIRROR] Xenobio console origin tech fix
2017-05-26 23:24:08 -05:00
LetterJay
bf735e5df7 Merge pull request #1192 from Citadel-Station-13/upstream-merge-27658
[MIRROR] Fixes adv camera leaving obscured images
2017-05-26 23:22:54 -05:00
LetterJay
bb7a3462f0 Merge pull request #1199 from Citadel-Station-13/upstream-merge-27668
[MIRROR] Makes a thing use QDEL_NULL
2017-05-26 23:21:44 -05:00
CitadelStationBot
15482314d4 Makes a thing use QDEL_NULL 2017-05-26 18:03:21 -05:00
CitadelStationBot
5387b4e2a7 Makes a thing use QDEL_NULL 2017-05-26 13:20:50 -05:00
CitadelStationBot
fa4e0e61d6 Fixes adv camera leaving obscured images 2017-05-26 09:05:52 -05:00
CitadelStationBot
360d8553b6 Turret bases will properly layer under turret covers 2017-05-25 10:37:46 -05:00
CitadelStationBot
e2b1ef2ad2 Xenobio console origin tech fix 2017-05-25 09:44:40 -05:00
CitadelStationBot
7998cdcd9a Gang Icons and Fixes 2017-05-25 08:45:28 -05:00
CitadelStationBot
11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
LetterJay
869953cd18 Merge pull request #1123 from Citadel-Station-13/upstream-merge-27503
[MIRROR] Changes investigate logs to use a define
2017-05-24 12:34:36 -05:00
LetterJay
57f9345ace Merge pull request #1135 from Citadel-Station-13/upstream-merge-27543
[MIRROR] Fixes advanced cam not cleaning up properly
2017-05-24 12:12:16 -05:00
LetterJay
006c74c6ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27503 2017-05-24 08:11:07 -05:00
CitadelStationBot
be2aefa13b Fixes syndicate pod turrets 2017-05-23 20:56:33 -05:00
CitadelStationBot
3651637cd8 Fixes advanced cam not cleaning up properly 2017-05-23 13:44:19 -05:00
CitadelStationBot
e02290bf2b Replaced mob spawner vars with outfits 2017-05-23 07:57:42 -05:00
LetterJay
b633ef0991 Merge pull request #1130 from Citadel-Station-13/GangSync
Syncs all gang related PRs with upstream
2017-05-23 06:17:29 -05:00
LetterJay
b85d2ea321 Syncs all gang related PRs with upstream 2017-05-23 06:10:40 -05:00
CitadelStationBot
01cd2039e5 Changes investigate logs to use a define 2017-05-22 22:45:54 -05:00
CitadelStationBot
4ac787e3bb Adds a toy weapon vendor into the syndie lavaland base firing range 2017-05-22 22:10:47 -05:00
Poojawa
45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00