Merge pull request #8782 from Cerebulon/medical_resprites
Selective Medical Resprites
@@ -167,7 +167,7 @@
|
||||
/obj/machinery/sleeper/attack_hand(var/mob/user)
|
||||
if(!controls_inside)
|
||||
return FALSE
|
||||
|
||||
|
||||
if(user == occupant)
|
||||
tgui_interact(user)
|
||||
|
||||
@@ -184,6 +184,7 @@
|
||||
var/occupantData[0]
|
||||
// var/crisis = 0
|
||||
if(occupant)
|
||||
icon_state = "sleeper_2"
|
||||
occupantData["name"] = occupant.name
|
||||
occupantData["stat"] = occupant.stat
|
||||
occupantData["health"] = occupant.health
|
||||
@@ -349,6 +350,7 @@
|
||||
|
||||
if(filtering > 0)
|
||||
if(beaker)
|
||||
icon_state = "sleeper_2"
|
||||
if(beaker.reagents.total_volume < beaker.reagents.maximum_volume)
|
||||
var/pumped = 0
|
||||
for(var/datum/reagent/x in occupant.reagents.reagent_list)
|
||||
|
||||
@@ -128,7 +128,7 @@
|
||||
occupant.client.perspective = MOB_PERSPECTIVE
|
||||
occupant.loc = src.loc
|
||||
occupant = null
|
||||
icon_state = "body_scanner_1"
|
||||
icon_state = "body_scanner_0"
|
||||
SStgui.update_uis(src)
|
||||
return
|
||||
|
||||
@@ -181,7 +181,7 @@
|
||||
|
||||
var/occupantData[0]
|
||||
if(occupant && ishuman(occupant))
|
||||
icon_state = "body_scanner_1"
|
||||
icon_state = "body_scanner_2"
|
||||
var/mob/living/carbon/human/H = occupant
|
||||
occupantData["name"] = H.name
|
||||
occupantData["stat"] = H.stat
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
name = "biopsy scanner"
|
||||
desc = "Extracts information on wounds."
|
||||
icon = 'icons/obj/autopsy_scanner.dmi'
|
||||
icon_state = ""
|
||||
icon_state = "autopsy_scanner"
|
||||
item_state = "autopsy_scanner"
|
||||
w_class = ITEMSIZE_SMALL
|
||||
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
|
||||
|
||||
@@ -514,10 +514,10 @@
|
||||
|
||||
/obj/item/storage/box/freezer
|
||||
name = "portable freezer"
|
||||
desc = "This nifty shock-resistant device will keep your 'groceries' nice and non-spoiled."
|
||||
desc = "This nifty shock-resistant, self-refrigerating device will keep your 'groceries' nice and non-spoiled."
|
||||
icon = 'icons/obj/storage.dmi'
|
||||
icon_state = "portafreezer"
|
||||
item_state_slots = list(slot_r_hand_str = "medicalpack", slot_l_hand_str = "medicalpack")
|
||||
item_state_slots = list(slot_r_hand_str = "firstaid-advanced", slot_l_hand_str = "firstaid-advanced")
|
||||
foldable = null
|
||||
max_w_class = ITEMSIZE_NORMAL
|
||||
can_hold = list(/obj/item/organ)
|
||||
@@ -564,4 +564,4 @@
|
||||
max_w_class = ITEMSIZE_TINY
|
||||
max_storage_space = ITEMSIZE_COST_TINY * 15
|
||||
drop_sound = 'sound/items/drop/ammobox.ogg'
|
||||
pickup_sound = 'sound/items/pickup/ammobox.ogg'
|
||||
pickup_sound = 'sound/items/pickup/ammobox.ogg'
|
||||
|
||||
@@ -192,6 +192,7 @@
|
||||
throw_speed = 3
|
||||
throw_range = 5
|
||||
attack_verb = list("attacked", "hit", "bludgeoned")
|
||||
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
|
||||
drop_sound = 'sound/items/drop/scrap.ogg'
|
||||
|
||||
/obj/item/surgical/bone_clamp
|
||||
|
||||
|
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 80 KiB |
|
Before Width: | Height: | Size: 346 B After Width: | Height: | Size: 607 B |
|
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 69 KiB |
|
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 63 KiB |
|
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 53 KiB |