cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-15 18:06:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

redone

Browse Source
This commit is contained in:
shellspeed1
2019-12-11 02:47:33 -08:00
parent 32e4c64fed
commit 2d25c822e3
3 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/medical_designs.dm
+13
View File
@@ -906,3 +906,16 @@
build_path = /obj/item/bodypart/r_arm/robot/surplus_upgraded
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/adv_r_arm
name = "Disposable Hypospray MK.II"
desc = "A cheaply made hypospray"
id = "disposable_hypospray"
build_type = PROTOLATHE
materials = list(MAT_METAL = 100, MAT_PLASTIC = 500)
construction_time = 40
build_path = /obj/item/hypospray/mkii/disposable
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
code/modules/research/techweb/all_nodes.dm
+2 -1
View File
@@ -11,7 +11,8 @@
design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani",
"destructive_analyzer", "circuit_imprinter", "experimentor", "rdconsole", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab",
"space_heater", "xlarge_beaker", "sec_rshot", "sec_bshot", "sec_slug", "sec_Islug", "sec_dart", "sec_38", "sec_38lethal",
"rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass","chem_pack","medkit_cabinet")
"rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass","chem_pack","medkit_cabinet",
"disposable_hypospray")
/datum/techweb_node/mmi
id = "mmi"
modular_citadel/code/modules/reagents/reagent container/hypospraymkii.dm
+25 -11
View File
@@ -34,6 +34,7 @@
var/inject_self = SELF_INJECT
var/quickload = FALSE
var/penetrates = FALSE
var/reloadable = TRUE
/obj/item/hypospray/mkii/brute
start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine
@@ -53,6 +54,16 @@
/obj/item/hypospray/mkii/enlarge
spawnwithvial = FALSE
//A vial-loaded hypospray. Cartridge-based!
/obj/item/hypospray/mkii/disposable
name = "disposable hypospray mk.II"
icon = 'modular_citadel/icons/obj/hypospraymkii.dmi'
icon_state = "hypo2"
desc = "A cheaply made knock off verson of the MKII hypospray. You cannot remove a hypovial from it making it nonreusable."
w_class = WEIGHT_CLASS_TINY
spawnwithvial = FALSE
reloadable = FALSE
/obj/item/hypospray/mkii/CMO
name = "hypospray mk.II deluxe"
allowed_containers = list(/obj/item/reagent_containers/glass/bottle/vial/tiny, /obj/item/reagent_containers/glass/bottle/vial/small, /obj/item/reagent_containers/glass/bottle/vial/large)
@@ -96,21 +107,24 @@
/obj/item/hypospray/mkii/examine(mob/user)
. = ..()
to_chat(user, "[vial] has [vial.reagents.total_volume]u remaining.")
to_chat(user, "[src] is set to [mode ? "Inject" : "Spray"] contents on application.")
/obj/item/hypospray/mkii/proc/unload_hypo(obj/item/I, mob/user)
if((istype(I, /obj/item/reagent_containers/glass/bottle/vial)))
var/obj/item/reagent_containers/glass/bottle/vial/V = I
V.forceMove(user.loc)
user.put_in_hands(V)
to_chat(user, "<span class='notice'>You remove [vial] from [src].</span>")
vial = null
update_icon()
playsound(loc, 'sound/weapons/empty.ogg', 50, 1)
if (reloadable == TRUE)
if((istype(I, /obj/item/reagent_containers/glass/bottle/vial)))
var/obj/item/reagent_containers/glass/bottle/vial/V = I
V.forceMove(user.loc)
user.put_in_hands(V)
to_chat(user, "<span class='notice'>You remove [vial] from [src].</span>")
vial = null
update_icon()
playsound(loc, 'sound/weapons/empty.ogg', 50, 1)
else
to_chat(user, "<span class='notice'>This hypo isn't loaded!</span>")
return
else
to_chat(user, "<span class='notice'>This hypo isn't loaded!</span>")
return
if((istype(I, /obj/item/reagent_containers/glass/bottle/vial)))
to_chat(user, "<span class='notice'>You cannot remove [vial] from [src] without destroying both.</span>")
/obj/item/hypospray/mkii/attackby(obj/item/I, mob/living/user)
if((istype(I, /obj/item/reagent_containers/glass/bottle/vial) && vial != null))