mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 13:05:44 +01:00
Janitor, hydroponics and medical inhands (#8456)
This commit is contained in:
@@ -34,10 +34,13 @@
|
||||
|
||||
|
||||
/obj/item/device/lightreplacer
|
||||
|
||||
name = "light replacer"
|
||||
desc = "A device to automatically replace lights. Refill with working lightbulbs or sheets of glass."
|
||||
icon = 'icons/obj/janitor.dmi'
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
|
||||
)
|
||||
icon_state = "lightreplacer"
|
||||
item_state = "lightreplacer"
|
||||
|
||||
|
||||
@@ -2,7 +2,12 @@
|
||||
name = "\improper DNA injector"
|
||||
desc = "This injects the person with DNA."
|
||||
icon = 'icons/obj/items.dmi'
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
|
||||
)
|
||||
icon_state = "dnainjector"
|
||||
item_state = "dnainjector"
|
||||
var/block=0
|
||||
var/datum/dna2/record/buf=null
|
||||
var/s_time = 10.0
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
/obj/item/implanter
|
||||
name = "implanter"
|
||||
icon = 'icons/obj/items.dmi'
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
|
||||
)
|
||||
icon_state = "implanter0"
|
||||
item_state = "syringe_0"
|
||||
throw_speed = 1
|
||||
|
||||
@@ -90,6 +90,10 @@ Protectiveness | Armor %
|
||||
desc = "It's a bucket with a large hole cut into it. You could wear it on your head."
|
||||
flags_inv = HIDEEARS|HIDEEYES|BLOCKHAIR
|
||||
icon = 'icons/obj/clothing/material_armor.dmi'
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
|
||||
)
|
||||
icon_state = "bucket"
|
||||
item_state = "bucket"
|
||||
armor = list(melee = 5, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
|
||||
@@ -28,7 +28,12 @@
|
||||
name = "hatchet"
|
||||
desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
|
||||
icon = 'icons/obj/weapons.dmi'
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_hydro.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_hydro.dmi',
|
||||
)
|
||||
icon_state = "hatchet"
|
||||
item_state = "hatchet"
|
||||
force_divisor = 0.2 // 12 with hardness 60 (steel)
|
||||
thrown_force_divisor = 0.75 // 15 with weight 20 (steel)
|
||||
w_class = 2
|
||||
@@ -68,6 +73,10 @@
|
||||
name = "mini hoe"
|
||||
desc = "It's used for removing weeds or scratching your back."
|
||||
icon = 'icons/obj/weapons.dmi'
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_hydro.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_hydro.dmi',
|
||||
)
|
||||
icon_state = "hoe"
|
||||
item_state = "hoe"
|
||||
force_divisor = 0.25 // 5 with weight 20 (steel)
|
||||
|
||||
@@ -2,6 +2,10 @@
|
||||
desc = "The world of janitalia wouldn't be complete without a mop."
|
||||
name = "mop"
|
||||
icon = 'icons/obj/janitor.dmi'
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
|
||||
)
|
||||
icon_state = "mop"
|
||||
item_state = "mop"
|
||||
force = 3.0
|
||||
|
||||
@@ -5,6 +5,10 @@
|
||||
desc = "A cheap bar of soap. Doesn't smell."
|
||||
gender = PLURAL
|
||||
icon = 'icons/obj/soap.dmi'
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
|
||||
)
|
||||
icon_state = "soap"
|
||||
item_state = "soap"
|
||||
w_class = 2.0
|
||||
|
||||
@@ -33,6 +33,10 @@
|
||||
name = "trash bag"
|
||||
desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
|
||||
icon = 'icons/obj/janitor.dmi'
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
|
||||
)
|
||||
icon_state = "trashbag0"
|
||||
item_state = "trashbag"
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
name = "box"
|
||||
desc = "It's just an ordinary box."
|
||||
icon_state = "box"
|
||||
item_state = "syringe_kit"
|
||||
item_state = "box"
|
||||
center_of_mass = list("x" = 13,"y" = 10)
|
||||
var/foldable = /obj/item/stack/material/cardboard // BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard
|
||||
var/maxHealth = 20 //health is already defined
|
||||
@@ -360,7 +360,7 @@
|
||||
name = "death alarm kit"
|
||||
desc = "Box of stuff used to implant death alarms."
|
||||
icon_state = "implant"
|
||||
item_state = "syringe_kit"
|
||||
item_state = "box"
|
||||
starts_with = list(/obj/item/implanter = 1, /obj/item/implantcase/death_alarm = 6)
|
||||
|
||||
/obj/item/storage/box/condimentbottles
|
||||
@@ -501,7 +501,7 @@
|
||||
icon = 'icons/obj/storage.dmi'
|
||||
icon_state = "light"
|
||||
desc = "This box is shaped on the inside so that only light tubes and bulbs fit."
|
||||
item_state = "syringe_kit"
|
||||
item_state = "box"
|
||||
use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
|
||||
|
||||
/obj/item/storage/box/lights/Initialize() // TODO-STORAGE: Initialize()?
|
||||
@@ -584,6 +584,10 @@
|
||||
name = "portable freezer"
|
||||
desc = "This nifty shock-resistant device will keep your 'groceries' nice and non-spoiled."
|
||||
icon = 'icons/obj/storage.dmi'
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
|
||||
)
|
||||
icon_state = "portafreezer"
|
||||
item_state = "medicalpack"
|
||||
max_w_class = 3
|
||||
@@ -594,9 +598,8 @@
|
||||
/obj/item/storage/box/freezer/organcooler
|
||||
name = "organ cooler"
|
||||
desc = "A sealed, cooled container to keep organs from decaying."
|
||||
icon = 'icons/obj/storage.dmi'
|
||||
icon_state = "organcooler"
|
||||
item_state = "firstaid-advanced"
|
||||
item_state = "advfirstaid"
|
||||
max_w_class = ITEMSIZE_NORMAL
|
||||
foldable = FALSE
|
||||
w_class = ITEMSIZE_LARGE
|
||||
@@ -606,7 +609,6 @@
|
||||
/obj/item/reagent_containers/glass,
|
||||
/obj/item/gun
|
||||
)
|
||||
use_to_pickup = FALSE
|
||||
storage_slots = 2
|
||||
|
||||
/obj/item/storage/box/kitchen
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
|
||||
/obj/item/storage/fancy
|
||||
item_state = "syringe_kit" //placeholder, many of these don't have inhands
|
||||
item_state = "box" //placeholder, many of these don't have inhands
|
||||
var/icon_type = null
|
||||
var/storage_type = "box"
|
||||
drop_sound = 'sound/items/drop/box.ogg'
|
||||
@@ -339,7 +339,7 @@
|
||||
desc = "A locked box for keeping things away from children."
|
||||
icon = 'icons/obj/vialbox.dmi'
|
||||
icon_state = "vialbox0"
|
||||
item_state = "syringe_kit"
|
||||
item_state = "box"
|
||||
use_sound = 'sound/items/drop/glass.ogg'
|
||||
drop_sound = 'sound/items/drop/metalboots.ogg'
|
||||
max_w_class = 2
|
||||
|
||||
@@ -11,6 +11,10 @@
|
||||
name = "first-aid kit"
|
||||
desc = "It's an emergency medical kit for those serious boo-boos."
|
||||
icon_state = "firstaid"
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
|
||||
)
|
||||
center_of_mass = list("x" = 13,"y" = 10)
|
||||
throw_speed = 2
|
||||
throw_range = 8
|
||||
@@ -25,7 +29,7 @@
|
||||
name = "fire first-aid kit"
|
||||
desc = "It's an emergency medical kit for when the toxins lab <i>-spontaneously-</i> burns down."
|
||||
icon_state = "ointment"
|
||||
item_state = "firstaid-ointment"
|
||||
item_state = "ointment"
|
||||
starts_with = list(
|
||||
/obj/item/reagent_containers/pill/kelotane = 3,
|
||||
/obj/item/stack/medical/ointment = 2,
|
||||
@@ -50,7 +54,7 @@
|
||||
name = "toxin first aid"
|
||||
desc = "Used to treat when you have a high amount of toxins in your body."
|
||||
icon_state = "antitoxin"
|
||||
item_state = "firstaid-toxin"
|
||||
item_state = "antitoxin"
|
||||
starts_with = list(
|
||||
/obj/item/reagent_containers/syringe/dylovene = 3,
|
||||
/obj/item/reagent_containers/pill/antitox = 3,
|
||||
@@ -65,7 +69,7 @@
|
||||
name = "oxygen deprivation kit"
|
||||
desc = "A box full of oxygen related goodies."
|
||||
icon_state = "o2"
|
||||
item_state = "firstaid-o2"
|
||||
item_state = "o2"
|
||||
starts_with = list(
|
||||
/obj/item/reagent_containers/inhaler/dexalin = 4,
|
||||
/obj/item/reagent_containers/hypospray/autoinjector/norepinephrine = 2,
|
||||
@@ -76,7 +80,7 @@
|
||||
name = "advanced first-aid kit"
|
||||
desc = "Contains advanced medical treatments."
|
||||
icon_state = "advfirstaid"
|
||||
item_state = "firstaid-advanced"
|
||||
item_state = "advfirstaid"
|
||||
starts_with = list(
|
||||
/obj/item/reagent_containers/hypospray/autoinjector/norepinephrine = 1,
|
||||
/obj/item/stack/medical/advanced/bruise_pack = 3,
|
||||
@@ -88,7 +92,7 @@
|
||||
name = "combat medical kit"
|
||||
desc = "Contains advanced medical treatments."
|
||||
icon_state = "bezerk"
|
||||
item_state = "firstaid-advanced"
|
||||
item_state = "bezerk"
|
||||
starts_with = list(
|
||||
/obj/item/storage/pill_bottle/bicaridine = 1,
|
||||
/obj/item/storage/pill_bottle/dermaline = 1,
|
||||
@@ -103,18 +107,18 @@
|
||||
name = "surgery kit"
|
||||
desc = "Contains tools for surgery. Has precise foam fitting for safe transport."
|
||||
icon_state = "purplefirstaid"
|
||||
item_state = "firstaid-advanced"
|
||||
item_state = "purplefirstaid"
|
||||
use_sound = 'sound/items/storage/briefcase.ogg'
|
||||
starts_with = list(
|
||||
/obj/item/bonesetter = 1,
|
||||
/obj/item/cautery = 1,
|
||||
/obj/item/circular_saw = 1,
|
||||
/obj/item/hemostat = 1,
|
||||
/obj/item/retractor = 1,
|
||||
/obj/item/scalpel = 1,
|
||||
/obj/item/surgicaldrill = 1,
|
||||
/obj/item/bonegel = 1,
|
||||
/obj/item/FixOVein = 1,
|
||||
/obj/item/surgery/bonesetter = 1,
|
||||
/obj/item/surgery/cautery = 1,
|
||||
/obj/item/surgery/circular_saw = 1,
|
||||
/obj/item/surgery/hemostat = 1,
|
||||
/obj/item/surgery/retractor = 1,
|
||||
/obj/item/surgery/scalpel = 1,
|
||||
/obj/item/surgery/surgicaldrill = 1,
|
||||
/obj/item/surgery/bonegel = 1,
|
||||
/obj/item/surgery/FixOVein = 1,
|
||||
/obj/item/stack/medical/advanced/bruise_pack = 1,
|
||||
/obj/item/reagent_containers/inhaler/soporific = 2
|
||||
)
|
||||
@@ -128,6 +132,7 @@
|
||||
name = "brute aid kit"
|
||||
desc = "A NanoTrasen care package for moderately injured miners."
|
||||
icon_state = "brute"
|
||||
item_state = "brute"
|
||||
starts_with = list(
|
||||
/obj/item/stack/medical/bruise_pack = 4,
|
||||
/obj/item/stack/medical/advanced/bruise_pack = 2
|
||||
@@ -141,7 +146,11 @@
|
||||
desc = "It's an airtight container for storing medication."
|
||||
icon_state = "pill_canister"
|
||||
icon = 'icons/obj/chemical.dmi'
|
||||
item_state = "contsolid"
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
|
||||
)
|
||||
item_state = "pill_canister"
|
||||
center_of_mass = list("x" = 16,"y" = 12)
|
||||
w_class = 2.0
|
||||
can_hold = list(/obj/item/reagent_containers/pill,/obj/item/dice,/obj/item/paper)
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
name = "medal box"
|
||||
desc = "A locked box used to store medals."
|
||||
icon_state = "medalbox+l"
|
||||
item_state = "syringe_kit"
|
||||
item_state = "box"
|
||||
w_class = 3
|
||||
max_w_class = 2
|
||||
req_access = list(access_captain)
|
||||
|
||||
@@ -8,59 +8,63 @@
|
||||
* Circular Saw
|
||||
* Tray
|
||||
*/
|
||||
/obj/item/surgery/
|
||||
name = "surgery tool"
|
||||
desc = "hey, you aren't supposed to have this"
|
||||
icon = 'icons/obj/surgery.dmi'
|
||||
w_class = 2.0
|
||||
drop_sound = 'sound/items/drop/scrap.ogg'
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
|
||||
)
|
||||
|
||||
/*
|
||||
* Retractor
|
||||
*/
|
||||
/obj/item/retractor
|
||||
/obj/item/surgery/retractor
|
||||
name = "retractor"
|
||||
desc = "Retracts stuff."
|
||||
icon = 'icons/obj/surgery.dmi'
|
||||
icon_state = "retractor"
|
||||
item_state = "retractor"
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GLASS = 5000)
|
||||
flags = CONDUCT
|
||||
w_class = 2.0
|
||||
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
|
||||
drop_sound = 'sound/items/drop/scrap.ogg'
|
||||
|
||||
/*
|
||||
* Hemostat
|
||||
*/
|
||||
/obj/item/hemostat
|
||||
/obj/item/surgery/hemostat
|
||||
name = "hemostat"
|
||||
desc = "You think you have seen this before."
|
||||
icon = 'icons/obj/surgery.dmi'
|
||||
icon_state = "hemostat"
|
||||
item_state = "hemostat"
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500)
|
||||
flags = CONDUCT
|
||||
w_class = 2.0
|
||||
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
|
||||
attack_verb = list("attacked", "pinched")
|
||||
drop_sound = 'sound/items/drop/scrap.ogg'
|
||||
|
||||
/*
|
||||
* Cautery
|
||||
*/
|
||||
/obj/item/cautery
|
||||
/obj/item/surgery/cautery
|
||||
name = "cautery"
|
||||
desc = "This stops bleeding."
|
||||
icon = 'icons/obj/surgery.dmi'
|
||||
icon_state = "cautery"
|
||||
item_state = "cautery"
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500)
|
||||
flags = CONDUCT
|
||||
w_class = 2.0
|
||||
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
|
||||
attack_verb = list("burnt")
|
||||
drop_sound = 'sound/items/drop/scrap.ogg'
|
||||
|
||||
/*
|
||||
* Surgical Drill
|
||||
*/
|
||||
/obj/item/surgicaldrill
|
||||
/obj/item/surgery/surgicaldrill
|
||||
name = "surgical drill"
|
||||
desc = "You can drill using this item. You dig?"
|
||||
icon = 'icons/obj/surgery.dmi'
|
||||
icon_state = "drill"
|
||||
item_state = "drill"
|
||||
hitsound = 'sound/weapons/saw/circsawhit.ogg'
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 15000, MATERIAL_GLASS = 10000)
|
||||
flags = CONDUCT
|
||||
@@ -73,11 +77,11 @@
|
||||
/*
|
||||
* Scalpel
|
||||
*/
|
||||
/obj/item/scalpel
|
||||
/obj/item/surgery/scalpel
|
||||
name = "scalpel"
|
||||
desc = "Cut, cut, and once more cut."
|
||||
icon = 'icons/obj/surgery.dmi'
|
||||
icon_state = "scalpel"
|
||||
item_state = "scalpel"
|
||||
flags = CONDUCT
|
||||
force = 10.0
|
||||
sharp = 1
|
||||
@@ -95,40 +99,40 @@
|
||||
/*
|
||||
* Researchable Scalpels
|
||||
*/
|
||||
/obj/item/scalpel/laser1
|
||||
/obj/item/surgery/scalpel/laser1
|
||||
name = "laser scalpel"
|
||||
desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks basic and could be improved."
|
||||
icon_state = "scalpel_laser1_on"
|
||||
icon_state = "scalpel_laser1"
|
||||
damtype = "fire"
|
||||
|
||||
/obj/item/scalpel/laser2
|
||||
/obj/item/surgery/scalpel/laser2
|
||||
name = "laser scalpel"
|
||||
desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks somewhat advanced."
|
||||
icon_state = "scalpel_laser2_on"
|
||||
icon_state = "scalpel_laser2"
|
||||
damtype = "fire"
|
||||
force = 12.0
|
||||
|
||||
/obj/item/scalpel/laser3
|
||||
/obj/item/surgery/scalpel/laser3
|
||||
name = "laser scalpel"
|
||||
desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks to be the pinnacle of precision energy cutlery!"
|
||||
icon_state = "scalpel_laser3_on"
|
||||
icon_state = "scalpel_laser3"
|
||||
damtype = "fire"
|
||||
force = 15.0
|
||||
|
||||
/obj/item/scalpel/manager
|
||||
/obj/item/surgery/scalpel/manager
|
||||
name = "incision management system"
|
||||
desc = "A true extension of the surgeon's body, this marvel instantly and completely prepares an incision allowing for the immediate commencement of therapeutic steps."
|
||||
icon_state = "scalpel_manager_on"
|
||||
icon_state = "scalpel_manager"
|
||||
force = 7.5
|
||||
|
||||
/*
|
||||
* Circular Saw
|
||||
*/
|
||||
/obj/item/circular_saw
|
||||
/obj/item/surgery/circular_saw
|
||||
name = "circular saw"
|
||||
desc = "For heavy duty cutting."
|
||||
icon = 'icons/obj/surgery.dmi'
|
||||
icon_state = "saw"
|
||||
item_state = "scalpel"
|
||||
hitsound = 'sound/weapons/saw/circsawhit.ogg'
|
||||
flags = CONDUCT
|
||||
force = 15.0
|
||||
@@ -144,37 +148,33 @@
|
||||
drop_sound = 'sound/items/drop/accessory.ogg'
|
||||
|
||||
//misc, formerly from code/defines/weapons.dm
|
||||
/obj/item/bonegel
|
||||
/obj/item/surgery/bonegel
|
||||
name = "bone gel"
|
||||
icon = 'icons/obj/surgery.dmi'
|
||||
icon_state = "bone-gel"
|
||||
item_state = "bone-gel"
|
||||
force = 0
|
||||
w_class = 2.0
|
||||
throwforce = 1.0
|
||||
drop_sound = 'sound/items/drop/bottle.ogg'
|
||||
|
||||
/obj/item/FixOVein
|
||||
/obj/item/surgery/FixOVein
|
||||
name = "FixOVein"
|
||||
icon = 'icons/obj/surgery.dmi'
|
||||
icon_state = "fixovein"
|
||||
item_state = "fixovein"
|
||||
force = 0
|
||||
throwforce = 1.0
|
||||
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 3)
|
||||
w_class = 2.0
|
||||
var/usage_amount = 10
|
||||
drop_sound = 'sound/items/drop/accessory.ogg'
|
||||
|
||||
/obj/item/bonesetter
|
||||
/obj/item/surgery/bonesetter
|
||||
name = "bone setter"
|
||||
icon = 'icons/obj/surgery.dmi'
|
||||
icon_state = "bonesetter"
|
||||
item_state = "bonesetter"
|
||||
force = 8.0
|
||||
throwforce = 9.0
|
||||
throw_speed = 3
|
||||
throw_range = 5
|
||||
w_class = 2.0
|
||||
attack_verb = list("attacked", "hit", "bludgeoned")
|
||||
drop_sound = 'sound/items/drop/scrap.ogg'
|
||||
|
||||
/obj/item/storage/fancy/tray
|
||||
name = "surgery tray"
|
||||
@@ -190,29 +190,29 @@
|
||||
icon_type = "surgery tool"
|
||||
storage_type = "tray"
|
||||
can_hold = list(
|
||||
/obj/item/bonesetter,
|
||||
/obj/item/cautery,
|
||||
/obj/item/circular_saw,
|
||||
/obj/item/hemostat,
|
||||
/obj/item/retractor,
|
||||
/obj/item/scalpel,
|
||||
/obj/item/surgicaldrill,
|
||||
/obj/item/bonegel,
|
||||
/obj/item/FixOVein,
|
||||
/obj/item/surgery/bonesetter,
|
||||
/obj/item/surgery/cautery,
|
||||
/obj/item/surgery/circular_saw,
|
||||
/obj/item/surgery/hemostat,
|
||||
/obj/item/surgery/retractor,
|
||||
/obj/item/surgery/scalpel,
|
||||
/obj/item/surgery/surgicaldrill,
|
||||
/obj/item/surgery/bonegel,
|
||||
/obj/item/surgery/FixOVein,
|
||||
/obj/item/stack/medical/advanced/bruise_pack,
|
||||
/obj/item/stack/nanopaste
|
||||
)
|
||||
|
||||
starts_with = list(
|
||||
/obj/item/bonesetter = 1,
|
||||
/obj/item/cautery = 1,
|
||||
/obj/item/circular_saw = 1,
|
||||
/obj/item/hemostat = 1,
|
||||
/obj/item/retractor = 1,
|
||||
/obj/item/scalpel = 1,
|
||||
/obj/item/surgicaldrill = 1,
|
||||
/obj/item/bonegel = 1,
|
||||
/obj/item/FixOVein = 1,
|
||||
/obj/item/surgery/bonesetter = 1,
|
||||
/obj/item/surgery/cautery = 1,
|
||||
/obj/item/surgery/circular_saw = 1,
|
||||
/obj/item/surgery/hemostat = 1,
|
||||
/obj/item/surgery/retractor = 1,
|
||||
/obj/item/surgery/scalpel = 1,
|
||||
/obj/item/surgery/surgicaldrill = 1,
|
||||
/obj/item/surgery/bonegel = 1,
|
||||
/obj/item/surgery/FixOVein = 1,
|
||||
/obj/item/stack/medical/advanced/bruise_pack = 1,
|
||||
)
|
||||
|
||||
@@ -220,15 +220,19 @@
|
||||
cut_overlays()
|
||||
|
||||
var/list/types_and_overlays = list(
|
||||
/obj/item/bonesetter = "tray_bonesetter",
|
||||
/obj/item/cautery = "tray_cautery",
|
||||
/obj/item/circular_saw = "tray_saw",
|
||||
/obj/item/hemostat = "tray_hemostat",
|
||||
/obj/item/retractor = "tray_retractor",
|
||||
/obj/item/scalpel = "tray_scalpel",
|
||||
/obj/item/surgicaldrill = "tray_drill",
|
||||
/obj/item/bonegel = "tray_bone-gel",
|
||||
/obj/item/FixOVein = "tray_fixovein",
|
||||
/obj/item/surgery/bonesetter = "tray_bonesetter",
|
||||
/obj/item/surgery/cautery = "tray_cautery",
|
||||
/obj/item/surgery/circular_saw = "tray_saw",
|
||||
/obj/item/surgery/hemostat = "tray_hemostat",
|
||||
/obj/item/surgery/retractor = "tray_retractor",
|
||||
/obj/item/surgery/scalpel = "tray_scalpel",
|
||||
/obj/item/surgery/scalpel/laser1 = "tray_scalpel_laser1",
|
||||
/obj/item/surgery/scalpel/laser2 = "tray_scalpel_laser2",
|
||||
/obj/item/surgery/scalpel/laser3 = "tray_scalpel_laser3",
|
||||
/obj/item/surgery/scalpel/manager = "tray_scalpel_manager",
|
||||
/obj/item/surgery/surgicaldrill = "tray_drill",
|
||||
/obj/item/surgery/bonegel = "tray_bone-gel",
|
||||
/obj/item/surgery/FixOVein = "tray_fixovein",
|
||||
/obj/item/stack/medical/advanced/bruise_pack = "tray_bruise_pack"
|
||||
)
|
||||
for (var/obj/item/W in contents)
|
||||
|
||||
@@ -34,9 +34,9 @@
|
||||
name = "jetpack (empty)"
|
||||
desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution."
|
||||
icon_state = "jetpack"
|
||||
item_state = "jetpack"
|
||||
gauge_icon = null
|
||||
w_class = 4.0
|
||||
item_state = "jetpack"
|
||||
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
|
||||
var/datum/effect_system/ion_trail/ion_trail
|
||||
var/on = 0.0
|
||||
|
||||
@@ -108,6 +108,7 @@
|
||||
name = "emergency oxygen tank"
|
||||
desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it."
|
||||
icon_state = "emergency"
|
||||
item_state = "emergency"
|
||||
gauge_icon = "indicator_emergency"
|
||||
gauge_cap = 4
|
||||
flags = CONDUCT
|
||||
@@ -131,11 +132,13 @@
|
||||
/obj/item/tank/emergency_oxygen/engi
|
||||
name = "extended-capacity emergency oxygen tank"
|
||||
icon_state = "emergency_engi"
|
||||
item_state = "emergency_engi"
|
||||
volume = 6
|
||||
|
||||
/obj/item/tank/emergency_oxygen/double
|
||||
name = "double emergency oxygen tank"
|
||||
icon_state = "emergency_double"
|
||||
item_state = "emergency_engi"
|
||||
gauge_icon = "indicator_emergency_double"
|
||||
volume = 10
|
||||
|
||||
|
||||
@@ -6,6 +6,10 @@
|
||||
name = "tank"
|
||||
icon = 'icons/obj/tank.dmi'
|
||||
drop_sound = 'sound/items/drop/gascan.ogg'
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_tank.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_tank.dmi',
|
||||
)
|
||||
|
||||
var/gauge_icon = "indicator_tank"
|
||||
var/last_gauge_pressure
|
||||
|
||||
@@ -258,7 +258,7 @@
|
||||
name = "inflatable barrier box"
|
||||
desc = "Contains inflatable walls and doors."
|
||||
icon_state = "inf_box"
|
||||
item_state = "syringe_kit"
|
||||
item_state = "box"
|
||||
w_class = 3
|
||||
max_storage_space = 28
|
||||
can_hold = list(/obj/item/inflatable)
|
||||
|
||||
Reference in New Issue
Block a user