cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2650 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
ryantennessee@yahoo.com
2011-12-24 22:05:16 +02:00
committed by Albert Iordache
parent d565fe7a9c
commit 7707864437
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/chemical/Chemistry-Tools.dm
+24 -2
View File
@@ -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()
////////////////////////////////////////////////////////////////////////////////
code/modules/mob/living/silicon/robot/robot_modules.dm
+3 -9
View File
@@ -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)