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
d0297e326d
Merge pull request #6827 from Citadel-Station-13/upstream-merge-37957
...
[MIRROR] Fixes defibillator runtime
2018-05-22 02:29:19 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
46f90d8fae
Merge pull request #37973 from AutomaticFrenzy/patch/your-the-jaunter
...
Fix wormhole jaunter grammar
2018-05-21 17:03:46 -05:00
3fd74027c1
Merge pull request #37945 from AutomaticFrenzy/patch/hydroponics-trays
...
Fix construction behavior of hydroponics trays
2018-05-21 16:58:31 -05:00
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
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
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
c27d97a6e5
Merge pull request #37934 from AutomaticFrenzy/patch/ssping
...
Migrate goonchat pings to a subsystem
2018-05-21 16:40:29 -05:00
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
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
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
a3c3052f25
Merge pull request #37961 from AutomaticFrenzy/patch/ai-firelock
...
Enable admin AI interaction for firelocks
2018-05-21 16:32:32 -05:00
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
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
60b3384695
Merge pull request #37965 from AnturK/whatthecommentsays
...
Fixes fire_act working on deleted things.
2018-05-21 16:27:55 -05:00
5964fa0712
Fixes defibillator runtime
2018-05-21 14:54:46 -05:00
6167423c85
Fix formatting when emagging an R&D console
2018-05-21 11:25:48 -05:00
6489ef5511
Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476
...
[MIRROR] Uppercases slot defines.
2018-05-21 11:23:02 -05:00
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
32cf8e6eb2
Merge pull request #6812 from Citadel-Station-13/upstream-merge-37928
...
[MIRROR] Comms consoles don't update while viewing messages
2018-05-21 08:30:19 -05:00
207c022f87
Merge pull request #6825 from Citadel-Station-13/upstream-merge-37954
...
[MIRROR] Refresh mob views when atoms enter/exit storage
2018-05-21 08:29:46 -05:00
0b26ea7b5e
Merge pull request #6823 from Citadel-Station-13/upstream-merge-37925
...
[MIRROR] Removes skewium from saferChems
2018-05-21 08:29:31 -05:00
cb5ea0aab7
Merge pull request #6822 from Citadel-Station-13/upstream-merge-37600
...
[MIRROR] Refactors hydrocarbon combustion + other general atmos code changes
2018-05-21 08:29:16 -05:00
52bd7904be
Merge pull request #6821 from Citadel-Station-13/upstream-merge-37927
...
[MIRROR] Replaces nauseous with nauseated
2018-05-21 08:29:00 -05:00
388c17664f
Merge pull request #6820 from Citadel-Station-13/upstream-merge-37938
...
[MIRROR] Fixes some issues with pacifism by disabling intent auto-switch
2018-05-21 08:28:47 -05:00
1afdd03d78
Merge pull request #6819 from Citadel-Station-13/upstream-merge-37937
...
[MIRROR] Emagging a R&D console now unlocks it and prevents it from being locked as opposed to nothing
2018-05-21 08:28:30 -05:00
1896bc86e8
Merge pull request #6817 from Citadel-Station-13/upstream-merge-37633
...
[MIRROR] Circuit Labels (sorta understanding git edition)
2018-05-21 08:28:13 -05:00
9121d4968e
Merge pull request #6789 from Citadel-Station-13/upstream-merge-37891
...
[MIRROR] Cleans up clap bodypart check
2018-05-21 08:27:57 -05:00
9b4b9b4f34
Refresh mob views when atoms enter/exit storage ( #37954 )
2018-05-21 04:46:20 -05:00
1c51f32b31
Remove skewium from saferChems ( #37925 )
2018-05-21 03:57:05 -05:00
7cc9d9103d
Refactors hydrocarbon combustion + other general atmos code changes ( #37600 )
...
* splits hydrocarbon combustion + other stuff
* nob max() thing
* whoops
* remove proc + new define
2018-05-21 03:21:08 -05:00
177139a1d3
Replace nauseous with nauseated ( #37927 )
2018-05-21 03:06:39 -05:00
2b9d18597b
Remove intent auto switch from pacifism ( #37938 )
2018-05-21 02:54:14 -05:00
73b0ac7859
Emagging a R&D console now unlocks it and prevents it from being locked as opposed to nothing ( #37937 )
...
* rdconsole emagging
* Fix grammar
2018-05-21 02:38:44 -05:00
63e472050c
Circuit Labels (sorta understanding git edition) ( #37633 )
...
* Customizable circuit names/descriptions
* Circuit descriptions are now copied
* Prevents code injection through the desc
2018-05-21 02:11:50 -05:00
0758204515
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
ea9b3622fd
Merge branch 'master' into upstream-merge-37476
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
1e207a7430
modular_citadel
2018-05-20 23:04:13 -05:00
deathride58