mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 03:25:49 +01:00
More runtime errors squashed.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@231 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -4,7 +4,9 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
|
||||
message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ")
|
||||
|
||||
defer_powernet_rebuild = 1
|
||||
|
||||
if (!istype(epicenter, /turf))
|
||||
epicenter = epicenter.loc
|
||||
return explosion(epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range)
|
||||
playsound(epicenter.loc, 'explosionfar.ogg', 100, 1, round(devastation_range*2,1) )
|
||||
playsound(epicenter.loc, "explosion", 100, 1, round(devastation_range,1) )
|
||||
|
||||
|
||||
@@ -123,7 +123,8 @@
|
||||
W.loc = src
|
||||
src.brain = W
|
||||
var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(src.loc))
|
||||
O.gender = src.brain.owner.gender
|
||||
if (src.brain.owner)
|
||||
O.gender = src.brain.owner.gender
|
||||
//O.start = 1
|
||||
O.invisibility = 0
|
||||
O.name = "Cyborg"
|
||||
|
||||
@@ -163,14 +163,16 @@ WELDINGTOOOL
|
||||
/obj/item/weapon/weldingtool/proc/eyecheck(mob/user as mob)
|
||||
//check eye protection
|
||||
var/safety = null
|
||||
|
||||
if (istype(user:head, /obj/item/clothing/head/helmet/welding) || istype(user:head, /obj/item/clothing/head/helmet/space))
|
||||
safety = 2
|
||||
else if (istype(user:glasses, /obj/item/clothing/glasses/sunglasses))
|
||||
safety = 1
|
||||
else if (istype(user:glasses, /obj/item/clothing/glasses/thermal))
|
||||
safety = -1
|
||||
else
|
||||
if (istype(user, /mob/living/carbon/human))
|
||||
if (istype(user:head, /obj/item/clothing/head/helmet/welding) || istype(user:head, /obj/item/clothing/head/helmet/space))
|
||||
safety = 2
|
||||
else if (istype(user:glasses, /obj/item/clothing/glasses/sunglasses))
|
||||
safety = 1
|
||||
else if (istype(user:glasses, /obj/item/clothing/glasses/thermal))
|
||||
safety = -1
|
||||
else
|
||||
safety = 0
|
||||
else if(istype(user, /mob/living/carbon))
|
||||
safety = 0
|
||||
switch(safety)
|
||||
if(1)
|
||||
|
||||
@@ -214,5 +214,6 @@
|
||||
/obj/crate/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if(opened)
|
||||
user.drop_item()
|
||||
W.loc = src.loc
|
||||
if(W)
|
||||
W.loc = src.loc
|
||||
else return attack_hand(user)
|
||||
@@ -115,12 +115,14 @@
|
||||
var/turf/T = src.loc
|
||||
if (ismob(T))
|
||||
T = T.loc
|
||||
src.part1.loc = T
|
||||
src.part2.loc = T
|
||||
src.part1.master = null
|
||||
src.part2.master = null
|
||||
src.part1 = null
|
||||
src.part2 = null
|
||||
if (src.part1)
|
||||
src.part1.loc = T
|
||||
src.part1.master = null
|
||||
src.part1 = null
|
||||
if (src.part2)
|
||||
src.part2.loc = T
|
||||
src.part2.master = null
|
||||
src.part2 = null
|
||||
|
||||
del(src)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user