Adds helpers to avoid << use

2017-08-08 22:28:16 -05:00
parent 41f42aabca
commit cc7ad81f79
85 changed files with 241 additions and 217 deletions
@@ -351,7 +351,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 				source.plane = old_plane
 	to_chat(src, "<span class='ghostalert'><a href=?src=\ref[src];reenter=1>(Click to re-enter)</a></span>")
 	if(sound)
-		src << sound(sound)
+		SEND_SOUND(src, sound(sound))

 /mob/dead/observer/proc/dead_tele()
 	set category = "Ghost"
@@ -87,7 +87,7 @@
 	var/atom/xeno_loc = get_turf(owner)
 	var/mob/living/carbon/alien/larva/new_xeno = new(xeno_loc)
 	new_xeno.key = ghost.key
-	new_xeno << sound('sound/voice/hiss5.ogg',0,0,0,100)	//To get the player's attention
+	SEND_SOUND(new_xeno, sound('sound/voice/hiss5.ogg',0,0,0,100))	//To get the player's attention
 	new_xeno.canmove = 0 //so we don't move during the bursting animation
 	new_xeno.notransform = 1
 	new_xeno.invisibility = INVISIBILITY_MAXIMUM
@@ -337,7 +337,7 @@
 					// you need earmuffs, inacusiate, or replacement
 			else if(ears.ear_damage >= 5)
 				to_chat(src, "<span class='warning'>Your ears start to ring!</span>")
-			src << sound('sound/weapons/flash_ring.ogg',0,1,0,250)
+			SEND_SOUND(src, sound('sound/weapons/flash_ring.ogg',0,1,0,250))
 		return effect_amount //how soundbanged we are


@@ -97,7 +97,7 @@
 	if(voice_saved)
 		return
 	var/savefile/S = new /savefile("data/npc_saves/snpc.sav")
-	S["knownStrings"] << knownStrings
+	WRITE_FILE(S["knownStrings"], knownStrings)

 //botPool funcs
 /mob/living/carbon/human/interactive/proc/takeDelegate(mob/living/carbon/human/interactive/from,doReset=TRUE)
@@ -51,23 +51,23 @@
 /mob/living/carbon/monkey/punpun/proc/Write_Memory(dead, gibbed)
 	var/savefile/S = new /savefile("data/npc_saves/Punpun.sav")
 	if(gibbed)
-		S["ancestor_name"] 		<< null
-		S["ancestor_chain"]		<< 1
-		S["relic_hat"]			<< null
-		S["relic_mask"]			<< null
+		WRITE_FILE(S["ancestor_name"], null)
+		WRITE_FILE(S["ancestor_chain"], 1)
+		WRITE_FILE(S["relic_hat"], null)
+		WRITE_FILE(S["relic_mask"], null)
 		return
 	if(dead)
-		S["ancestor_name"] 		<< ancestor_name
-		S["ancestor_chain"]		<< ancestor_chain + 1
+		WRITE_FILE(S["ancestor_name"], ancestor_name)
+		WRITE_FILE(S["ancestor_chain"], ancestor_chain + 1)
 	if(!ancestor_name)	//new monkey name this round
-		S["ancestor_name"] 		<< name
+		WRITE_FILE(S["ancestor_name"], name)
 	if(head)
-		S["relic_hat"]			<< head.type
+		WRITE_FILE(S["relic_hat"], head.type)
 	else
-		S["relic_hat"]			<< null
+		WRITE_FILE(S["relic_hat"], null)
 	if(wear_mask)
-		S["relic_mask"]			<< wear_mask.type
+		WRITE_FILE(S["relic_mask"], wear_mask.type)
 	else
-		S["relic_mask"]			<< null
+		WRITE_FILE(S["relic_mask"], null)
 	if(!dead)
 		memory_saved = 1
@@ -316,7 +316,7 @@
 		GLOB.cult_narsie.souls += 1
 		if((GLOB.cult_narsie.souls == GLOB.cult_narsie.soul_goal) && (GLOB.cult_narsie.resolved == FALSE))
 			GLOB.cult_narsie.resolved = TRUE
