Merge branch 'incremental_tg' r5067 into bs12_with_tgport

removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)

Conflicts:
	baystation12.dme
	code/__HELPERS/type2type.dm
	code/controllers/configuration.dm
	code/datums/datumvars.dm
	code/datums/helper_datums/getrev.dm
	code/defines/obj.dm
	code/game/gamemodes/events/black_hole.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/turrets.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/turfs/turf.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_memo.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/holder2.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/assembly/igniter.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/setup.dm
	code/stylesheet.dm
	code/world.dm
	config/admins.txt
	config/config.txt
	html/changelog.html
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
	icons/turf/areas.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/game/objects/structures/crates_lockers/largecrate.dm

@@ -24,4 +24,13 @@
 		return attack_hand(user)
 
 /obj/structure/largecrate/mule
-	icon_state = "mulecrate"
+	icon_state = "mulecrate"
+
+/obj/structure/largecrate/lisa
+	icon_state = "lisacrate"
+
+/obj/structure/largecrate/lisa/attackby(obj/item/weapon/W as obj, mob/user as mob)	//ugly but oh well
+	if(istype(W, /obj/item/weapon/crowbar))
+		new /mob/living/simple_animal/corgi/Lisa(loc)
+
+	..()

code/game/objects/structures/false_walls.dm

@@ -144,9 +144,9 @@
 			var/turf/T = get_turf(src)
 			user.visible_message("[user] tightens some bolts on the wall.", "You tighten the bolts on the wall.")
 			if(!mineral || mineral == "metal")
-				T.ReplaceWithWall()
+				T.ChangeTurf(/turf/simulated/wall)
 			else
-				T.ReplaceWithMineralWall(mineral)
+				T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]"))
 			del(src)
 
 		if( istype(W, /obj/item/weapon/weldingtool) )
@@ -154,9 +154,9 @@
 			if( WT:welding )
 				var/turf/T = get_turf(src)
 				if(!mineral)
-					T.ReplaceWithWall()
+					T.ChangeTurf(/turf/simulated/wall)
 				else
-					T.ReplaceWithMineralWall(mineral)
+					T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]"))
 				if(mineral != "plasma")//Stupid shit keeps me from pushing the attackby() to plasma walls -Sieve
 					T = get_turf(src)
 					T.attackby(W,user)
@@ -167,9 +167,9 @@
 	if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) )
 		var/turf/T = get_turf(src)
 		if(!mineral)
-			T.ReplaceWithWall()
+			T.ChangeTurf(/turf/simulated/wall)
 		else
-			T.ReplaceWithMineralWall(mineral)
+			T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]"))
 		if(mineral != "plasma")
 			T = get_turf(src)
 			T.attackby(W,user)
@@ -179,9 +179,9 @@
 	else if (istype(W, /obj/item/weapon/pickaxe/diamonddrill))
 		var/turf/T = get_turf(src)
 		if(!mineral)
-			T.ReplaceWithWall()
+			T.ChangeTurf(/turf/simulated/wall)
 		else
-			T.ReplaceWithMineralWall(mineral)
+			T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]"))
 		T = get_turf(src)
 		T.attackby(W,user)
 		del(src)
@@ -189,9 +189,9 @@
 	else if( istype(W, /obj/item/weapon/melee/energy/blade) )
 		var/turf/T = get_turf(src)
 		if(!mineral)
-			T.ReplaceWithWall()
+			T.ChangeTurf(/turf/simulated/wall)
 		else
-			T.ReplaceWithMineralWall(mineral)
+			T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]"))
 		if(mineral != "plasma")
 			T = get_turf(src)
 			T.attackby(W,user)
@@ -268,21 +268,21 @@
 	if(istype(W, /obj/item/weapon/screwdriver))
 		var/turf/T = get_turf(src)
 		user.visible_message("[user] tightens some bolts on the r wall.", "You tighten the bolts on the wall.")
