ad61d9927e
Merge pull request #6853 from Citadel-Station-13/upstream-merge-37969
...
[MIRROR] Fixes digital valves not working for silicons
2018-05-23 06:45:24 -05:00
b515e87f1e
Automatic changelog generation for PR #6852 [ci skip]
2018-05-23 06:45:11 -05:00
e37c1886c3
Merge pull request #6852 from Citadel-Station-13/upstream-merge-37970
...
[MIRROR] Chasms no longer drop those buckled to undroppable objects
2018-05-23 06:45:09 -05:00
0556adeb53
Merge pull request #6621 from Citadel-Station-13/upstream-merge-37597
...
[MIRROR] replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2
2018-05-23 06:44:50 -05:00
42dd419f80
Update eutactic_blades.dm
2018-05-23 05:42:31 -05:00
990d997482
Update radio.dm
2018-05-23 05:41:41 -05:00
e7d9cd0698
Merge branch 'master' into upstream-merge-37597
2018-05-23 05:21:19 -05:00
ae279fed73
Automatic changelog generation for PR #6574 [ci skip]
2018-05-23 05:18:18 -05:00
3666ec9878
Merge pull request #6574 from Citadel-Station-13/upstream-merge-37530
...
[MIRROR] Replaces HEALS_EARS_2 with a component, adds a wearertargeting parent component for future use
2018-05-23 05:18:15 -05:00
646ebc9c01
Update _ears.dm
2018-05-22 22:14:41 -05:00
f17ca4de1a
Fixes digital valves not working for silicons
2018-05-22 22:12:14 -05:00
1b0a6b3bd7
Fixes digital valves not working for silicons ( #37969 )
...
* Update valve.dm
* Blah blah interaction flags
2018-05-22 22:12:14 -05:00
864a2125ad
Chasms no longer drop those buckled to undroppable objects
2018-05-22 22:12:06 -05:00
f245529511
Chasms no longer drop those buckled to undroppable objects ( #37970 )
...
* Chasms no longer drop those buckled to undroppable objects
* Moves a check down for efficiency/not needing to check things twice
* Change logic order so this hack works
2018-05-22 22:12:06 -05:00
292c5dfa96
Automatic changelog generation for PR #6573 [ci skip]
2018-05-22 22:09:37 -05:00
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
647aa4f306
Update charged.dm
2018-05-22 12:30:43 -05:00
e4c8e1b416
Update eutactic_blades.dm
2018-05-22 09:29:23 -05:00
06b7cdf27a
Merge branch 'master' into upstream-merge-37529
2018-05-22 08:02:46 -05:00
488842a520
Update charged.dm
2018-05-22 08:01:29 -05:00
a610e635f1
Update ids.dm
2018-05-22 08:00:04 -05:00
63aa6eeee6
Update lava.dm
2018-05-22 07:58:44 -05:00
6a575f19d1
Merge branch 'master' into upstream-merge-37597
2018-05-22 07:21:53 -05:00
467819beba
Update flags.dm
2018-05-22 07:20:27 -05:00
c1aab03bb5
Merge branch 'master' into upstream-merge-37530
2018-05-22 07:19:06 -05:00
b3e5513185
Automatic changelog generation for PR #6558 [ci skip]
2018-05-22 07:18:36 -05:00
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
6bbab2ab06
Automatic changelog generation for PR #6555 [ci skip]
2018-05-22 07:17:44 -05:00
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
9afa6b9290
Merge pull request #6779 from Citadel-Station-13/upstream-merge-37883
...
[MIRROR] Fixes soulstone runtime
2018-05-22 02:30:01 +00:00
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
c150988997
Automatic changelog generation for PR #6829 [ci skip]
2018-05-21 21:28:23 -05: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
da36ad5f41
Automatic changelog generation for PR #6830 [ci skip]
2018-05-21 21:27:57 -05: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
f07710c570
Automatic changelog generation for PR #6831 [ci skip]
2018-05-21 21:27:41 -05: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
29a6589336
Automatic changelog generation for PR #6832 [ci skip]
2018-05-21 21:27:23 -05: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
efc5828284
Automatic changelog generation for PR #6834 [ci skip]
2018-05-21 21:26:41 -05: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
a8d5c7d800
Automatic changelog generation for PR #6839 [ci skip]
2018-05-21 21:25:15 -05: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
c654859eb0
Automatic changelog generation for PR #6840 [ci skip]
2018-05-21 21:24:59 -05:00
LetterJay