TG sync Sunday (#201)

* stage one

* datums and shit

* game stuff

* modules

* tgstation.dme

* tools

* these things for icons

* compiling fixes

* merge spree on TG

* other updates

* updated maps with deepfryers

* My helpers were not helping

code/modules/events/alien_infestation.dm

@@ -37,7 +37,7 @@
 /datum/round_event/ghost_role/alien_infestation/spawn_role()
 	var/list/vents = list()
 	for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in machines)
-		if(qdeleted(temp_vent))
+		if(QDELETED(temp_vent))
 			continue
 		if(temp_vent.loc.z == ZLEVEL_STATION && !temp_vent.welded)
 			var/datum/pipeline/temp_vent_parent = temp_vent.PARENT1

code/modules/events/brand_intelligence.dm

@@ -40,7 +40,7 @@
 
 
 /datum/round_event/brand_intelligence/tick()
-	if(!originMachine || qdeleted(originMachine) || originMachine.shut_up || originMachine.wires.is_all_cut())	//if the original vending machine is missing or has it's voice switch flipped
+	if(!originMachine || QDELETED(originMachine) || originMachine.shut_up || originMachine.wires.is_all_cut())	//if the original vending machine is missing or has it's voice switch flipped
 		for(var/obj/machinery/vending/saved in infectedMachines)
 			saved.shoot_inventory = 0
 		if(originMachine)
@@ -51,7 +51,7 @@
 	vendingMachines = removeNullsFromList(vendingMachines)
 	if(!vendingMachines.len)	//if every machine is infected
 		for(var/obj/machinery/vending/upriser in infectedMachines)
-			if(prob(70) && !qdeleted(upriser))
+			if(prob(70) && !QDELETED(upriser))
 				var/mob/living/simple_animal/hostile/mimic/copy/M = new(upriser.loc, upriser, null, 1) // it will delete upriser on creation and override any machine checks
 				M.faction = list("profit")
 				M.speak = rampant_speeches.Copy()

code/modules/events/holiday/vday.dm

@@ -19,6 +19,45 @@
 		var/obj/item/weapon/storage/backpack/b = locate() in H.contents
 		new /obj/item/weapon/reagent_containers/food/snacks/candyheart(b)
 
+
+	var/list/valentines = list()
+	for(var/mob/living/M in player_list)
+		if(!M.stat && M.client && M.mind)
+			valentines |= M
+
+
+	while(valentines.len)
+		var/mob/living/L = pick_n_take(valentines)
+		if(valentines.len)
+			var/mob/living/date = pick_n_take(valentines)
+
+
+			forge_valentines_objective(L, date)
+
+			forge_valentines_objective(date, L)
+
+
+
+		else
+			L << "<span class='warning'><B>You didn't get a date! They're all having fun without you! you'll show them though...</B></span>"
+			var/datum/objective/martyr/normiesgetout = new
+			normiesgetout.owner = L.mind
+			ticker.mode.traitors |= L.mind
+			L.mind.objectives += normiesgetout
+
+/proc/forge_valentines_objective(mob/living/lover,mob/living/date)
+
+	ticker.mode.traitors |= lover.mind
+	lover.mind.special_role = "valentine"
+
+	var/datum/objective/protect/protect_objective = new /datum/objective/protect
+	protect_objective.owner = lover.mind
+	protect_objective.target = date.mind
+	protect_objective.explanation_text = "Protect [date.real_name], your date."
+	lover.mind.objectives += protect_objective
+	lover << "<span class='warning'><B>You're on a date with [date]! Protect them at all costs. This takes priority over all other loyalties.</B></span>"
+
+
 /datum/round_event/valentines/announce()
 	priority_announce("It's Valentine's Day! Give a valentine to that special someone!")
 
@@ -126,4 +165,4 @@
                 "A heart-shaped candy that reads: FACEHUGGER",
                 "A heart-shaped candy that reads: DOMINATOR",
                 "A heart-shaped candy that reads: GET TESLA'D")
-	icon_state = pick("candyheart", "candyheart2", "candyheart3", "candyheart4")
+	icon_state = pick("candyheart", "candyheart2", "candyheart3", "candyheart4")

code/modules/events/immovable_rod.dm

@@ -35,6 +35,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 	anchored = 1
 	var/z_original = 0
 	var/destination
+	var/notify = TRUE
 
 /obj/effect/immovablerod/New(atom/start, atom/end)
 	..()
@@ -42,9 +43,10 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 		SSaugury.register_doom(src, 2000)
 	z_original = z
 	destination = end
-	notify_ghosts("\A [src] is inbound!",
-		enter_link="<a href=?src=\ref[src];orbit=1>(Click to orbit)</a>",
-		source=src, action=NOTIFY_ORBIT)
+	if(notify)
+		notify_ghosts("\A [src] is inbound!",
+			enter_link="<a href=?src=\ref[src];orbit=1>(Click to orbit)</a>",
+			source=src, action=NOTIFY_ORBIT)
 	poi_list += src
 	if(end && end.z==z_original)
 		walk_towards(src, destination, 1)

code/modules/events/spacevine.dm

@@ -497,7 +497,7 @@
 	var/list/obj/structure/spacevine/queue_end = list()
 
 	for(var/obj/structure/spacevine/SV in growth_queue)
-		if(qdeleted(SV))
+		if(QDELETED(SV))
 			continue
 		i++
 		queue_end += SV