Bedsheet inhands and other fixes (#7559)

Adds more bedsheet inhands, because immersion.
Penlight has an inhand now.
Lanterns have new inhands.
Ashtray cigarette extinguish now properly plays the sound.
You can put cigarette butts in cigarette packets

also some more stupid drop sounds
This commit is contained in:
Wowzewow (Wezzy)
2019-12-05 23:43:49 +02:00
committed by Erki
parent b56629f846
commit a6688878a4
25 changed files with 139 additions and 19 deletions
@@ -14,6 +14,7 @@
var/produce_heat = 1500
light_wedge = LIGHT_OMNI
activation_sound = 'sound/items/flare.ogg'
drop_sound = 'sound/items/drop/gloves.ogg'
/obj/item/device/flashlight/flare/New()
fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
@@ -100,7 +100,7 @@
name = "penlight"
desc = "A pen-sized light, used by medical staff."
icon_state = "penlight"
item_state = ""
item_state = "pen"
drop_sound = 'sound/items/drop/accessory.ogg'
flags = CONDUCT
slot_flags = SLOT_EARS
+10 -10
View File
@@ -11,7 +11,7 @@ BREATH ANALYZER
name = "health analyzer"
desc = "A hand-held body scanner able to distinguish vital signs of the subject."
icon_state = "health"
item_state = "analyzer"
item_state = "healthanalyzer"
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 3
@@ -74,12 +74,12 @@ BREATH ANALYZER
return
var/fake_oxy = max(rand(1,40), M.getOxyLoss(), (300 - (M.getToxLoss() + M.getFireLoss() + M.getBruteLoss())))
var/OX = 0
var/TX = 0
var/BU = 0
var/BR = 0
if (adv == TRUE)
OX = M.getOxyLoss()
TX = M.getToxLoss()
@@ -90,7 +90,7 @@ BREATH ANALYZER
TX = calcDamage(M.getToxLoss())
BU = calcDamage(M.getFireLoss())
BR = calcDamage(M.getBruteLoss())
if(M.status_flags & FAKEDEATH)
if (adv == TRUE)
OX = fake_oxy
@@ -164,12 +164,12 @@ BREATH ANALYZER
var/datum/record/virus/V = SSrecords.find_record("id", "[ID]", RECORD_VIRUS)
if(istype(V))
user.show_message("<span class='warning'>Warning: Pathogen [V.name] detected in subject's blood. Known antigen : [V.antigen]</span>")
if(M.nutrition / M.max_nutrition <= CREW_NUTRITION_VERYHUNGRY)
user.show_message("<span class='warning'>Subject malnourished. Food intake recommended.</span>")
if(M.hydration / M.max_hydration <= CREW_HYDRATION_VERYTHIRSTY)
user.show_message("<span class='warning'>Subject dehydrated. Fluid intake recommended.</span>")
if (M.getCloneLoss())
user.show_message("<span class='warning'>Subject appears to have been imperfectly cloned.</span>")
for(var/datum/disease/D in M.viruses)
@@ -226,7 +226,7 @@ BREATH ANALYZER
else
user.show_message("<span class='notice'>Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]</span>")
user.show_message("<span class='notice'>Subject's pulse: <font color='[H.pulse() == PULSE_THREADY || H.pulse() == PULSE_NONE ? "red" : "blue"]'>[H.get_pulse(GETPULSE_TOOL)] bpm.</font></span>")
/obj/item/device/healthanalyzer/verb/toggle_mode()
set name = "Switch Verbosity"
set category = "Object"
@@ -237,19 +237,19 @@ BREATH ANALYZER
to_chat(usr, "The scanner now shows specific limb damage.")
else
to_chat(usr, "The scanner no longer shows limb damage.")
/obj/item/device/healthanalyzer/adv
name = "advanced health analyzer"
desc = "An advanced hand-held body scanner able to accurately distinguish vital signs of the subject. Now in gold!"
icon_state = "advhealth"
matter = list(DEFAULT_WALL_MATERIAL = 250)
origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
/obj/item/device/healthanalyzer/adv/attack(mob/living/M as mob, mob/living/user as mob)
health_scan_mob(M, user, TRUE)
src.add_fingerprint(user)
return
/obj/item/device/healthanalyzer/adv/attack_self(mob/user)
health_scan_mob(user, user, TRUE)
src.add_fingerprint(user)