Merge pull request #12762 from GunHog/Of-Scanners-And-Bugfixes

Research scanner fixes
This commit is contained in:
Razharas
2015-11-01 23:32:34 +03:00
3 changed files with 5 additions and 3 deletions
+1 -1
View File
@@ -320,7 +320,6 @@
owner << "<span class='notice'> Research analyzer deactivated.</span>"
/datum/action/innate/scan_mode/Grant(mob/living/T)
devices += 1
..(T)
/datum/action/innate/scan_mode/CheckRemoval(mob/living/user)
@@ -330,4 +329,5 @@
/datum/action/innate/scan_mode/Remove(mob/living/T)
owner.research_scanner = 0
active = 0
..(T)
+2 -1
View File
@@ -39,11 +39,12 @@
/obj/item/clothing/glasses/science/equipped(mob/user, slot)
if(slot == slot_glasses)
user.scanner.devices += 1
user.scanner.Grant(user)
..(user, slot)
/obj/item/clothing/glasses/science/dropped(mob/user)
user.scanner.devices -= 1
user.scanner.devices = max(0, user.scanner.devices - 1)
..(user)
/obj/item/clothing/glasses/night
+2 -1
View File
@@ -339,6 +339,7 @@
/obj/item/clothing/head/helmet/space/hardsuit/rd/equipped(mob/living/carbon/human/user, slot)
..(user, slot)
user.scanner.Grant(user)
user.scanner.devices += 1
if(user.glasses && istype(user.glasses, /obj/item/clothing/glasses/hud/diagnostic))
user << ("<span class='warning'>Your [user.glasses] prevents you using [src]'s diagnostic visor HUD.</span>")
else
@@ -348,7 +349,7 @@
/obj/item/clothing/head/helmet/space/hardsuit/rd/dropped(mob/living/carbon/human/user)
..(user)
user.scanner.devices -= 1
user.scanner.devices = max(0, user.scanner.devices - 1)
if(onboard_hud_enabled && !(user.glasses && istype(user.glasses, /obj/item/clothing/glasses/hud/diagnostic)))
var/datum/atom_hud/DHUD = huds[DATA_HUD_DIAGNOSTIC]
DHUD.remove_hud_from(user)