-		T.ReplaceWithWall() //Intentionally makes a regular wall instead of an r-wall (no cheap r-walls for you).
+		T.ChangeTurf(/turf/simulated/wall) //Intentionally makes a regular wall instead of an r-wall (no cheap r-walls for you).
 		del(src)
 
 	if( istype(W, /obj/item/weapon/weldingtool) )
 		var/obj/item/weapon/weldingtool/WT = W
 		if( WT.remove_fuel(0,user) )
 			var/turf/T = get_turf(src)
-			T.ReplaceWithWall()
+			T.ChangeTurf(/turf/simulated/wall)
 			T = get_turf(src)
 			T.attackby(W,user)
 			del(src)
 
 	else if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) )
 		var/turf/T = get_turf(src)
-		T.ReplaceWithWall()
+		T.ChangeTurf(/turf/simulated/wall)
 		T = get_turf(src)
 		T.attackby(W,user)
 		del(src)
@@ -290,14 +290,14 @@
 	//DRILLING
 	else if (istype(W, /obj/item/weapon/pickaxe/diamonddrill))
 		var/turf/T = get_turf(src)
-		T.ReplaceWithWall()
+		T.ChangeTurf(/turf/simulated/wall)
 		T = get_turf(src)
 		T.attackby(W,user)
 		del(src)
 
 	else if( istype(W, /obj/item/weapon/melee/energy/blade) )
 		var/turf/T = get_turf(src)
-		T.ReplaceWithWall()
+		T.ChangeTurf(/turf/simulated/wall)
 		T = get_turf(src)
 		T.attackby(W,user)
 		del(src)
@@ -308,9 +308,8 @@
 			active = 1
 			for(var/mob/living/L in range(3,src))
 				L.apply_effect(12,IRRADIATE,0)
-			for(var/turf/simulated/wall/mineral/T in range(3,src))
-				if(T.mineral == "uranium")
-					T.radiate()
+			for(var/turf/simulated/wall/mineral/uranium/T in range(3,src))
+				T.radiate()
 			last_event = world.time
 			active = null
 			return

code/game/objects/structures/girders.dm

@@ -73,6 +73,7 @@
 						S.use(2)
 						user << "\blue You create a false wall! Push on it to open or close the passage."
 						new /obj/structure/falsewall (src.loc)
+						del(src)
 					else
 						if(S.amount < 2) return ..()
 						user << "\blue Now adding plating..."
@@ -81,7 +82,7 @@
 							S.use(2)
 							user << "\blue You added the plating!"
 							var/turf/Tsrc = get_turf(src)
-							Tsrc.ReplaceWithWall()
+							Tsrc.ChangeTurf(/turf/simulated/wall)
 							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
 								P.layer = 1
 							for(var/turf/simulated/wall/X in Tsrc.loc)
@@ -95,6 +96,7 @@
 						S.use(2)
 						user << "\blue You create a false wall! Push on it to open or close the passage."
 						new /obj/structure/falserwall (src.loc)
+						del(src)
 					else
 						if (src.icon_state == "reinforced") //I cant believe someone would actually write this line of code...
 							if(S.amount < 1) return ..()
@@ -104,7 +106,7 @@
 								S.use(1)
 								user << "\blue Wall fully reinforced!"
 								var/turf/Tsrc = get_turf(src)
-								Tsrc.ReplaceWithRWall()
+								Tsrc.ChangeTurf(/turf/simulated/wall)
 								for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
 									P.layer = 1
 								for(var/turf/simulated/wall/r_wall/X in Tsrc.loc)
@@ -128,6 +130,7 @@
 						S.use(2)
 						user << "\blue You create a false wall! Push on it to open or close the passage."
 						new /obj/structure/falsewall/gold (src.loc)
+						del(src)
 					else
 						if(S.amount < 2) return ..()
 						user << "\blue Now adding plating..."
@@ -136,7 +139,7 @@
 							S.use(2)
 							user << "\blue You added the plating!"
 							var/turf/Tsrc = get_turf(src)
-							Tsrc.ReplaceWithMineralWall("gold")
+							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/gold)
 							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
 								P.layer = 1
 							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
