From c1826deeda381d17cd6345beeca6a1b5ef095bbe Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Wed, 29 Apr 2015 18:12:24 -0400 Subject: [PATCH] Various Fixes --- code/modules/assembly/igniter.dm | 2 +- code/modules/reagents/Chemistry-Machinery.dm | 6 +++--- .../modules/reagents/reagent_containers/glass_containers.dm | 2 +- maps/cyberiad.dmm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 49cfe687eb1..d91eac4a391 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -22,7 +22,7 @@ if (istype(src.loc.loc, /obj/item/weapon/reagent_containers/glass/beaker/)) var/obj/item/weapon/reagent_containers/glass/beaker/beakerbomb = src.loc.loc if(beakerbomb) - beakerbomb.ignite() + beakerbomb.heat_beaker() var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 6e8dc205921..289c388b17b 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -295,9 +295,9 @@ amount = 5 recharge_delay = 10 dispensable_reagents = list() - var/list/special_reagents = list(list("hydrogen", "oxygen", "silicon", "phosphorus", "sulfur", "carbon", "nitrogen"), - list("lithium", "sugar", "water", "copper", "mercury", "sodium"), - list("ethanol", "chlorine", "potassium", "aluminum","plasma", "radium", "fluorine", "iron")) + var/list/special_reagents = list(list("hydrogen", "oxygen", "silicon", "phosphorus", "sulfur", "carbon", "nitrogen", "tungsten", "water"), + list("lithium", "sugar", "copper", "mercury", "sodium","iodine","bromine"), + list("ethanol", "chlorine", "potassium", "aluminum","plasma", "radium", "fluorine", "iron", "silver")) /obj/machinery/chem_dispenser/constructable/New() ..() diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index 04c9f14e092..a469be34254 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -246,7 +246,7 @@ else usr << "There is no assembly to remove." -/obj/item/weapon/reagent_containers/glass/beaker/ignite() +/obj/item/weapon/reagent_containers/glass/beaker/proc/heat_beaker() if(reagents) reagents.chem_temp += 30 reagents.handle_reactions() diff --git a/maps/cyberiad.dmm b/maps/cyberiad.dmm index 280d0a865eb..155349b3186 100644 --- a/maps/cyberiad.dmm +++ b/maps/cyberiad.dmm @@ -2865,7 +2865,7 @@ "bde" = (/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/storage/tools) "bdf" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/hallway/primary/central/nw) "bdg" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 32},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 5; icon_state = "blue"},/area/hallway/primary/central/nw) -"bdh" = (/obj/machinery/lapvend,/turf/simulated/floor,/area/quartermaster/office) +"bdh" = (/obj/machinery/vending/cart,/turf/simulated/floor,/area/quartermaster/office) "bdi" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/sign/securearea{pixel_x = 32; pixel_y = 0},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/bridge) "bdj" = (/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/bridge) "bdk" = (/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/bridge)