cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4762 from Kurfursten/oldfixes

Browse Source 
Bug Fixes for May 9th
This commit is contained in:
d3athrow
2015-05-30 11:29:56 -05:00
parent d82b2d5106 e1279e17cf
commit 207ecebee0
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/power/lighting.dm
View File

@@ -308,7 +308,7 @@ var/global/list/obj/machinery/light/alllights = list()
else
src.add_fingerprint(user)
var/obj/item/weapon/light/L = W
if(istype(L, light_type))
if(L.fitting == fitting)
status = L.status
user << "You insert the [L.name]."
switchcount = L.switchcount
@@ -589,6 +589,7 @@ var/global/list/obj/machinery/light/alllights = list()
var/rigged = 0 // true if rigged to explode
var/brightness = 2 //how much light it gives off
var/cost = 2 //How much power does it consume in an idle state?
var/fitting = "tube"
/obj/item/weapon/light/tube
name = "light tube"
@@ -619,6 +620,7 @@ var/global/list/obj/machinery/light/alllights = list()
icon_state = "bulb"
base_state = "bulb"
item_state = "contvapour"
fitting = "bulb"
g_amt = 100
brightness = 5
cost = 5

2
code/modules/reagents/Chemistry-Machinery.dm
View File

@@ -1511,7 +1511,7 @@ USE THIS CHEMISTRY DISPENSER FOR MAPS SO THEY START AT 100 ENERGY
w_class = 2.0
force = 2.0
var/list/beakers = new/list()
var/list/allowed_containers = list(/obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/glass/bottle)
var/list/allowed_containers = list(/obj/item/weapon/reagent_containers/glass, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/)
var/list/allowed_reactions = list(/datum/chemical_reaction/water, /datum/chemical_reaction/creatine,
/datum/chemical_reaction/discount, /datum/chemical_reaction/peptobismol, /datum/chemical_reaction/phalanximine,
/datum/chemical_reaction/stoxin, /datum/chemical_reaction/sterilizine, /datum/chemical_reaction/inaprovaline,