mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-15 03:52:43 +00:00
11b17c4442
Standardization of the object tree and some modified functionality. Moved a lot of storage/*_kit and similar boxes to storage/box/* ; most of these can now be found in boxes.dm. First aid kits remain a separate item type. Replacement Light boxes pick up lights (for example broken ones) when used on them Moved weapon/secstorage to storage/secure Moved plant bags, ore satchel, trash bag, and sheet snatcher to storage/bag, in bags.dm Fixed reagent_containers and snacks to pass through attackby() so the use_to_pickup code works. This affects plant bags, trash bags, and pill bottles. Dice packs are now pill bottles, and all pill bottles can pick up dice. Added error handling to uplink/generate_menu() so that one mistyped string doesn't bork the whole syndie uplink menu, since strings cannot be type-checked at compile time. Cigarette packs and crayon boxes are now storage/fancy, however they retain existing update_icon() code. Added a comment to storage.dm so that future people know where to look for use_to_pickup and allow_quick_gather code. Updated all maps. I've tried to test this thoroughly but I wouldn't be surprised if there were a few lingering issues. Try not to panic if you encounter any. Full (i think) list of changed paths: /obj/item/weapon/storage/flashbang_kit > /obj/item/weapon/storage/box/flashbangs /obj/item/weapon/storage/body_bag_box > /obj/item/weapon/storage/box/bodybags /obj/item/weapon/storage/chemimp_kit > /obj/item/weapon/storage/box/chemimp /obj/item/weapon/storage/trackimp_kit > /obj/item/weapon/storage/box/trackimp /obj/item/weapon/storage/seccart_kit > /obj/item/weapon/storage/box/seccarts /obj/item/weapon/storage/handcuff_kit > /obj/item/weapon/storage/box/handcuffs /obj/item/weapon/cigpacket > /obj/item/weapon/storage/fancy/cigarettes /obj/item/weapon/storage/mousetraps > /obj/item/weapon/storage/box/mousetraps /obj/item/weapon/storage/PDAbox > /obj/item/weapon/storage/box/PDAs /obj/item/weapon/storage/id_kit > /obj/item/weapon/storage/box/ids /obj/item/weapon/storage/lightbox/mixed > /obj/item/weapon/storage/box/lights/mixed /obj/item/weapon/storage/donkpocket_kit > /obj/item/weapon/storage/box/donkpockets /obj/item/weapon/storage/beakerbox > /obj/item/weapon/storage/box/beakers /obj/item/weapon/storage/syringes > /obj/item/weapon/storage/box/syringes /obj/item/weapon/storage/gl_kit > /obj/item/weapon/storage/box/rxglasses /obj/item/weapon/storage/diskbox > /obj/item/weapon/storage/box/disks /obj/item/weapon/storage/stma_kit > /obj/item/weapon/storage/box/masks /obj/item/weapon/storage/lglo_kit > /obj/item/weapon/storage/box/gloves /obj/item/weapon/storage/lightbox/bulbs > /obj/item/weapon/storage/box/lights/bulbs /obj/item/weapon/plantbag > /obj/item/weapon/storage/bag/plants /obj/item/weapon/storage/satchel > /obj/item/weapon/storage/bag/ore /obj/item/weapon/trashbag > /obj/item/weapon/storage/bag/trash git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5494 316c924e-a436-60f5-8080-3fe189b3f50e
185 lines
6.1 KiB
Plaintext
185 lines
6.1 KiB
Plaintext
/* First aid storage
|
|
* Contains:
|
|
* First Aid Kits
|
|
* Pill Bottles
|
|
* Dice Pack (in a pill bottle)
|
|
*/
|
|
|
|
/*
|
|
* First Aid Kits
|
|
*/
|
|
/obj/item/weapon/storage/firstaid
|
|
name = "first-aid kit"
|
|
desc = "It's an emergency medical kit for those serious boo-boos."
|
|
icon_state = "firstaid"
|
|
throw_speed = 2
|
|
throw_range = 8
|
|
var/empty = 0
|
|
|
|
|
|
/obj/item/weapon/storage/firstaid/fire
|
|
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"
|
|
|
|
New()
|
|
..()
|
|
if (empty) return
|
|
|
|
icon_state = pick("ointment","firefirstaid")
|
|
|
|
new /obj/item/device/healthanalyzer( src )
|
|
new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
|
|
new /obj/item/stack/medical/ointment( src )
|
|
new /obj/item/stack/medical/ointment( src )
|
|
new /obj/item/weapon/reagent_containers/pill/kelotane( src )
|
|
new /obj/item/weapon/reagent_containers/pill/kelotane( src )
|
|
new /obj/item/weapon/reagent_containers/pill/kelotane( src ) //Replaced ointment with these since they actually work --Errorage
|
|
return
|
|
|
|
|
|
/obj/item/weapon/storage/firstaid/regular
|
|
icon_state = "firstaid"
|
|
|
|
New()
|
|
..()
|
|
if (empty) return
|
|
new /obj/item/stack/medical/bruise_pack(src)
|
|
new /obj/item/stack/medical/bruise_pack(src)
|
|
new /obj/item/stack/medical/bruise_pack(src)
|
|
new /obj/item/stack/medical/ointment(src)
|
|
new /obj/item/stack/medical/ointment(src)
|
|
new /obj/item/device/healthanalyzer(src)
|
|
new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
|
|
return
|
|
|
|
/obj/item/weapon/storage/firstaid/toxin
|
|
name = "toxin first aid"
|
|
desc = "Used to treat when you have a high amoutn of toxins in your body."
|
|
icon_state = "antitoxin"
|
|
item_state = "firstaid-toxin"
|
|
|
|
New()
|
|
..()
|
|
if (empty) return
|
|
|
|
icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3")
|
|
|
|
new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
|
|
new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
|
|
new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
|
|
new /obj/item/weapon/reagent_containers/pill/antitox( src )
|
|
new /obj/item/weapon/reagent_containers/pill/antitox( src )
|
|
new /obj/item/weapon/reagent_containers/pill/antitox( src )
|
|
new /obj/item/device/healthanalyzer( src )
|
|
return
|
|
|
|
/obj/item/weapon/storage/firstaid/o2
|
|
name = "oxygen deprivation first aid"
|
|
desc = "A box full of oxygen goodies."
|
|
icon_state = "o2"
|
|
item_state = "firstaid-o2"
|
|
|
|
New()
|
|
..()
|
|
if (empty) return
|
|
new /obj/item/weapon/reagent_containers/pill/dexalin( src )
|
|
new /obj/item/weapon/reagent_containers/pill/dexalin( src )
|
|
new /obj/item/weapon/reagent_containers/pill/dexalin( src )
|
|
new /obj/item/weapon/reagent_containers/pill/dexalin( src )
|
|
new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
|
|
new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
|
|
new /obj/item/device/healthanalyzer( src )
|
|
return
|
|
|
|
/*
|
|
* Pill Bottles
|
|
*/
|
|
/obj/item/weapon/storage/pill_bottle
|
|
name = "pill bottle"
|
|
desc = "It's an airtight container for storing medication."
|
|
icon_state = "pill_canister"
|
|
icon = 'icons/obj/chemical.dmi'
|
|
item_state = "contsolid"
|
|
w_class = 2.0
|
|
can_hold = list("/obj/item/weapon/reagent_containers/pill","/obj/item/weapon/dice")
|
|
allow_quick_gather = 1
|
|
use_to_pickup = 1
|
|
|
|
/obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri
|
|
|
|
if (ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
|
|
var/mob/M = usr
|
|
if (!( istype(over_object, /obj/screen) ))
|
|
return ..()
|
|
if ((!( M.restrained() ) && !( M.stat ) /*&& M.pocket == src*/))
|
|
switch(over_object.name)
|
|
if("r_hand")
|
|
M.u_equip(src)
|
|
M.put_in_r_hand(src)
|
|
if("l_hand")
|
|
M.u_equip(src)
|
|
M.put_in_l_hand(src)
|
|
src.add_fingerprint(usr)
|
|
return
|
|
if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
|
|
if (usr.s_active)
|
|
usr.s_active.close(usr)
|
|
src.show_to(usr)
|
|
return
|
|
return
|
|
|
|
/obj/item/weapon/storage/pill_bottle/kelotane
|
|
name = "Pill bottle (kelotane)"
|
|
desc = "Contains pills used to treat burns."
|
|
|
|
New()
|
|
..()
|
|
new /obj/item/weapon/reagent_containers/pill/kelotane( src )
|
|
new /obj/item/weapon/reagent_containers/pill/kelotane( src )
|
|
new /obj/item/weapon/reagent_containers/pill/kelotane( src )
|
|
new /obj/item/weapon/reagent_containers/pill/kelotane( src )
|
|
new /obj/item/weapon/reagent_containers/pill/kelotane( src )
|
|
new /obj/item/weapon/reagent_containers/pill/kelotane( src )
|
|
new /obj/item/weapon/reagent_containers/pill/kelotane( src )
|
|
|
|
/obj/item/weapon/storage/pill_bottle/antitox
|
|
name = "Pill bottle (Anti-toxin)"
|
|
desc = "Contains pills used to counter toxins."
|
|
|
|
New()
|
|
..()
|
|
new /obj/item/weapon/reagent_containers/pill/antitox( src )
|
|
new /obj/item/weapon/reagent_containers/pill/antitox( src )
|
|
new /obj/item/weapon/reagent_containers/pill/antitox( src )
|
|
new /obj/item/weapon/reagent_containers/pill/antitox( src )
|
|
new /obj/item/weapon/reagent_containers/pill/antitox( src )
|
|
new /obj/item/weapon/reagent_containers/pill/antitox( src )
|
|
new /obj/item/weapon/reagent_containers/pill/antitox( src )
|
|
|
|
/obj/item/weapon/storage/pill_bottle/inaprovaline
|
|
name = "Pill bottle (inaprovaline)"
|
|
desc = "Contains pills used to stabilize patients."
|
|
|
|
New()
|
|
..()
|
|
new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
|
|
new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
|
|
new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
|
|
new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
|
|
new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
|
|
new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
|
|
new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
|
|
|
|
|
|
/obj/item/weapon/storage/pill_bottle/dice
|
|
name = "pack of dice"
|
|
desc = "It's a small container with dice inside."
|
|
|
|
New()
|
|
..()
|
|
new /obj/item/weapon/dice( src )
|
|
new /obj/item/weapon/dice/d20( src )
|
|
|