Merge pull request #3 from d3athrow/Bleeding-Edge

updating

Author: Arthurdentist

baystation12.dme

@@ -239,6 +239,7 @@
 #include "code\game\communications.dm"
 #include "code\game\data_huds.dm"
 #include "code\game\response_team.dm"
+#include "code\game\say.dm"
 #include "code\game\shuttle_engines.dm"
 #include "code\game\skincmd.dm"
 #include "code\game\smoothwall.dm"
@@ -565,8 +566,6 @@
 #include "code\game\objects\effects\spawners\bombspawner.dm"
 #include "code\game\objects\effects\spawners\gibspawner.dm"
 #include "code\game\objects\effects\spawners\vaultspawner.dm"
-#include "code\game\objects\items\airlock_control_frame.dm"
-#include "code\game\objects\items\apc_frame.dm"
 #include "code\game\objects\items\blueprints.dm"
 #include "code\game\objects\items\bodybag.dm"
 #include "code\game\objects\items\candle.dm"
@@ -614,6 +613,18 @@
 #include "code\game\objects\items\devices\radio\headset.dm"
 #include "code\game\objects\items\devices\radio\intercom.dm"
 #include "code\game\objects\items\devices\radio\radio.dm"
+#include "code\game\objects\items\mountable_frames\access_button.dm"
+#include "code\game\objects\items\mountable_frames\air_alarm.dm"
+#include "code\game\objects\items\mountable_frames\airlock_controller_frame.dm"
+#include "code\game\objects\items\mountable_frames\airlock_sensor.dm"
+#include "code\game\objects\items\mountable_frames\apc_frame.dm"
+#include "code\game\objects\items\mountable_frames\fire_alarm.dm"
+#include "code\game\objects\items\mountable_frames\frames.dm"
+#include "code\game\objects\items\mountable_frames\intercoms.dm"
+#include "code\game\objects\items\mountable_frames\lights.dm"
+#include "code\game\objects\items\mountable_frames\mountables.dm"
+#include "code\game\objects\items\mountable_frames\wallmed.dm"
+#include "code\game\objects\items\mountable_frames\posters\poster.dm"
 #include "code\game\objects\items\robot\robot_designs.dm"
 #include "code\game\objects\items\robot\robot_items.dm"
 #include "code\game\objects\items\robot\robot_parts.dm"
@@ -798,7 +809,6 @@
 #include "code\game\turfs\unsimulated\beach.dm"
 #include "code\game\turfs\unsimulated\floor.dm"
 #include "code\game\turfs\unsimulated\walls.dm"
-#include "code\game\verbs\atom_verbs.dm"
 #include "code\game\verbs\ooc.dm"
 #include "code\game\verbs\suicide.dm"
 #include "code\game\verbs\who.dm"

code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm

@@ -61,7 +61,6 @@ max volume of plasma storeable by the field = the total volume of a number of ti
 	idle_power_usage = 50
 	active_power_usage = 500	//multiplied by field strength
 	var/cached_power_avail = 0
-	directwired = 1
 	anchored = 0
 
 	var/locked = 1
@@ -88,10 +87,8 @@ max volume of plasma storeable by the field = the total volume of a number of ti
 		switch(state)
 			if(1)
 				connect_to_network()
-				src.directwired = 1
 			if(2)
 				disconnect_from_network()
-				src.directwired = 0
 		return 1
 	return -1
 

code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port_construction.dm

@@ -1,37 +1,25 @@
 
 //frame assembly
 
-/obj/item/rust_fuel_assembly_port_frame
+/obj/item/mounted/frame/rust_fuel_assembly_port
 	name = "Fuel Assembly Port frame"
 	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
 	icon_state = "port2"
 	w_class = 4
+	mount_reqs = list("simfloor", "nospace")
 	flags = FPRINT
 	siemens_coefficient = 1
 
-/obj/item/rust_fuel_assembly_port_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/mounted/frame/rust_fuel_assembly_port/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/wrench))
 		new /obj/item/stack/sheet/plasteel( get_turf(src.loc), 12 )
 		del(src)
 		return
 	..()
 
