shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-37476

Browse Source
This commit is contained in:
deathride58
2018-05-06 07:07:02 +00:00
committed by GitHub
parent 892cb0a1be 11c1e8fbf7
commit 6a07a66cb3
738 changed files with 10463 additions and 18840 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
-3
View File
@@ -292,9 +292,6 @@ obj/machinery/chem_dispenser/proc/work_animation()
update_icon()
return
if(exchange_parts(user, I))
return
if(default_deconstruction_crowbar(I))
return
if(istype(I, /obj/item/reagent_containers) && !(I.flags_1 & ABSTRACT_1) && I.is_open_container())
code/modules/reagents/chemistry/machinery/chem_heater.dm
-3
View File
@@ -60,9 +60,6 @@
if(default_deconstruction_screwdriver(user, "mixer0b", "mixer0b", I))
return
if(exchange_parts(user, I))
return
if(default_deconstruction_crowbar(I))
return
code/modules/reagents/chemistry/machinery/chem_master.dm
-2
View File
@@ -79,8 +79,6 @@
if(default_deconstruction_screwdriver(user, "mixer0_nopower", "mixer0", I))
return
else if(exchange_parts(user, I))
return
else if(default_deconstruction_crowbar(I))
return
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+2 -2
View File
@@ -1136,10 +1136,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#CD6839"
nutriment_factor = 1 * REAGENTS_METABOLISM
boozepwr = 25
taste_description = "apples"
taste_description = "the season that <i>falls</i> between summer and winter"
glass_icon_state = "whiskeyglass"
glass_name = "hard cider"
glass_desc = "Tastes like autumn."
glass_desc = "Tastes like autumn... no wait, fall!"
shot_glass_icon_state = "shotglassbrown"
code/modules/reagents/chemistry/reagents/food_reagents.dm
+1 -1
View File
@@ -438,7 +438,7 @@
if(hotspot)
var/datum/gas_mixture/lowertemp = T.remove_air(T.air.total_moles())
lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0)
lowertemp.react()
lowertemp.react(src)
T.assume_air(lowertemp)
qdel(hotspot)
code/modules/reagents/chemistry/reagents/other_reagents.dm
+1 -1
View File
@@ -146,7 +146,7 @@
if(T.air)
var/datum/gas_mixture/G = T.air
G.temperature = max(min(G.temperature-(CT*1000),G.temperature/CT),0)
G.react()
G.react(src)
qdel(hotspot)
var/obj/effect/acid/A = (locate(/obj/effect/acid) in T)
if(A)
code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+1 -1
View File
@@ -273,7 +273,7 @@
var/datum/gas_mixture/G = T.air
if(G.temperature > T20C)
G.temperature = max(G.temperature/2,T20C)
G.react()
G.react(src)
qdel(hotspot)
/datum/reagent/firefighting_foam/reaction_obj(obj/O, reac_volume)
code/modules/reagents/chemistry/recipes/slime_extracts.dm
+3 -3
View File
@@ -314,7 +314,7 @@
/datum/chemical_reaction/slime/slimeglow/on_reaction(datum/reagents/holder)
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='danger'>The slime begins to emit a soft light. Squeezing it will cause it to grow brightly.</span>")
new /obj/item/device/flashlight/slime(T)
new /obj/item/flashlight/slime(T)
..()
//Purple
@@ -561,8 +561,8 @@
required_other = 1
/datum/chemical_reaction/slime/slimecamera/on_reaction(datum/reagents/holder)
new /obj/item/device/camera(get_turf(holder.my_atom))
new /obj/item/device/camera_film(get_turf(holder.my_atom))
new /obj/item/camera(get_turf(holder.my_atom))
new /obj/item/camera_film(get_turf(holder.my_atom))
..()
/datum/chemical_reaction/slime/slimefloor