cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-06 07:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes water removing objects' colors (#6656)

Browse Source 
This pr fixes water removing thing's colors, it should now only removed color from mobs, in case people are painted.
This commit is contained in:
Alberyk
2019-07-04 11:02:40 -03:00
committed by Erki
parent 194d72bbe3
commit 7664972d0a
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
View File

@@ -195,7 +195,6 @@
if(!istype(T))
return
T.color = initial(T.color)
var/datum/gas_mixture/environment = T.return_air()
var/min_temperature = T0C + 100 // 100C, the boiling point of water
@@ -217,20 +216,10 @@
T.wet_floor(WET_TYPE_WATER,volume)
/datum/reagent/water/touch_obj(var/obj/O)
if(istype(O))
O.color = initial(O.color)
if(istype(O, /obj/item/weapon/light))
var/obj/item/weapon/light/L = O
L.brightness_color = initial(L.brightness_color)
L.update()
else if(istype(O, /obj/machinery/light))
var/obj/machinery/light/L = O
L.brightness_color = initial(L.brightness_color)
L.update()
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O
if(!cube.wrapped)
cube.Expand()
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O
if(!cube.wrapped)
cube.Expand()
/datum/reagent/water/touch_mob(var/mob/M, var/amount)
. = ..()