-/obj/item/rust_fuel_assembly_port_frame/proc/try_build(turf/on_wall)
-	if (get_dist(on_wall,usr)>1)
-		return
-	var/ndir = get_dir(usr,on_wall)
-	if (!(ndir in cardinal))
-		return
-	var/turf/loc = get_turf(usr)
-	var/area/A = loc.loc
-	if (!istype(loc, /turf/simulated/floor))
-		usr << "\red Port cannot be placed on this spot."
-		return
-	if (A.requires_power == 0 || A.name == "Space")
-		usr << "\red Port cannot be placed in this area."
-		return
-	new /obj/machinery/rust_fuel_assembly_port(loc, ndir, 1)
-	del(src)
+/obj/item/mounted/frame/rust_fuel_assembly_port/do_build(turf/on_wall, mob/user)
+	new /obj/machinery/rust_fuel_assembly_port(get_turf(user), get_dir(user, on_wall), 1)
+	qdel(src)
 
 //construction steps
 /obj/machinery/rust_fuel_assembly_port/New(turf/loc, var/ndir, var/building=0)
@@ -123,7 +111,7 @@
 		playsound(get_turf(src), 'sound/items/Welder.ogg', 50, 1)
 		if(do_after(user, 50))
 			if(!src || !WT.remove_fuel(3, user)) return
-			new /obj/item/rust_fuel_assembly_port_frame(loc)
+			new /obj/item/mounted/frame/rust_fuel_assembly_port(loc)
 			user.visible_message(\
 				"\red [src] has been cut away from the wall by [user.name].",\
 				"You detached the port frame.",\

code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor_construction.dm

@@ -1,37 +1,25 @@
 
 //frame assembly
 
-/obj/item/rust_fuel_compressor_frame
+/obj/item/mounted/frame/rust_fuel_compressor
 	name = "Fuel Compressor frame"
 	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
 	icon_state = "fuel_compressor0"
 	w_class = 4
+	mount_reqs = list("simfloor", "nospace")
 	flags = FPRINT
 	siemens_coefficient = 1
 
-/obj/item/rust_fuel_compressor_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/mounted/frame/rust_fuel_compressor/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/wrench))
 		new /obj/item/stack/sheet/plasteel( get_turf(src.loc), 12 )
 		del(src)
 		return
 	..()
 
-/obj/item/rust_fuel_compressor_frame/proc/try_build(turf/on_wall)
-	if (get_dist(on_wall,usr)>1)
-		return
-	var/ndir = get_dir(usr,on_wall)
-	if (!(ndir in cardinal))
-		return
-	var/turf/loc = get_turf(usr)
-	var/area/A = loc.loc
-	if (!istype(loc, /turf/simulated/floor))
-		usr << "\red Compressor cannot be placed on this spot."
-		return
-	if (A.requires_power == 0 || A.name == "Space")
-		usr << "\red Compressor cannot be placed in this area."
-		return
-	new /obj/machinery/rust_fuel_compressor(loc, ndir, 1)
-	del(src)
+/obj/item/mounted/frame/rust_fuel_compressor/do_build(turf/on_wall, mob/user)
+	new /obj/machinery/rust_fuel_compressor(get_turf(user), get_dir(user, on_wall), 1)
+	qdel(src)
 
 //construction steps
 /obj/machinery/rust_fuel_compressor/New(turf/loc, var/ndir, var/building=0)
@@ -150,7 +138,7 @@
 		playsound(get_turf(src), 'sound/items/Welder.ogg', 50, 1)
 		if(do_after(user, 50))
 			if(!src || !WT.remove_fuel(3, user)) return
