mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 19:47:22 +01:00
Fixed a bunch of the runtime errors cropping up in the server logs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@175 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -168,9 +168,10 @@
|
||||
break
|
||||
if(clear)
|
||||
L+=T
|
||||
|
||||
usr.loc = pick(L)
|
||||
|
||||
if (L.len)
|
||||
usr.loc = pick(L)
|
||||
else
|
||||
usr << "Teleporting to that area doesn't seem to be working currently. But at least now it tells you that."
|
||||
|
||||
var/list/karma_spenders = list()
|
||||
|
||||
|
||||
@@ -1004,15 +1004,16 @@
|
||||
if (istype(src.wear_suit, /obj/item/clothing/suit))
|
||||
var/t1 = src.wear_suit.icon_state
|
||||
src.overlays += image("icon" = 'suit.dmi', "icon_state" = text("[][]", t1, (!( src.lying ) ? null : "2")), "layer" = MOB_LAYER)
|
||||
if (src.wear_suit.blood_DNA)
|
||||
var/icon/stain_icon = null
|
||||
if (istype(src.wear_suit, /obj/item/clothing/suit/armor/vest || /obj/item/clothing/suit/wcoat || /obj/item/clothing/suit/armor/a_i_a_ptank))
|
||||
stain_icon = icon('blood.dmi', "armorblood[!src.lying ? "" : "2"]")
|
||||
else if (istype(src.wear_suit, /obj/item/clothing/suit/det_suit || /obj/item/clothing/suit/labcoat))
|
||||
stain_icon = icon('blood.dmi', "coatblood[!src.lying ? "" : "2"]")
|
||||
else
|
||||
stain_icon = icon('blood.dmi', "suitblood[!src.lying ? "" : "2"]")
|
||||
src.overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
|
||||
if (src.wear_suit)
|
||||
if (src.wear_suit.blood_DNA)
|
||||
var/icon/stain_icon = null
|
||||
if (istype(src.wear_suit, /obj/item/clothing/suit/armor/vest || /obj/item/clothing/suit/wcoat || /obj/item/clothing/suit/armor/a_i_a_ptank))
|
||||
stain_icon = icon('blood.dmi', "armorblood[!src.lying ? "" : "2"]")
|
||||
else if (istype(src.wear_suit, /obj/item/clothing/suit/det_suit || /obj/item/clothing/suit/labcoat))
|
||||
stain_icon = icon('blood.dmi', "coatblood[!src.lying ? "" : "2"]")
|
||||
else
|
||||
stain_icon = icon('blood.dmi', "suitblood[!src.lying ? "" : "2"]")
|
||||
src.overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
|
||||
src.wear_suit.screen_loc = ui_oclothing
|
||||
if (istype(src.wear_suit, /obj/item/clothing/suit/straight_jacket))
|
||||
if (src.handcuffed)
|
||||
|
||||
@@ -4,8 +4,9 @@
|
||||
spawn( 0 )
|
||||
O.mode = 0
|
||||
if(!isturf(src.loc))
|
||||
src.client.eye = src.loc
|
||||
src.client.perspective = EYE_PERSPECTIVE
|
||||
if (src.client)
|
||||
src.client.eye = src.loc
|
||||
src.client.perspective = EYE_PERSPECTIVE
|
||||
if (src.stat == 2)
|
||||
src.verbs += /mob/proc/ghostize
|
||||
return
|
||||
@@ -1403,11 +1403,12 @@
|
||||
M << "\red Admin PM from-<b>[key_name(usr, M, 0)]</b>: [t]"
|
||||
usr << "\blue Admin PM to-<b>[key_name(M, usr, 1)]</b>: [t]"
|
||||
else
|
||||
if (M.client && M.client.holder)
|
||||
M << "\blue Reply PM from-<b>[key_name(usr, M, 1)]</b>: [t]"
|
||||
else
|
||||
M << "\red Reply PM from-<b>[key_name(usr, M, 0)]</b>: [t]"
|
||||
usr << "\blue Reply PM to-<b>[key_name(M, usr, 0)]</b>: [t]"
|
||||
if (M)
|
||||
if (M.client && M.client.holder)
|
||||
M << "\blue Reply PM from-<b>[key_name(usr, M, 1)]</b>: [t]"
|
||||
else
|
||||
M << "\red Reply PM from-<b>[key_name(usr, M, 0)]</b>: [t]"
|
||||
usr << "\blue Reply PM to-<b>[key_name(M, usr, 0)]</b>: [t]"
|
||||
|
||||
log_admin("PM: [key_name(usr)]->[key_name(M)] : [t]")
|
||||
|
||||
@@ -1868,7 +1869,8 @@
|
||||
|
||||
newmob = new/mob/dead/observer(src)
|
||||
src:client:mob = newmob
|
||||
src.mind.transfer_to(newmob)
|
||||
if (src.mind)
|
||||
src.mind.transfer_to(newmob)
|
||||
|
||||
var/virus = src.virus
|
||||
if (istype(src, /mob/living/silicon))
|
||||
|
||||
@@ -11,10 +11,11 @@
|
||||
|
||||
/obj/machinery/power/solar/attackby(obj/item/weapon/W, mob/user)
|
||||
..()
|
||||
src.add_fingerprint(user)
|
||||
src.health -= W.force
|
||||
src.healthcheck()
|
||||
return
|
||||
if (W)
|
||||
src.add_fingerprint(user)
|
||||
src.health -= W.force
|
||||
src.healthcheck()
|
||||
return
|
||||
|
||||
/obj/machinery/power/solar/blob_act()
|
||||
src.health--
|
||||
|
||||
Reference in New Issue
Block a user