Fixes master 514 (#5927)

* a

* l

* Update sheet_types.dm

code/game/objects/items/mop.dm

@@ -14,7 +14,7 @@
 	attack_verb_simple = list("mop", "bash", "bludgeon", "whack")
 	resistance_flags = FLAMMABLE
 	var/mopcount = 0
-	var/mopcap = 50 //SKYRAT EDIT CHANGE
+	var/mopcap = 15
 	var/mopspeed = 15
 	force_string = "robust... against germs"
 	var/insertable = TRUE
@@ -22,21 +22,7 @@
 /obj/item/mop/Initialize()
 	. = ..()
 	create_reagents(mopcap)
-	//SKYRAT EDIT ADDITION
-	AddElement(/datum/element/liquids_interaction, on_interaction_callback = /obj/item/mop/.proc/attack_on_liquids_turf)
 
-/obj/item/mop/proc/attack_on_liquids_turf(obj/item/mop/the_mop, turf/T, mob/user, obj/effect/abstract/liquid_turf/liquids)
-	var/free_space = the_mop.reagents.maximum_volume - the_mop.reagents.total_volume
-	if(free_space <= 0)
-		to_chat(user, "<span class='warning'>Your mop can't absorb any more!</span>")
-		return TRUE
-	var/datum/reagents/tempr = liquids.take_reagents_flat(free_space)
-	tempr.trans_to(the_mop.reagents, tempr.total_volume)
-	to_chat(user, "<span class='notice'>You soak the mop with some liquids.</span>")
-	qdel(tempr)
-	user.changeNext_move(CLICK_CD_MELEE)
-	return TRUE
-	//SKYRAT EDIT END
 
 /obj/item/mop/proc/clean(turf/A, mob/living/cleaner)
 	if(reagents.has_reagent(/datum/reagent/water, 1) || reagents.has_reagent(/datum/reagent/water/holywater, 1) || reagents.has_reagent(/datum/reagent/consumable/ethanol/vodka, 1) || reagents.has_reagent(/datum/reagent/space_cleaner, 1))
@@ -58,10 +44,6 @@
 
 /obj/item/mop/afterattack(atom/A, mob/user, proximity)
 	. = ..()
-	//SKYRAT EDIT ADDITION
-	if(.)
-		return
-	//SKYRAT EDIT END
 	if(!proximity)
 		return
 
@@ -104,9 +86,9 @@
 	insertable = FALSE
 
 /obj/item/mop/advanced
-	desc = "The most advanced tool in a custodian's arsenal, complete with a condenser for self-wetting! Just think of all the viscera you will clean up with this! Due to the self-wetting technology, it proves very inefficient for cleaning up spills." //SKYRAT EDIT
+	desc = "The most advanced tool in a custodian's arsenal, complete with a condenser for self-wetting! Just think of all the viscera you will clean up with this!"
 	name = "advanced mop"
-	mopcap = 100 //SKYRAT EDIT CHANGE
+	mopcap = 10
 	icon_state = "advmop"
 	inhand_icon_state = "mop"
 	lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -72,11 +72,6 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 	null, \
 	new/datum/stack_recipe("floor tile", /obj/item/stack/tile/iron/base, 1, 4, 20), \
 	new/datum/stack_recipe("iron rod", /obj/item/stack/rods, 1, 2, 60), \
-	//SKYRAT EDIT ADDITION
-	new/datum/stack_recipe("pool floor tile", /obj/item/stack/tile/iron/pool, 1, 1, 4), \
-	new/datum/stack_recipe("lowered floor tile", /obj/item/stack/tile/iron/lowered, 1, 1, 4), \
-	new/datum/stack_recipe("elevated floor tile", /obj/item/stack/tile/iron/elevated, 1, 1, 4), \
-	//SKYRAT EDIT END
 	null, \
 	new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 40, one_per_turf = TRUE, on_floor = TRUE, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75), \
 	null, \

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -27,7 +27,6 @@
 	new /obj/item/storage/photo_album/ce(src)
 	new /obj/item/storage/box/skillchips/engineering(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/engineering/ce(src)
-	new /obj/item/construction/plumbing/engineering(src) //SKYRAT EDIT ADDITION
 	new /obj/item/circuitboard/machine/rodstopper(src) //SKYRAT EDIT ADDITION
 
 /obj/structure/closet/secure_closet/engineering_electrical
@@ -74,7 +73,6 @@
 	new /obj/item/clothing/glasses/meson/engine(src)
 	new /obj/item/storage/box/emptysandbags(src)
 	new /obj/item/storage/bag/construction(src)
-	new /obj/item/construction/plumbing/engineering(src) //SKYRAT EDIT ADDITION
 
 
 /obj/structure/closet/secure_closet/atmospherics

code/game/objects/structures/flora.dm

@@ -426,7 +426,6 @@
 /obj/structure/flora/rock/pile
 	icon_state = "lavarocks"
 	desc = "A pile of rocks."
-	density = FALSE //SKYRAT EDIT ADDITION
 
 //Jungle grass
 

code/game/objects/structures/tables_racks.dm

@@ -507,12 +507,6 @@
 	integrity_failure = 0.25
 	armor = list(MELEE = 10, BULLET = 30, LASER = 30, ENERGY = 100, BOMB = 20, BIO = 0, RAD = 0, FIRE = 80, ACID = 70)
 
-//SKYRAT EDIT ADDITION
-/obj/structure/table/reinforced/Initialize()
-	. = ..()
-	AddElement(/datum/element/liquids_height, 20)
-//SKYRAT EDIT END
-
 /obj/structure/table/reinforced/deconstruction_hints(mob/user)
 	if(deconstruction_ready)
 		return "<span class='notice'>The top cover has been <i>welded</i> loose and the main frame's <b>bolts</b> are exposed.</span>"