mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-30 23:48:28 +01:00
Bugfixes for Hallucinations, borgs'n'doors, and airlocks autorefreshing.
This commit is contained in:
@@ -427,12 +427,6 @@ proc/airborne_can_reach(turf/source, turf/target)
|
||||
activate(var/mob/living/carbon/mob,var/multiplier)
|
||||
mob.toxloss += 15
|
||||
|
||||
/*/datum/disease2/effect/greater/hallucinations
|
||||
name = "Hallucinational Syndrome"
|
||||
stage = 3
|
||||
activate(var/mob/living/carbon/mob,var/multiplier)
|
||||
mob.hallucination += 25*/
|
||||
|
||||
/datum/disease2/effect/greater/sleepy
|
||||
name = "Resting syndrome"
|
||||
stage = 3
|
||||
@@ -514,12 +508,6 @@ proc/airborne_can_reach(turf/source, turf/target)
|
||||
var/obj/effect/decal/cleanable/mucus/this = new(mob.loc)
|
||||
this.virus2 = mob.virus2
|
||||
|
||||
/*/datum/disease2/effect/lesser/hallucinations
|
||||
name = "Hallucinational Syndrome"
|
||||
stage = 3
|
||||
activate(var/mob/living/carbon/mob,var/multiplier)
|
||||
mob.hallucination += 5*/
|
||||
|
||||
/*/datum/disease2/effect/lesser/arm
|
||||
name = "Disarming Syndrome"
|
||||
stage = 4
|
||||
|
||||
@@ -1256,6 +1256,8 @@ About the new airlock wires panel:
|
||||
src.updateUsrDialog()
|
||||
if((istype(usr.equipped(), /obj/item/device/hacktool)))
|
||||
return attack_ai(usr, usr.equipped())
|
||||
else if(issilicon(usr))
|
||||
return attack_ai(usr)
|
||||
return
|
||||
|
||||
|
||||
|
||||
@@ -131,7 +131,7 @@
|
||||
/obj/machinery/door/attackby(obj/item/I as obj, mob/user as mob)
|
||||
if(istype(I, /obj/item/device/detective_scanner))
|
||||
return ..()
|
||||
if (src.operating)
|
||||
if (src.operating || isrobot(user))
|
||||
return
|
||||
src.add_fingerprint(user)
|
||||
if (!src.requiresID())
|
||||
|
||||
@@ -1548,7 +1548,7 @@ datum
|
||||
M:heal_organ_damage(3,3)
|
||||
M:adjustToxLoss(-3)
|
||||
M:halloss = 0
|
||||
M:hallucination -= 5
|
||||
M:hallucination = max(M:hallucination - 5,0)
|
||||
..()
|
||||
return
|
||||
|
||||
|
||||
@@ -132,6 +132,7 @@ mob/living/carbon/proc/handle_hallucinations()
|
||||
src << 'Taser.ogg'
|
||||
//Rare audio
|
||||
if(12)
|
||||
//These sounds are (mostly) taken from Hidden: Source
|
||||
var/list/creepyasssounds = list('ghost.ogg', 'ghost2.ogg', 'Heart Beat.ogg', 'screech.ogg',\
|
||||
'behind_you1.ogg', 'behind_you2.ogg', 'far_noise.ogg', 'growl1.ogg', 'growl2.ogg',\
|
||||
'growl3.ogg', 'im_here1.ogg', 'im_here2.ogg', 'i_see_you1.ogg', 'i_see_you2.ogg',\
|
||||
|
||||
Reference in New Issue
Block a user