cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Chemistry Map + Equipment Improvements (#5633)

Browse Source 
Remapped Chemistry a bit to include more missing equipment, as well as to make it more spacious and less compact. AutoInhalers and autoinjectors were added to the chemistry locker. Most of stuff found in chemistry was added to the chemistry locker for space reasons. Medical belts can now store inhalers and inhaler cartridges. Same with the smartfridge.
This commit is contained in:
BurgerLUA
2018-12-10 23:34:29 +01:00
committed by Werner
parent ad9e025375
commit b934e1a5f0
13 changed files with 529 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/belt.dm
+3 -1
View File
@@ -92,6 +92,9 @@
/obj/item/weapon/reagent_containers/glass/bottle,
/obj/item/weapon/reagent_containers/pill,
/obj/item/weapon/reagent_containers/syringe,
/obj/item/weapon/reagent_containers/inhaler,
/obj/item/weapon/reagent_containers/personal_inhaler_cartridge,
/obj/item/weapon/personal_inhaler,
/obj/item/weapon/flame/lighter/zippo,
/obj/item/weapon/storage/fancy/cigarettes,
/obj/item/weapon/storage/pill_bottle,
@@ -105,7 +108,6 @@
/obj/item/weapon/crowbar,
/obj/item/device/flashlight,
/obj/item/weapon/extinguisher/mini,
/obj/item/weapon/reagent_containers/inhaler,
/obj/item/device/antibody_scanner
)
code/game/objects/items/weapons/storage/boxes.dm
+12 -2
View File
@@ -736,6 +736,7 @@
/obj/item/weapon/storage/box/pillbottles
name = "box of pill bottles"
desc = "It has pictures of pill bottles on its front."
icon_state = "pillbox"
/obj/item/weapon/storage/box/pillbottles/fill()
..()
@@ -800,8 +801,8 @@
return
/obj/item/weapon/storage/box/autoinjectors
name = "box of injectors"
desc = "Contains autoinjectors."
name = "box of empty injectors"
desc = "Contains empty autoinjectors."
icon_state = "syringe"
/obj/item/weapon/storage/box/autoinjectors/fill()
@@ -1038,6 +1039,15 @@
for(var/i in 1 to 6)
new /obj/item/weapon/reagent_containers/personal_inhaler_cartridge/large(src)
/obj/item/weapon/storage/box/inhalers_auto
name = "autoinhaler kit"
desc = "A box filled with a combat inhaler and several large empty inhaler cartridges."
icon_state = "box_inhalers"
/obj/item/weapon/storage/box/inhalers_auto/fill()
for(var/i in 1 to 8)
new /obj/item/weapon/reagent_containers/inhaler(src)
/obj/item/weapon/storage/box/clams
name = "box of Ras'val clam"
desc = "A box filled with clams from the Ras'val sea, imported by Njadra'Akhar Enterprises."
code/game/objects/items/weapons/storage/firstaid.dm
+5 -5
View File
@@ -32,7 +32,7 @@
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/hypospray/autoinjector( src )
new /obj/item/weapon/reagent_containers/hypospray/autoinjector/inaprovaline( src )
return
@@ -48,7 +48,7 @@
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/hypospray/autoinjector( src )
new /obj/item/weapon/reagent_containers/hypospray/autoinjector/inaprovaline( src )
return
/obj/item/weapon/storage/firstaid/toxin
@@ -83,8 +83,8 @@
new /obj/item/weapon/reagent_containers/inhaler/dexalin( src )
new /obj/item/weapon/reagent_containers/inhaler/dexalin( src )
new /obj/item/weapon/reagent_containers/inhaler/dexalin( src )
new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
new /obj/item/weapon/reagent_containers/hypospray/autoinjector/inaprovaline( src )
new /obj/item/weapon/reagent_containers/hypospray/autoinjector/inaprovaline( src )
new /obj/item/device/breath_analyzer( src )
return
@@ -97,7 +97,7 @@
/obj/item/weapon/storage/firstaid/adv/fill()
..()
if (empty) return
new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
new /obj/item/weapon/reagent_containers/hypospray/autoinjector/inaprovaline( src )
new /obj/item/stack/medical/advanced/bruise_pack(src)
new /obj/item/stack/medical/advanced/bruise_pack(src)
new /obj/item/stack/medical/advanced/bruise_pack(src)
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+4 -2
View File
@@ -12,7 +12,6 @@
fill()
..()
new /obj/item/weapon/storage/box/autoinjectors(src)
new /obj/item/weapon/storage/box/syringes(src)
new /obj/item/weapon/reagent_containers/dropper(src)
new /obj/item/weapon/reagent_containers/dropper(src)
@@ -172,7 +171,10 @@
new /obj/item/weapon/storage/box/spraybottles(src)
new /obj/item/weapon/storage/box/spraybottles(src)
new /obj/item/weapon/storage/box/inhalers(src)
new /obj/item/weapon/storage/box/inhalers(src)
new /obj/item/weapon/storage/box/inhalers_auto(src)
new /obj/item/weapon/storage/box/syringes(src)
new /obj/item/weapon/storage/box/beakers(src)
new /obj/item/weapon/storage/box/beakers(src)
/obj/structure/closet/secure_closet/medical_wall
name = "first aid closet"