@@ -150,6 +153,7 @@
 						S.use(2)
 						user << "\blue You create a false wall! Push on it to open or close the passage."
 						new /obj/structure/falsewall/silver (src.loc)
+						del(src)
 					else
 						if(S.amount < 2) return ..()
 						user << "\blue Now adding plating..."
@@ -158,7 +162,7 @@
 							S.use(2)
 							user << "\blue You added the plating!"
 							var/turf/Tsrc = get_turf(src)
-							Tsrc.ReplaceWithMineralWall("silver")
+							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/silver)
 							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
 								P.layer = 1
 							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
@@ -172,6 +176,7 @@
 						S.use(2)
 						user << "\blue You create a false wall! Push on it to open or close the passage."
 						new /obj/structure/falsewall/diamond (src.loc)
+						del(src)
 					else
 						if(S.amount < 2) return ..()
 						user << "\blue Now adding plating..."
@@ -180,7 +185,7 @@
 							S.use(2)
 							user << "\blue You added the plating!"
 							var/turf/Tsrc = get_turf(src)
-							Tsrc.ReplaceWithMineralWall("diamond")
+							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/diamond)
 							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
 								P.layer = 1
 							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
@@ -194,6 +199,7 @@
 						S.use(2)
 						user << "\blue You create a false wall! Push on it to open or close the passage."
 						new /obj/structure/falsewall/uranium (src.loc)
+						del(src)
 					else
 						if(S.amount < 2) return ..()
 						user << "\blue Now adding plating..."
@@ -202,7 +208,7 @@
 							S.use(2)
 							user << "\blue You added the plating!"
 							var/turf/Tsrc = get_turf(src)
-							Tsrc.ReplaceWithMineralWall("uranium")
+							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/uranium)
 							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
 								P.layer = 1
 							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
@@ -216,6 +222,7 @@
 						S.use(2)
 						user << "\blue You create a false wall! Push on it to open or close the passage."
 						new /obj/structure/falsewall/plasma (src.loc)
+						del(src)
 					else
 						if(S.amount < 2) return ..()
 						user << "\blue Now adding plating..."
@@ -224,7 +231,7 @@
 							S.use(2)
 							user << "\blue You added the plating!"
 							var/turf/Tsrc = get_turf(src)
-							Tsrc.ReplaceWithMineralWall("plasma")
+							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/plasma)
 							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
 								P.layer = 1
 							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
@@ -238,14 +245,16 @@
 						S.use(2)
 						user << "\blue You create a false wall! Push on it to open or close the passage."
 						new /obj/structure/falsewall/clown (src.loc)
+						del(src)
 					else
 						if(S.amount < 2) return ..()
 						user << "\blue Now adding plating..."
 						if (do_after(user,40))
 							if(!src || !S || S.amount < 2) return
+							S.use(2)
 							user << "\blue You added the plating!"
 							var/turf/Tsrc = get_turf(src)
-							Tsrc.ReplaceWithMineralWall("clown")
+							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/clown)
 							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
 								P.layer = 1
 							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
@@ -259,6 +268,7 @@
 						S.use(2)
 						user << "\blue You create a false wall! Push on it to open or close the passage."
 						new /obj/structure/falsewall/sandstone (src.loc)
+						del(src)
 					else
 						if(S.amount < 2) return ..()
 						user << "\blue Now adding plating..."
@@ -267,7 +277,7 @@
 							S.use(2)
 							user << "\blue You added the plating!"
 							var/turf/Tsrc = get_turf(src)
-							Tsrc.ReplaceWithMineralWall("sandstone")
+							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/sandstone)
 							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
 								P.layer = 1
 							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
@@ -276,7 +286,6 @@
 						return
 
 			add_hiddenprint(usr)
-			del(src)
 
 		else if(istype(W, /obj/item/pipe))
 			var/obj/item/pipe/P = W

code/game/objects/structures/grille.dm

@@ -92,6 +92,11 @@
 		else
 			return !density
 
+/obj/structure/grille/bullet_act(var/obj/item/projectile/Proj)
+	if(!Proj)	return
+	src.health -= Proj.damage*0.2
+	healthcheck()
+	return 0
 
 /obj/structure/grille/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(iswirecutter(W))

