 deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 Brownandletterjay
|
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 |
|
|
orangesandletterjay
|
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 Brownandletterjay
|
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 Brownandletterjay
|
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 Brownandletterjay
|
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 |
|
|
orangesandletterjay
|
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 |
|
|
Wilchenxandletterjay
|
85ef262082
|
Removes firing-pins box in RD's locker (#37906)
Makes no sense since science can't print any guns and probably won't ever be able to again.
|
2018-05-21 16:36:04 -05:00 |
|
|
letterjay
|
efe4a45f81
|
Cleans up duplicate get_area's in c.grenade priming
|
2018-05-21 16:35:54 -05:00 |
|
|
Jordan Brownandletterjay
|
0d08eca330
|
Merge pull request #37956 from ShizCalev/chem-grenade-cleanup
Cleans up duplicate get_area's in c.grenade priming
|
2018-05-21 16:35:54 -05:00 |
|
|
letterjay
|
da8dd0adf5
|
Remove second copy of jQuery used only by IRV polls
|
2018-05-21 16:33:42 -05:00 |
|
|
Jordan Brownandletterjay
|
ec14a7c7ef
|
Merge pull request #37944 from AutomaticFrenzy/patch/irv-jquery
Remove second copy of jQuery used only by IRV polls
|
2018-05-21 16:33:42 -05:00 |
|
|
letterjay
|
71a94ae781
|
Enable admin AI interaction for firelocks
|
2018-05-21 16:32:32 -05:00 |
|
|
Jordan Brownandletterjay
|
a3c3052f25
|
Merge pull request #37961 from AutomaticFrenzy/patch/ai-firelock
Enable admin AI interaction for firelocks
|
2018-05-21 16:32:32 -05:00 |
|
|
letterjay
|
7d8a3135a6
|
Fix mindswap forcibly enabling ambient occlusion
|
2018-05-21 16:31:21 -05:00 |
|
|
Jordan Brownandletterjay
|
1766134062
|
Merge pull request #37943 from AutomaticFrenzy/patch/mind-over-matter
Fix mindswap forcibly enabling ambient occlusion
|
2018-05-21 16:31:21 -05:00 |
|
|
letterjay
|
3957f14fa4
|
Keep only the most recent airlock autoclose timer
|
2018-05-21 16:29:09 -05:00 |
|
|
Jordan Brownandletterjay
|
9095d48215
|
Merge pull request #37955 from AutomaticFrenzy/patch/airlock-autoclose
Keep only the most recent airlock autoclose timer
|
2018-05-21 16:29:09 -05:00 |
|
|
letterjay
|
0a4f2f501e
|
Fixes fire_act working on deleted things.
|
2018-05-21 16:27:55 -05:00 |
|
|
Jordan Brownandletterjay
|
60b3384695
|
Merge pull request #37965 from AnturK/whatthecommentsays
Fixes fire_act working on deleted things.
|
2018-05-21 16:27:55 -05:00 |
|
|
LetterJayandGitHub
|
6489ef5511
|
Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476
[MIRROR] Uppercases slot defines.
|
2018-05-21 11:23:02 -05:00 |
|
|
LetterJayandGitHub
|
6060df5b92
|
Merge pull request #6554 from Citadel-Station-13/upstream-merge-37267
[MIRROR] Adds log and management tabs to permissions panel
|
2018-05-21 08:42:21 -05:00 |
|
|
LetterJay
|
d9cc361b81
|
Merge branch 'upstream-merge-37476' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-37476
|
2018-05-21 08:38:33 -05:00 |
|