Skip to content

Commit 02e9a1d

Browse files
more sanity
1 parent 79f0dd4 commit 02e9a1d

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

code/game/machinery/camera/camera.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ var/list/camera_names=list()
2020
var/c_tag_order = 999
2121
var/status = 1.0
2222
anchored = 1.0
23+
fanshot_unanchors = 0
2324
var/invuln = null
2425
var/bugged = 0
2526
var/failure_chance = 10

code/game/machinery/door_control.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@
2525
*/
2626

2727
anchored = 1.0
28+
fanshot_unanchors = 0
2829
use_power = MACHINE_POWER_USE_IDLE
2930
idle_power_usage = 2
3031
active_power_usage = 4
3132

3233
ghost_read=0
3334
ghost_write=0
3435

35-
machine_flags = EMAGGABLE | MULTITOOL_MENU
36+
machine_flags = EMAGGABLE | MULTITOOL_MENU | FIXED2WORK
3637

3738
/obj/machinery/door_control/attack_ai(mob/user as mob)
3839
if(wires & 2)

code/game/objects/items/devices/radio/intercom.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
desc = "Talk through this."
44
icon_state = "intercom"
55
anchored = 1
6+
fanshot_unanchors = 0
67
w_class = W_CLASS_LARGE
78
canhear_range = 2
89
var/number = 0

code/modules/projectiles/projectile/bullets.dm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,11 @@
9090
var/multiplier = (7 / (dist > 0 && dist <= 7 ? dist : 7)) * powermult
9191
if(arcanetampered)
9292
multiplier *= 5
93-
if(unanchors || arcanetampered)
94-
if(AM.anchored && AM.fanshot_unanchors && get_dist(starting,AM) < 4)
93+
if((unanchors || arcanetampered) && get_dist(starting,AM) < 4)
94+
if(AM.anchored && AM.fanshot_unanchors)
9595
AM.anchored = 0
96+
AM.pixel_x = clamp(AM.pixel_x,-16,16)
97+
AM.pixel_y = clamp(AM.pixel_y,-16,16)
9698
if(istype(AM,/obj/machinery))
9799
var/obj/machinery/M = AM
98100
M.state = 0

0 commit comments

Comments
 (0)