cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various Fixes

Browse Source
This commit is contained in:
Fox-McCloud
2015-04-29 18:12:24 -04:00
parent 8c57e4ed0b
commit c1826deeda
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/igniter.dm
+1 -1
View File
@@ -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)
code/modules/reagents/Chemistry-Machinery.dm
+3 -3
View File
@@ -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()
..()
code/modules/reagents/reagent_containers/glass_containers.dm
+1 -1
View File
@@ -246,7 +246,7 @@
else
usr << "<span class='notice'>There is no assembly to remove.</span>"
/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()
maps/cyberiad.dmm
+1 -1
View File
@@ -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)