-			new /obj/item/rust_fuel_assembly_port_frame(loc)
+			new /obj/item/mounted/frame/rust_fuel_assembly_port(loc)
 			user.visible_message(\
 				"\red [src] has been cut away from the wall by [user.name].",\
 				"You detached the compressor frame.",\

code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm

@@ -18,7 +18,6 @@
 	use_power = 1
 	idle_power_usage = 10
 	active_power_usage = 500
-	directwired = 0
 	var/remote_access_enabled = 1
 	var/cached_power_avail = 0
 	var/emergency_insert_ready = 0

code/WorkInProgress/kilakk/fax.dm

@@ -111,7 +111,7 @@ var/list/alldepartments = list("Central Command")
 						if(findtext(tofax.name,"Demotion"))
 							new /obj/item/demote_chip(src.loc)
 						if(findtext(tofax.name,"Commendation"))
-							new /obj/item/weapon/contraband/poster(src.loc,-1)
+							new /obj/item/mounted/poster(src.loc,-1)
 				sendcooldown = 1800
 
 			else

code/ZAS/Airflow.dm

@@ -248,7 +248,7 @@ proc/AirflowSpace(zone/A)
 /atom/movable/proc/GotoAirflowDest(n)
 	last_airflow = world.time
 	if(airflow_dest == loc)
-		step_away(src,loc)
+		return
 	if(ismob(src))
 		if(src:status_flags & GODMODE)
 			return
@@ -365,21 +365,24 @@ proc/AirflowSpace(zone/A)
 		airflow_speed = 0
 		airflow_time = 0
 		. = ..()
+	sound_override = 0
 
 atom/movable/proc/airflow_hit(atom/A)
 	airflow_speed = 0
 	airflow_dest = null
 
 mob/airflow_hit(atom/A)
-	for(var/mob/M in hearers(src))
-		M.show_message("\red <B>\The [src] slams into \a [A]!</B>",1,"\red You hear a loud slam!",2)
+	if(!sound_override)
+		for(var/mob/M in hearers(src))
+			M.show_message("\red <B>\The [src] slams into \a [A]!</B>",1,"\red You hear a loud slam!",2)
 	//playsound(get_turf(src), "smash.ogg", 25, 1, -1)
 	weakened = max(weakened, (istype(A,/obj/item) ? A:w_class : rand(1,5))) //Heheheh
 	. = ..()
 
 obj/airflow_hit(atom/A)
-	for(var/mob/M in hearers(src))
-		M.show_message("\red <B>\The [src] slams into \a [A]!</B>",1,"\red You hear a loud slam!",2)
+	if(!sound_override)
+		for(var/mob/M in hearers(src))
+			M.show_message("\red <B>\The [src] slams into \a [A]!</B>",1,"\red You hear a loud slam!",2)
 	//playsound(get_turf(src), "smash.ogg", 25, 1, -1)
 	. = ..()
 

code/__HELPERS/game.dm

@@ -41,12 +41,17 @@
 	return 0 //not in range and not telekinetic
 
 // Like view but bypasses luminosity check
-/proc/hear(var/range, var/atom/source)
+/proc/get_hear(var/range, var/atom/source)
+
 	var/lum = source.luminosity
 	source.luminosity = 6
-	. = view(range, source)
+
+	var/list/heard = view(range, source)
 	source.luminosity = lum
 
+	return heard
+
+
 /proc/alone_in_area(var/area/the_area, var/mob/must_be_alone, var/check_type = /mob/living/carbon)
 	var/area/our_area = get_area_master(the_area)
 	for(var/C in living_mob_list)
@@ -123,63 +128,87 @@
 	return turfs
 
 
+//This is the new version of recursive_mob_check, used for say().
+//The other proc was left intact because morgue trays use it.
+/proc/recursive_hear_check(var/atom/O)
+	var/list/processing_list = list(O)
+	var/list/processed_list = list()
+	var/list/found_atoms = list()
+
+	while(processing_list.len)
+		var/atom/A = processing_list[1]
+
+		if(A.flags & HEAR)
+			found_atoms |= A
+
+		for(var/atom/B in A)
+			if(!processed_list[B])
+				processing_list |= B
+
+		processing_list.Cut(1, 2)
+		processed_list[A] = A
+
+	return found_atoms
 
 //var/debug_mob = 0
 
 // Will recursively loop through an atom's contents and check for mobs, then it will loop through every atom in that atom's contents.
 // It will keep doing this until it checks every content possible. This will fix any problems with mobs, that are inside objects,
 // being unable to hear people due to being in a box within a bag.
 
-/proc/recursive_mob_check(var/atom/O,  var/list/L = list(), var/recursion_limit = 3, var/client_check = 1, var/sight_check = 1, var/include_radio = 1)
+/proc/recursive_mob_check(var/atom/O,var/client_check=1,var/sight_check=1,var/include_radio=1)
 
-	//debug_mob += O.contents.len
-	if(!recursion_limit)
-		return L
-	for(var/atom/movable/A in O.contents)
+	var/list/processing_list = list(O)
+	var/list/processed_list = list()
+	var/list/found_mobs = list()
+
+	while(processing_list.len)
+
+		var/atom/A = processing_list[1]
+		var/passed = 0
 
 		if(ismob(A))
-			var/mob/M = A
-			if(client_check && !M.client)
-				L = recursive_mob_check(A, L, recursion_limit - 1, client_check, sight_check, include_radio)
-				continue
-			if(sight_check && !isInSight(A, O))
-				continue
-			L |= M
-			//world.log << "[recursion_limit] = [M] - [get_turf(M)] - ([M.x], [M.y], [M.z])"
+			var/mob/A_tmp = A
+			passed=1
+
+			if(client_check && !A_tmp.client)
+				passed=0
+
+			if(sight_check && !isInSight(A_tmp, O))
+				passed=0
 
 		else if(include_radio && istype(A, /obj/item/device/radio))
+			passed=1
+
 			if(sight_check && !isInSight(A, O))
-				continue
-			L |= A
+				passed=0
 
-		L = recursive_mob_check(A, L, recursion_limit - 1, client_check, sight_check, include_radio)
+		if(passed)
+			found_mobs |= A
 
-	return L
+		for(var/atom/B in A)
+			if(!processed_list[B])
+				processing_list |= B
+
+		processing_list.Cut(1, 2)
+		processed_list[A] = A
+
+	return found_mobs
 
 // The old system would loop through lists for a total of 5000 per function call, in an empty server.
 // This new system will loop at around 1000 in an empty server.
 
-/proc/get_mobs_in_view(var/R, var/atom/source)
-	// Returns a list of mobs in range of R from source. Used in radio and say code.
-
+/proc/get_hearers_in_view(var/R, var/atom/source)
+	// Returns a list of hearers in range of R from source. Used in saycode.
 	var/turf/T = get_turf(source)
 	var/list/hear = list()
 
 	if(!T)
 		return hear
 
-	var/list/range = hear(R, T)
-
+	var/list/range = get_hear(R, T)
 	for(var/atom/movable/A in range)
-		if(ismob(A))
-			var/mob/M = A
-			if(M.client)
-				hear.Add(M)
-			//world.log << "Start = [M] - [get_turf(M)] - ([M.x], [M.y], [M.z])"
-		else if(istype(A, /obj/item/device/radio))
-			hear.Add(A)
-
-		hear = recursive_mob_check(A, hear, 3, 1, 0, 1)
+		hear |= recursive_hear_check(A)
 
 	return hear
 
@@ -195,7 +224,7 @@
 		if(R)
 			var/turf/speaker = get_turf(R)
 			if(speaker)
-				for(var/turf/T in hear(R.canhear_range,speaker))
+				for(var/turf/T in get_hear(R.canhear_range,speaker))
 					speaker_coverage[T] = T
 
 

code/__HELPERS/text.dm

@@ -44,6 +44,17 @@
 			index = findtext(t, char)
 	return t
 
+/proc/strip_html_properly(var/input)
+	var/opentag = 1 //These store the position of < and > respectively.
+	var/closetag = 1
+	while(1)
+		opentag = findtext(input, "<")
+		closetag = findtext(input, ">")
+		if(!closetag || !opentag)
+			break
+		input = copytext(input, 1, opentag) + copytext(input, (closetag + 1))
+	return input
+
 //Removes a few problematic characters
 /proc/sanitize_simple(var/t,var/list/repl_chars = list("\n"="#","\t"="#","�"="�"))
 	for(var/char in repl_chars)