-			world << sound('sound/machines/alarm.ogg')
+			sound_to_playing_players('sound/machines/alarm.ogg')
 			addtimer(CALLBACK(GLOBAL_PROC, .proc/cult_ending_helper, 1), 120)
 			addtimer(CALLBACK(GLOBAL_PROC, .proc/ending_helper), 270)
 	if(client)
@@ -163,9 +163,9 @@
 				if(M.client && M.can_hear() && (M.client.prefs.toggles & SOUND_ANNOUNCEMENTS))
 					var/turf/T = get_turf(M)
 					if(T.z == z_level)
-						M << voice
+						SEND_SOUND(M, voice)
 		else
-			only_listener << voice
+			SEND_SOUND(only_listener, voice)
 		return 1
 	return 0

@@ -17,12 +17,12 @@
 	var/savefile/F = new /savefile(src.savefile_path(user))


-	F["name"] << src.name
-	F["description"] << src.description
-	F["role"] << src.role
-	F["comments"] << src.comments
+	WRITE_FILE(F["name"], name)
+	WRITE_FILE(F["description"], description)
+	WRITE_FILE(F["role"], role)
+	WRITE_FILE(F["comments"], comments)

-	F["version"] << 1
+	WRITE_FILE(F["version"], 1)

 	return 1

@@ -130,7 +130,7 @@
 				family[C.type] += 1
 			else
 				family[C.type] = 1
-	S["family"]				<< family
+	WRITE_FILE(S["family"], family)
 	memory_saved = 1

 /mob/living/simple_animal/pet/cat/Runtime/proc/Deploy_The_Cats()
@@ -344,14 +344,14 @@
 /mob/living/simple_animal/pet/dog/corgi/Ian/proc/Write_Memory(dead)
 	var/savefile/S = new /savefile("data/npc_saves/Ian.sav")
 	if(!dead)
-		S["age"] 				<< age + 1
+		WRITE_FILE(S["age"], age + 1)
 		if((age + 1) > record_age)
-			S["record_age"]		<< record_age + 1
+			WRITE_FILE(S["record_age"], record_age + 1)
 		if(inventory_head)
-			S["saved_head"] << inventory_head.type
+			WRITE_FILE(S["saved_head"], inventory_head.type)
 	else
-		S["age"] 		<< 0
-		S["saved_head"] << null
+		WRITE_FILE(S["age"], 0)
+		WRITE_FILE(S["saved_head"], null)
 	memory_saved = 1


@@ -283,7 +283,7 @@ Difficulty: Very Hard
 	for(var/obj/O in (contents-component_parts))
 		stored_items += O.type

-	S["stored_items"]				<< stored_items
+	WRITE_FILE(S["stored_items"], stored_items)
 	memory_saved = TRUE

 /obj/machinery/smartfridge/black_box/proc/ReadMemory()
@@ -936,10 +936,10 @@
 /mob/living/simple_animal/parrot/Poly/proc/Write_Memory()
 	var/savefile/S = new /savefile("data/npc_saves/Poly.sav")
 	if(islist(speech_buffer))
-		S["phrases"] 			<< speech_buffer
-	S["roundssurvived"]		<< rounds_survived
-	S["longestsurvival"]	<< longest_survival
-	S["longestdeathstreak"] << longest_deathstreak
+		WRITE_FILE(S["phrases"], speech_buffer)
+	WRITE_FILE(S["roundssurvived"], rounds_survived)
+	WRITE_FILE(S["longestsurvival"], longest_survival)
+	WRITE_FILE(S["longestdeathstreak"], longest_deathstreak)
 	memory_saved = 1

 /mob/living/simple_animal/parrot/Poly/ghost
@@ -384,7 +384,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		if(O.client)
 			to_chat(O, "<span class='ghostalert'>[message][(enter_link) ? " [enter_link]" : ""]<span>")
 			if(ghost_sound)
-				O << sound(ghost_sound)
+				SEND_SOUND(O, sound(ghost_sound))
 			if(flashwindow)
 				window_flash(O.client)
 			if(source)