cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mops clean paint too

Browse Source 
For painted walls, I guess
This commit is contained in:
RKF45
2015-02-07 00:18:56 +01:00
parent 0ad5195af2
commit 2c78d480f1
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/supplypacks.dm
View File

@@ -887,7 +887,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/weapon/reagent_containers/glass/paint/green, /obj/item/weapon/reagent_containers/glass/paint/green,
/obj/item/weapon/reagent_containers/glass/paint/blue, /obj/item/weapon/reagent_containers/glass/paint/blue,
/obj/item/weapon/reagent_containers/glass/paint/yellow, /obj/item/weapon/reagent_containers/glass/paint/yellow,
/obj/item/weapon/reagent_containers/glass/paint/violet, /obj/item/weapon/reagent_containers/glass/paint/purple,
/obj/item/weapon/reagent_containers/glass/paint/black, /obj/item/weapon/reagent_containers/glass/paint/black,
/obj/item/weapon/reagent_containers/glass/paint/white, /obj/item/weapon/reagent_containers/glass/paint/white,
/obj/item/weapon/contraband/poster, /obj/item/weapon/contraband/poster,

3
code/game/objects/items/weapons/mop.dm
View File

@@ -19,6 +19,9 @@
/turf/proc/clean(atom/source) /turf/proc/clean(atom/source)
if(source.reagents.has_reagent("water", 1)) if(source.reagents.has_reagent("water", 1))
clean_blood() clean_blood()
if(istype(src, /turf))
var/turf/L = src
L.color = initial(L.color) //paint
if(istype(src, /turf/simulated)) if(istype(src, /turf/simulated))
var/turf/simulated/T = src var/turf/simulated/T = src
T.dirt = 0 T.dirt = 0

6
code/game/objects/items/weapons/paint.dm
View File

@@ -36,6 +36,8 @@ var/global/list/cached_icons = list()
reagents.add_reagent("plasticide", volume/5) reagents.add_reagent("plasticide", volume/5)
if(paint_type == "white") //why don't white crayons exist if(paint_type == "white") //why don't white crayons exist
reagents.add_reagent("aluminum", volume/5) reagents.add_reagent("aluminum", volume/5)
else if (paint_type == "black")
reagents.add_reagent("carbon", volume/5)
else else
reagents.add_reagent("crayon_dust_[paint_type]", volume/5) reagents.add_reagent("crayon_dust_[paint_type]", volume/5)
reagents.handle_reactions() reagents.handle_reactions()
@@ -56,13 +58,13 @@ var/global/list/cached_icons = list()
icon_state = "paint_blue" icon_state = "paint_blue"
paint_type = "blue" paint_type = "blue"
violet purple
icon_state = "paint_violet" icon_state = "paint_violet"
paint_type = "purple" paint_type = "purple"
black black
icon_state = "paint_black" icon_state = "paint_black"
paint_type = "gray" paint_type = "black"
white white
icon_state = "paint_white" icon_state = "paint_white"