cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

2016 Bugfix Roundup (#10731)

Browse Source 
Fixes #833
Fixes #934
Fixes #1125
Fixes #1186
This commit is contained in:
Wildkins
2020-12-06 15:09:05 +02:00
committed by GitHub
parent 4c5ee9fb45
commit 23791c531b
7 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/species.dm
+10 -4
View File
@@ -467,9 +467,15 @@
/datum/species/proc/handle_vision(var/mob/living/carbon/human/H)
var/list/vision = H.get_accumulated_vision_handlers()
H.update_sight()
H.sight |= get_vision_flags(H)
H.sight |= H.equipment_vision_flags
H.sight |= vision[1]
if(H.machine && H.machine.check_eye(H) >= 0 && H.client.eye != H)
// we inherit sight flags from the machine
H.sight &= ~(get_vision_flags(H))
H.sight &= ~(H.equipment_vision_flags)
H.sight &= ~(vision[1])
else
H.sight |= get_vision_flags(H)
H.sight |= H.equipment_vision_flags
H.sight |= vision[1]
if(H.stat == DEAD)
return 1
@@ -637,4 +643,4 @@
return E.key
/datum/species/proc/get_injection_modifier()
return injection_mod
return injection_mod
code/modules/mob/living/living.dm
+3 -3
View File
@@ -24,10 +24,10 @@ var/mob/living/next_point_time = 0
face_atom(A)
if(isturf(A))
if(pointing_effect)
clear_point()
QDEL_NULL(pointing_effect)
pointing_effect = new /obj/effect/decal/point(A)
pointing_effect.invisibility = invisibility
addtimer(CALLBACK(src, .proc/clear_point), 20)
addtimer(CALLBACK(GLOBAL_PROC, /proc/qdel, pointing_effect), 2 SECONDS)
else
var/pointglow = filter(type = "drop_shadow", x = 0, y = -1, offset = 1, size = 1, color = "#F00")
LAZYADD(A.filters, pointglow)
@@ -980,4 +980,4 @@ default behaviour is:
set hidden = 1
set name = "mov_intent"
if(hud_used?.move_intent)
hud_used.move_intent.Click()
hud_used.move_intent.Click()
code/modules/mob/mob.dm
+2 -6
View File
@@ -341,14 +341,10 @@
pointing_effect = new /obj/effect/decal/point(tile)
pointing_effect.invisibility = invisibility
addtimer(CALLBACK(src, .proc/clear_point), 20)
addtimer(CALLBACK(GLOBAL_PROC, /proc/qdel, pointing_effect), 2 SECONDS)
face_atom(A)
return 1
/mob/proc/clear_point()
QDEL_NULL(pointing_effect)
/datum/mobl // I have no idea what the fuck this is, but it's better for it to be a datum than an /obj/effect.
var/list/container = list()
var/master
@@ -1448,4 +1444,4 @@
if(!check_has_body_select())
return
var/obj/screen/zone_sel/selector = mob.zone_sel
selector.set_selected_zone(next_in_list(mob.zone_sel.selecting,zones))
selector.set_selected_zone(next_in_list(mob.zone_sel.selecting,zones))