Jordan Brown
|
9f8ef69014
|
Merge pull request #37986 from AutomaticFrenzy/patch/sneaky-cyberboss
Fix global proccalls not working
|
2018-05-22 22:12:30 -05:00 |
|
CitadelStationBot
|
292c5dfa96
|
Automatic changelog generation for PR #6573 [ci skip]
|
2018-05-22 22:09:37 -05:00 |
|
LetterJay
|
f2b8af5e05
|
Merge pull request #6573 from Citadel-Station-13/upstream-merge-37529
[MIRROR] Kills off three more flags from flags_2
|
2018-05-22 22:09:34 -05:00 |
|
LetterJay
|
647aa4f306
|
Update charged.dm
|
2018-05-22 12:30:43 -05:00 |
|
LetterJay
|
e4c8e1b416
|
Update eutactic_blades.dm
|
2018-05-22 09:29:23 -05:00 |
|
LetterJay
|
06b7cdf27a
|
Merge branch 'master' into upstream-merge-37529
|
2018-05-22 08:02:46 -05:00 |
|
LetterJay
|
488842a520
|
Update charged.dm
|
2018-05-22 08:01:29 -05:00 |
|
LetterJay
|
a610e635f1
|
Update ids.dm
|
2018-05-22 08:00:04 -05:00 |
|
LetterJay
|
63aa6eeee6
|
Update lava.dm
|
2018-05-22 07:58:44 -05:00 |
|
CitadelStationBot
|
b3e5513185
|
Automatic changelog generation for PR #6558 [ci skip]
|
2018-05-22 07:18:36 -05:00 |
|
LetterJay
|
adf1505c70
|
Merge pull request #6558 from Citadel-Station-13/upstream-merge-37486
[MIRROR] Moves several clothing-specific flags from /atom to their proper type
|
2018-05-22 07:18:34 -05:00 |
|
CitadelStationBot
|
6bbab2ab06
|
Automatic changelog generation for PR #6555 [ci skip]
|
2018-05-22 07:17:44 -05:00 |
|
LetterJay
|
01fc8cf128
|
Merge pull request #6555 from Citadel-Station-13/upstream-merge-37293
[MIRROR] Modified bomb and syndicate bomb spawner so Cuban Pete bombs maxcap and work again
|
2018-05-22 07:17:41 -05:00 |
|
deathride58
|
9afa6b9290
|
Merge pull request #6779 from Citadel-Station-13/upstream-merge-37883
[MIRROR] Fixes soulstone runtime
|
2018-05-22 02:30:01 +00:00 |
|
deathride58
|
2d8002ca36
|
Merge pull request #6826 from Citadel-Station-13/upstream-merge-37935
[MIRROR] Fix formatting when emagging an R&D console
|
2018-05-22 02:29:38 +00:00 |
|
deathride58
|
d0297e326d
|
Merge pull request #6827 from Citadel-Station-13/upstream-merge-37957
[MIRROR] Fixes defibillator runtime
|
2018-05-22 02:29:19 +00:00 |
|
deathride58
|
ce0dac200b
|
Merge pull request #6828 from Citadel-Station-13/upstream-merge-37965
[MIRROR] Fixes fire_act working on deleted things.
|
2018-05-22 02:28:38 +00:00 |
|
CitadelStationBot
|
c150988997
|
Automatic changelog generation for PR #6829 [ci skip]
|
2018-05-21 21:28:23 -05:00 |
|
deathride58
|
2c73811b1f
|
Merge pull request #6829 from Citadel-Station-13/upstream-merge-37955
[MIRROR] Keep only the most recent airlock autoclose timer
|
2018-05-22 02:28:21 +00:00 |
|
CitadelStationBot
|
da36ad5f41
|
Automatic changelog generation for PR #6830 [ci skip]
|
2018-05-21 21:27:57 -05:00 |
|
deathride58
|
fd4e6b880a
|
Merge pull request #6830 from Citadel-Station-13/upstream-merge-37943
[MIRROR] Fix mindswap forcibly enabling ambient occlusion
|
2018-05-22 02:27:55 +00:00 |
|
CitadelStationBot
|
f07710c570
|
Automatic changelog generation for PR #6831 [ci skip]
|
2018-05-21 21:27:41 -05:00 |
|
deathride58
|
32c63c2e70
|
Merge pull request #6831 from Citadel-Station-13/upstream-merge-37961
[MIRROR] Enable admin AI interaction for firelocks
|
2018-05-22 02:27:39 +00:00 |
|
CitadelStationBot
|
29a6589336
|
Automatic changelog generation for PR #6832 [ci skip]
|
2018-05-21 21:27:23 -05:00 |
|
deathride58
|
1e7839342f
|
Merge pull request #6832 from Citadel-Station-13/upstream-merge-37944
[MIRROR] Remove second copy of jQuery used only by IRV polls
|
2018-05-22 02:27:21 +00:00 |
|
deathride58
|
c376ef6268
|
Merge pull request #6833 from Citadel-Station-13/upstream-merge-37956
[MIRROR] Cleans up duplicate get_area's in c.grenade priming
|
2018-05-22 02:27:01 +00:00 |
|
CitadelStationBot
|
efc5828284
|
Automatic changelog generation for PR #6834 [ci skip]
|
2018-05-21 21:26:41 -05:00 |
|
deathride58
|
3d9af22c4c
|
Merge pull request #6834 from Citadel-Station-13/upstream-merge-37906
[MIRROR] Removes firing-pins box in RD's locker
|
2018-05-22 02:26:39 +00:00 |
|
deathride58
|
20109138c0
|
Merge pull request #6836 from Citadel-Station-13/upstream-merge-37934
[MIRROR] Migrate goonchat pings to a subsystem
|
2018-05-22 02:26:18 +00:00 |
|
deathride58
|
2f5ea131a3
|
Merge pull request #6837 from Citadel-Station-13/upstream-merge-37972
[MIRROR] Fixes an oops in circuit printer description check
|
2018-05-22 02:25:56 +00:00 |
|
deathride58
|
56dbd7c980
|
Merge pull request #6838 from Citadel-Station-13/upstream-merge-37974
[MIRROR] Fix glowshrooms missing their icon in the editor
|
2018-05-22 02:25:34 +00:00 |
|
CitadelStationBot
|
a8d5c7d800
|
Automatic changelog generation for PR #6839 [ci skip]
|
2018-05-21 21:25:15 -05:00 |
|
deathride58
|
f0a9344c8e
|
Merge pull request #6839 from Citadel-Station-13/upstream-merge-37900
[MIRROR] Adds OOC verb to show the last round end report you've viewed
|
2018-05-22 02:25:13 +00:00 |
|
CitadelStationBot
|
c654859eb0
|
Automatic changelog generation for PR #6840 [ci skip]
|
2018-05-21 21:24:59 -05:00 |
|
deathride58
|
5b15984c0e
|
Merge pull request #6840 from Citadel-Station-13/upstream-merge-37945
[MIRROR] Fix construction behavior of hydroponics trays
|
2018-05-22 02:24:57 +00:00 |
|
CitadelStationBot
|
a6f7a31b10
|
Automatic changelog generation for PR #6841 [ci skip]
|
2018-05-21 21:24:33 -05:00 |
|
deathride58
|
d676e1ecf9
|
Merge pull request #6841 from Citadel-Station-13/upstream-merge-37973
[MIRROR] Fix wormhole jaunter grammar
|
2018-05-22 02:24:31 +00:00 |
|
letterjay
|
7fbe369b55
|
Fix wormhole jaunter grammar
|
2018-05-21 17:03:47 -05:00 |
|
Jordan Brown
|
46f90d8fae
|
Merge pull request #37973 from AutomaticFrenzy/patch/your-the-jaunter
Fix wormhole jaunter grammar
|
2018-05-21 17:03:46 -05:00 |
|
letterjay
|
9d537c24f2
|
Fix construction behavior of hydroponics trays
|
2018-05-21 16:58:31 -05:00 |
|
oranges
|
3fd74027c1
|
Merge pull request #37945 from AutomaticFrenzy/patch/hydroponics-trays
Fix construction behavior of hydroponics trays
|
2018-05-21 16:58:31 -05:00 |
|
letterjay
|
7e087663c2
|
Adds OOC verb to show the last round end report you've viewed
|
2018-05-21 16:48:08 -05:00 |
|
Jordan Brown
|
96106ff2e8
|
Adds OOC verb to show the last round end report you've viewed (#37900)
You can now view your last round end report window with the "Your last round" verb in the OOC tab
stores the HTML in a data dir
|
2018-05-21 16:48:08 -05:00 |
|
letterjay
|
2facdf7937
|
Fix glowshrooms missing their icon in the editor
|
2018-05-21 16:44:53 -05:00 |
|
Jordan Brown
|
638c2eb81d
|
Merge pull request #37974 from AutomaticFrenzy/patch/glowshroom-icon
Fix glowshrooms missing their icon in the editor
|
2018-05-21 16:44:52 -05:00 |
|
letterjay
|
88e63afdb5
|
Fixes an oops in circuit printer description check
|
2018-05-21 16:43:42 -05:00 |
|
Jordan Brown
|
b7fd3a37e2
|
Merge pull request #37972 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/patch-1
Fixes an oops in circuit printer description check
|
2018-05-21 16:43:42 -05:00 |
|
letterjay
|
1810619474
|
Migrate goonchat pings to a subsystem
|
2018-05-21 16:40:29 -05:00 |
|
oranges
|
c27d97a6e5
|
Merge pull request #37934 from AutomaticFrenzy/patch/ssping
Migrate goonchat pings to a subsystem
|
2018-05-21 16:40:29 -05:00 |
|
letterjay
|
ca177519da
|
Removes firing-pins box in RD's locker
|
2018-05-21 16:36:04 -05:00 |
|