From 77078644372ba3bf90c16017f8496f88099d7621 Mon Sep 17 00:00:00 2001 From: "ryantennessee@yahoo.com" Date: Fri, 9 Dec 2011 20:33:25 +0000 Subject: [PATCH] TG update: Jetpack changing to wrong sprite when turned on fixed. Syringes will autochange inject/draw when full/empty. Medborg syringes start full and set to inject even though the icon is still messed up. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2650 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/tanks/jetpack.dm | 4 +-- code/modules/chemical/Chemistry-Tools.dm | 26 +++++++++++++++++-- .../mob/living/silicon/robot/robot_modules.dm | 12 +++------ 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/code/game/objects/tanks/jetpack.dm b/code/game/objects/tanks/jetpack.dm index cf07c573497..07034dcd94e 100644 --- a/code/game/objects/tanks/jetpack.dm +++ b/code/game/objects/tanks/jetpack.dm @@ -41,9 +41,9 @@ set name = "Toggle Jetpack" set category = "Object" src.on = !( src.on ) - if(src.name == "Void Jetpack (oxygen)") //Slight change added by me. i didn't make it an if-elseif because some of you might want to add other types of resprited packs :3 -Agouri + if(src.type == /obj/item/weapon/tank/jetpack/void_jetpack) //Slight change added by me. i didn't make it an if-elseif because some of you might want to add other types of resprited packs :3 -Agouri src.icon_state = text("voidjetpack[]", src.on) - else if(src.name == "Black Jetpack (oxygen)") + else if(src.type == /obj/item/weapon/tank/jetpack/black_jetpack) src.icon_state = text("black_jetpack[]", src.on) else src.icon_state = text("jetpack[]", src.on) diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 65a0b92a3c9..a7c3b224d6a 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -1008,7 +1008,7 @@ spawn(5) var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) user << "\blue You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units." - if (reagents.total_volume >= reagents.maximum_volume && mode==SYRINGE_INJECT) + if (reagents.total_volume <= 0 && mode==SYRINGE_INJECT) mode = SYRINGE_DRAW update_icon() @@ -2078,7 +2078,25 @@ desc = "A golden cup. It will be presented to a winner of tournament 26 june and name of the winner will be graved on it." //Syringes -/obj/item/weapon/reagent_containers/syringe/robot +/obj/item/weapon/reagent_containers/syringe/robot/antitoxin + name = "Syringe (anti-toxin)" + desc = "Contains anti-toxins." + New() + ..() + reagents.add_reagent("anti_toxin", 15) + mode = SYRINGE_INJECT + update_icon() + +/obj/item/weapon/reagent_containers/syringe/robot/inaprovaline + name = "Syringe (inaprovaline)" + desc = "Contains inaprovaline - used to stabilize patients." + New() + ..() + reagents.add_reagent("inaprovaline", 15) + mode = SYRINGE_INJECT + update_icon() + +/obj/item/weapon/reagent_containers/syringe/robot/mixed name = "Syringe (mixed)" desc = "Contains inaprovaline & anti-toxins." New() @@ -2094,6 +2112,7 @@ New() ..() reagents.add_reagent("inaprovaline", 15) + mode = SYRINGE_INJECT update_icon() /obj/item/weapon/reagent_containers/syringe/antitoxin @@ -2102,6 +2121,7 @@ New() ..() reagents.add_reagent("anti_toxin", 15) + mode = SYRINGE_INJECT update_icon() /obj/item/weapon/reagent_containers/syringe/antiviral @@ -2110,12 +2130,14 @@ New() ..() reagents.add_reagent("spaceacillin", 15) + mode = SYRINGE_INJECT update_icon() /obj/item/weapon/reagent_containers/ld50_syringe/choral New() ..() reagents.add_reagent("chloralhydrate", 50) + mode = SYRINGE_INJECT update_icon() //////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index ced245ae8fe..6f4307931c3 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -56,15 +56,9 @@ ..() src.modules += new /obj/item/borg/sight/hud/med(src) src.modules += new /obj/item/device/healthanalyzer(src) - - for(var/i = 1 to 3) - var/obj/item/weapon/reagent_containers/syringe/S = new /obj/item/weapon/reagent_containers/syringe(src) - switch(i) - if(1) S.name = "Syringe-(Inaprovaline)" - if(2) S.name = "Syringe-(Anti-Toxin)" - if(3) S.name = "Syringe-(Mixed)" - src.modules += S - + src.modules += new /obj/item/weapon/reagent_containers/syringe/robot/antitoxin(src) + src.modules += new /obj/item/weapon/reagent_containers/syringe/robot/inoprovaline(src) + src.modules += new /obj/item/weapon/reagent_containers/syringe/robot/mixed(src) src.modules += new /obj/item/weapon/reagent_containers/syringe(src) src.modules += new /obj/item/weapon/reagent_containers/syringe(src) src.modules += new /obj/item/weapon/reagent_containers/glass/bottle/robot/inaprovaline(src)