diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index a74cd84c..b341c857 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1194,4 +1194,44 @@ attack_self(mob/user as mob) if(isliving(user)) - user.visible_message("\red [user] raises [src].\nThey read: [rank] [surname] - [spec], Emergency Response Team.","\red You raise [src].\nThey read: [rank] [surname] - [spec], Emergency Response Team.") \ No newline at end of file + user.visible_message("\red [user] raises [src].\nThey read: [rank] [surname] - [spec], Emergency Response Team.","\red You raise [src].\nThey read: [rank] [surname] - [spec], Emergency Response Team.") + +/obj/item/clothing/tie/fluff/scofield_watch //Hunter Scofield - Smifboy78 + name = "gold pocket-watch" + desc = "A small pocket watch. It appears to be gold plated, with the initials D.M.S on the back." + icon = 'icons/obj/custom_items.dmi' + icon_state = "watch" + w_class = 1 + var wired = 1 + + verb/checktime() + set category = "Object" + set name = "Check Time" + set src in usr + + if(wired) + usr.visible_message ("[usr] clicks open their [src], and glances at the time for a moment.", "You click open the face of your [src], reading the analog display of the time: '[worldtime2text()]' ") + else + usr << "You check your watch as it dawns on you that it's broken" + +/obj/item/clothing/head/fluff/ziva_bandana //Ziva's Bandana - Ziva Mo'taki - SierraKomodo + name = "Ziva's bandana" + desc = "An old orange-ish-yellow bandana. It has a few stains from engine grease, and the color has been dulled." + icon = 'icons/obj/custom_items.dmi' + icon_state = "motaki_bandana" + item_state = "taryn_kifer_1" + flags = FPRINT|TABLEPASS + flags_inv = 0 + +/obj/item/clothing/tie/fluff/straughan_necklace //Rejection Syndrome Necklace - Nick Straughan - Nanotoxin + name = "rejection syndrome necklace" + desc = "A small silver necklace with the words, 'prosthetic rejection syndrome; body rejects mechanical eyes, shaded eyewear needed.' engraved into it." + icon = 'icons/obj/custom_items.dmi' + icon_state = "straughan_necklace" + item_state = "straughan_necklace" + item_color = "straughan_necklace" + slot_flags = SLOT_MASK + +/obj/item/clothing/tie/fluff/straughan_necklace/attack_self(mob/user as mob) + if(isliving(user)) + user.visible_message("\red [user] holds up their [src].\nIt reads: Prosthetic rejection syndrome. Patient's body rejects mechanical eyes. Shaded eyewear required.","\red You display the [src], showing the room your medical condition.") diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 3a3f6cdd..5e1d8a3a 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -168,6 +168,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "Ghost" set desc = "Relinquish your life and enter the land of the dead." + if(mind.special_role && mind.special_role == "Duty Officer") + src << "\red You are a Duty officer, please use return to mob" + src << "It will handle cleaning up and if you are dead" + return + if(stat == DEAD) ghostize(1) else diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm index 64eeca85..8ba174aa 100644 --- a/code/modules/organs/organ_internal.dm +++ b/code/modules/organs/organ_internal.dm @@ -52,10 +52,10 @@ //** Handle the effects of infections var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin") - + if (germ_level > 0 && germ_level < INFECTION_LEVEL_ONE/2 && prob(30)) germ_level-- - + if (germ_level >= INFECTION_LEVEL_ONE/2) //aiming for germ level to go from ambient to INFECTION_LEVEL_TWO in an average of 15 minutes if(antibiotics < 5 && prob(round(germ_level/6))) @@ -66,7 +66,7 @@ //spread germs if (antibiotics < 5 && parent.germ_level < germ_level && ( parent.germ_level < INFECTION_LEVEL_ONE*2 || prob(30) )) parent.germ_level++ - + if (prob(3)) //about once every 30 seconds take_damage(1,silent=prob(30)) @@ -149,13 +149,15 @@ name = "lungs" parent_organ = "chest" removed_type = /obj/item/organ/lungs + min_bruised_damage = 15 + min_broken_damage = 20 process() ..() if (germ_level > INFECTION_LEVEL_ONE) if(prob(5)) owner.emote("cough") //respitory tract infection - + if(is_bruised()) if(prob(2)) spawn owner.emote("me", 1, "coughs up blood!")