code/game/objects/structures/mineral_doors.dm

@@ -252,7 +252,7 @@
 
 /obj/structure/mineral_door/resin
 	mineralType = "resin"
-	hardness = 5
+	hardness = 1.5
 	var/close_delay = 100
 
 	TryToSwitchState(atom/user)
@@ -286,4 +286,9 @@
 		isSwitchingStates = 0
 
 	Dismantle(devastated = 0)
-		del(src)
+		del(src)
+
+	CheckHardness()
+		playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+		..()
+

code/game/objects/structures/musician.dm

@@ -330,7 +330,7 @@
 	proc/compilesong()
 		var/compilestring = ""
 
-		var/strippedsourcestring = dd_replacetext(currentsong.sourcestring, "\n", "")
+		var/strippedsourcestring = replacetext(currentsong.sourcestring, "\n", "")
 
 		strippedsourcestring = unbayify(strippedsourcestring)
 
@@ -601,7 +601,7 @@
 		updateUsrDialog()
 
 	else if(href_list["export"])
-		var/output = dd_replacetext(currentsong.sourcestring, "\n", "")
+		var/output = replacetext(currentsong.sourcestring, "\n", "")
 
 		var/list/sourcelist = text2list(output, ",")
 
@@ -728,8 +728,8 @@
 			var/input = html_encode(input(usr, "", "Edit", currentsong.sourcestring) as message|null)
 			if(isnull(input)) return
 
-			input = dd_replacetext(input, " ", "")
-			input = dd_replacetext(input, "\t", "")
+			input = replacetext(input, " ", "")
+			input = replacetext(input, "\t", "")
 
 			if(lentext(input)>4000)
 				statusmsg("Editor Error: Song too long, end was cutoff (max 4000)")

code/game/objects/structures/safe.dm

@@ -135,10 +135,11 @@ FLOOR SAFES
 	if(href_list["retrieve"])
 		user << browse("", "window=safe") // Close the menu
 
-		var/obj/item/P = locate(href_list["retrieve"])
-		if(P && in_range(src, user))
-			user.put_in_hands(P)
-			updateUsrDialog()
+		var/obj/item/P = locate(href_list["retrieve"]) in src
+		if(open)
+			if(P && in_range(src, user))
+				user.put_in_hands(P)
+				updateUsrDialog()
 
 
 /obj/structure/safe/attackby(obj/item/I as obj, mob/user as mob)

code/game/objects/structures/tables_racks.dm

@@ -243,6 +243,7 @@
 /obj/structure/table/attack_paw(mob/user as mob)
 	if ((HULK in usr.mutations))
 		usr << "\blue You destroy the table."
+		usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		visible_message("\red [user] smashes the table apart!")
 		if(istype(src, /obj/structure/table/reinforced))
 			new /obj/item/weapon/table_parts/reinforced( src.loc )
@@ -296,6 +297,7 @@
 	if ((HULK in usr.mutations) || (SUPRSTR in usr.augmentations))
 		usr << "\blue You destroy the table."
 		visible_message("\red [user] smahes the table apart!")
+		usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		if(istype(src, /obj/structure/table/reinforced))
 			new /obj/item/weapon/table_parts/reinforced( src.loc )
 		else if(istype(src, /obj/structure/table/woodentable))

code/game/objects/structures/window.dm

@@ -111,6 +111,7 @@
 /obj/structure/window/attack_hand()
 	if ((HULK in usr.mutations) || (SUPRSTR in usr.augmentations))
 		usr << "\blue You smash through the window."
+		usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		for(var/mob/O in oviewers())
 			if ((O.client && !( O.blinded )))
 				O << "\red [usr] smashes through the window!"
@@ -124,6 +125,7 @@
 /obj/structure/window/attack_paw()
 	if ((HULK in usr.mutations))
 		usr << "\blue You smash through the window."
+		usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		for(var/mob/O in oviewers())
 			if ((O.client && !( O.blinded )))
 				O << "\red [usr] smashes through the window!"