Merge pull request #10339 from Seris02/teleivdrip

telescopic IV drips
This commit is contained in:
Ghom
2019-12-30 18:24:50 +01:00
committed by GitHub
6 changed files with 46 additions and 2 deletions

View File

@@ -222,5 +222,21 @@
. += "\t<span class='notice'>[attached ? attached : "No one"] is attached.</span>" . += "\t<span class='notice'>[attached ? attached : "No one"] is attached.</span>"
/obj/machinery/iv_drip/telescopic
name = "telescopic IV drip"
desc = "An IV drip with an advanced infusion pump that can both drain blood into and inject liquids from attached containers. Blood packs are processed at an accelerated rate. This one is telescopic, and can be picked up and put down."
icon_state = "iv_drip"
/obj/machinery/iv_drip/telescopic/update_icon()
..()
icon_state = icon_state + "_tele"
/obj/machinery/iv_drip/telescopic/AltClick(mob/user)
if (attached || beaker || !user.canUseTopic(src, BE_CLOSE))
return ..()
new /obj/item/tele_iv(get_turf(src))
qdel(src)
return TRUE
#undef IV_TAKING #undef IV_TAKING
#undef IV_INJECTING #undef IV_INJECTING

View File

@@ -0,0 +1,17 @@
/obj/item/tele_iv
name = "telescopic IV drip"
desc = "An IV drip with an advanced infusion pump that can both drain blood into and inject liquids from attached containers. Blood packs are processed at an accelerated rate. This one is telescopic, and can be picked up and put down."
icon = 'icons/obj/iv_drip.dmi'
icon_state = "tele_iv"
/obj/item/tele_iv/attack_self(mob/user)
deploy_iv(user, user.loc)
/obj/item/tele_iv/afterattack(atom/target, mob/user, proximity)
. = ..()
if(proximity|| isopenturf(target))
deploy_iv(user, target)
/obj/item/tele_iv/proc/deploy_iv(mob/user, atom/location)
new /obj/machinery/iv_drip/telescopic(location)
qdel(src)

View File

@@ -152,6 +152,16 @@
category = list("Medical Designs") category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/telescopiciv
name = "Telescopic IV Drip"
desc = "An IV drip with an advanced infusion pump that can both drain blood into and inject liquids from attached containers. Blood packs are processed at an accelerated rate. This one is telescopic, and can be picked up and put down."
id = "telescopiciv"
build_type = PROTOLATHE
materials = list(MAT_METAL = 5000, MAT_GLASS = 3500, MAT_SILVER = 1000)
build_path = /obj/item/tele_iv
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/holobarrier_med /datum/design/holobarrier_med
name = "PENLITE holobarrier projector" name = "PENLITE holobarrier projector"
desc = "PENLITE holobarriers, a device that halts individuals with malicious diseases." desc = "PENLITE holobarriers, a device that halts individuals with malicious diseases."

View File

@@ -71,7 +71,7 @@
display_name = "Biological Technology" display_name = "Biological Technology"
description = "What makes us tick." //the MC, silly! description = "What makes us tick." //the MC, silly!
prereq_ids = list("base") prereq_ids = list("base")
design_ids = list("medicalkit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen") design_ids = list("medicalkit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen", "telescopiciv")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000 export_price = 5000

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -882,6 +882,7 @@
#include "code\game\objects\items\taster.dm" #include "code\game\objects\items\taster.dm"
#include "code\game\objects\items\teleportation.dm" #include "code\game\objects\items\teleportation.dm"
#include "code\game\objects\items\teleprod.dm" #include "code\game\objects\items\teleprod.dm"
#include "code\game\objects\items\telescopic_iv.dm"
#include "code\game\objects\items\theft_tools.dm" #include "code\game\objects\items\theft_tools.dm"
#include "code\game\objects\items\toys.dm" #include "code\game\objects\items\toys.dm"
#include "code\game\objects\items\trash.dm" #include "code\game\objects\items\trash.dm"