TG Sync 12/15/17

s s
2017-12-15 06:27:57 -08:00
parent b6b0ab69e3
commit 253c819bc1
762 changed files with 13429 additions and 14872 deletions
@@ -72,7 +72,7 @@
 	var/nearest_beacon			// the nearest beacon's tag
 	var/turf/nearest_beacon_loc	// the nearest beacon's location

-	var/beacon_freq = 1445		// navigation beacon frequency
+	var/beacon_freq = FREQ_NAV_BEACON
 	var/model = "" //The type of bot it is.
 	var/bot_type = 0 //The type of bot it is, for radio control.
 	var/data_hud_type = DATA_HUD_DIAGNOSTIC_BASIC //The type of data HUD the bot uses. Diagnostic by default.
@@ -108,6 +108,7 @@
 	if(stat)
 		return FALSE
 	on = TRUE
+	canmove = TRUE
 	set_light(initial(light_range))
 	update_icon()
 	diag_hud_set_botstat()
@@ -115,6 +116,7 @@

 /mob/living/simple_animal/bot/proc/turn_off()
 	on = FALSE
+	canmove = FALSE
 	set_light(0)
 	bot_reset() //Resets an AI's call, should it exist.
 	update_icon()
@@ -129,7 +131,7 @@
 	Radio = new/obj/item/device/radio(src)
 	if(radio_key)
 		Radio.keyslot = new radio_key
-	Radio.subspace_transmission = 1
+	Radio.subspace_transmission = TRUE
 	Radio.canhear_range = 0 // anything greater will have the bot broadcast the channel as if it were saying it out loud.
 	Radio.recalculateChannels()

@@ -282,8 +282,8 @@
 	var/skin = null //Same as medbot, set to tox or ointment for the respective kits.
 	w_class = WEIGHT_CLASS_NORMAL

-/obj/item/firstaid_arm_assembly/New()
-	..()
+/obj/item/firstaid_arm_assembly/Initialize()
+	. = ..()
 	spawn(5)
 		if(skin)
 			add_overlay("kit_skin_[skin]")
@@ -360,8 +360,14 @@
 	..()

 /datum/action/innate/seek_master/Activate()
-	if(!SSticker.mode.eldergod)
-		the_construct.master = GLOB.blood_target
+	var/datum/antagonist/cult/C = owner.mind.has_antag_datum(/datum/antagonist/cult)
+	if(!C)
+		return
+	var/datum/objective/eldergod/summon_objective = locate() in C.cult_team.objectives
+
+	if(summon_objective.check_completion())
+		the_construct.master = C.cult_team.blood_target
+	
 	if(!the_construct.master)
 		to_chat(the_construct, "<span class='cultitalic'>You have no master to seek!</span>")
 		the_construct.seeking = FALSE
@@ -75,4 +75,4 @@
 	real_name = "Evil Kreb"
 	icon_state = "evilkreb"
 	icon_living = "evilkreb"
-	icon_dead = "evilkreb_dead"
+	icon_dead = "evilkreb_dead"
@@ -135,7 +135,7 @@
 		switch(remove_from)
 			if("head")
 				if(inventory_head)
-					inventory_head.loc = src.loc
+					inventory_head.forceMove(drop_location())
 					inventory_head = null
 					update_corgi_fluff()
 					regenerate_icons()
@@ -144,7 +144,7 @@
 					return
 			if("back")
 				if(inventory_back)
-					inventory_back.loc = src.loc
+					inventory_back.forceMove(drop_location())
 					inventory_back = null
 					update_corgi_fluff()
 					regenerate_icons()
@@ -15,8 +15,8 @@
 	icon_state = "drone_maint_hat"//yes reuse the _hat state.
 	var/drone_type = /mob/living/simple_animal/drone //Type of drone that will be spawned

-/obj/item/drone_shell/New()
-	..()
+/obj/item/drone_shell/Initialize()
+	. = ..()
 	var/area/A = get_area(src)
 	if(A)
 		notify_ghosts("A drone shell has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE)
@@ -67,7 +67,7 @@
 		L.dropItemToGround(src)

 	contents -= drone
-	drone.loc = get_turf(src)
+	drone.forceMove(drop_location())
 	drone.reset_perspective()
 	drone.setDir(SOUTH )//Looks better
 	drone.visible_message("<span class='warning'>[drone] uncurls!</span>")
@@ -153,7 +153,7 @@

 /mob/living/simple_animal/drone/cogscarab/Login()
 	..()
-	add_servant_of_ratvar(src, TRUE)
+	add_servant_of_ratvar(src, TRUE, GLOB.servants_active)
 	to_chat(src,"<b>You yourself are one of these servants, and will be able to utilize almost anything they can[GLOB.ratvar_awakens ? "":", <i>excluding a clockwork slab</i>"].</b>") // this can't go with flavortext because i'm assuming it requires them to be ratvar'd

 /mob/living/simple_animal/drone/cogscarab/binarycheck()
@@ -15,7 +15,6 @@
 /mob/living/simple_animal/drone/verb/toggle_light()
 	set category = "Drone"
 	set name = "Toggle drone light"
-	
 	if(stat == DEAD)
 		to_chat(src, "<span class='warning'>There's no light in your life... by that I mean you're dead.</span>")
 		return
@@ -40,7 +39,6 @@
 		var/msg = "<span class='boldnotice'>DRONE PING: [name]: [alert_s] priority alert in [A.name]!</span>"
 		alert_drones(msg)

-
 /mob/living/simple_animal/drone/verb/toggle_statics()
 	set name = "Change Vision Filter"
 	set desc = "Change the filter on the system used to remove non drone beings from your viewscreen."
@@ -66,7 +66,7 @@
 	src.visible_message("<span class='danger'>[src] gets an evil-looking gleam in [p_their()] eye.</span>")

 /mob/living/simple_animal/hostile/retaliate/goat/Move()
-	..()
+	. = ..()
 	if(!stat)
 		eat_plants()

@@ -110,3 +110,7 @@
 	eatverb = "devours"
 	list_reagents = list("nutriment" = 3, "vitamin" = 2)
 	foodtype = GROSS | MEAT | RAW
+	grind_results = list("blood" = 20, "liquidgibs" = 5)
+
+/obj/item/reagent_containers/food/snacks/deadmouse/on_grind()
+	reagents.clear_reagents()
@@ -9,17 +9,20 @@

 /mob/living/simple_animal/pet/attackby(obj/item/O, mob/user, params)
 	if(istype(O, /obj/item/clothing/neck/petcollar) && !pcollar)
-		var/obj/item/clothing/neck/petcollar/P = O
-		pcollar = P
-		collar = "[icon_state]collar"
-		pettag = "[icon_state]tag"
-		regenerate_icons()
-		to_chat(user, "<span class='notice'>You put the [P] around [src]'s neck.</span>")
-		if(P.tagname)
-			real_name = "\proper [P.tagname]"
-			name = real_name
-		qdel(P)
-		return
+		var/pet_icon_states = icon_states("[icon]")
+		if("[icon_state]collar" in pet_icon_states)
+			var/obj/item/clothing/neck/petcollar/P = O
+			pcollar = P
+			collar = "[icon_state]collar"
+			pettag = "[icon_state]tag"
+			regenerate_icons()
+			to_chat(user, "<span class='notice'>You put the [P] around [src]'s neck.</span>")
+			if(P.tagname)
+				real_name = "\proper [P.tagname]"
+				name = real_name
+			qdel(P)
+			return
+
 	if(istype(O, /obj/item/newspaper))
 		if(!stat)
 			user.visible_message("[user] baps [name] on the nose with the rolled up [O].")
@@ -51,3 +54,4 @@
 		add_overlay(collar)
 	if(pettag)
 		add_overlay(pettag)
+
@@ -57,7 +57,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	. = ..()

 /mob/living/simple_animal/hostile/guardian/med_hud_set_health()
-	if(!QDELETED(summoner))
+	if(summoner)
 		var/image/holder = hud_list[HEALTH_HUD]
 		holder.icon_state = "hud[RoundHealth(summoner)]"

@@ -39,4 +39,4 @@
 		var/mob/living/carbon/C = target
 		C.Knockdown(60)
 		C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
-				"<span class='userdanger'>\The [src] knocks you down!</span>")
+				"<span class='userdanger'>\The [src] knocks you down!</span>")
@@ -105,3 +105,4 @@
 	if(oogas >= rand(2,6))
 		playsound(src, "sound/creatures/gorilla.ogg", 200)
 		oogas = 0
+
@@ -28,9 +28,6 @@
 	var/ranged_message = "fires" //Fluff text for ranged mobs
 	var/ranged_cooldown = 0 //What the current cooldown on ranged attacks is, generally world.time + ranged_cooldown_time
 	var/ranged_cooldown_time = 30 //How long, in deciseconds, the cooldown of ranged attacks is
-	var/ranged_telegraph = "prepares to fire at *TARGET*!" //A message shown when the mob prepares to fire; use *TARGET* if you want to show the target's name
-	var/ranged_telegraph_sound //A sound played when the mob prepares to fire
-	var/ranged_telegraph_time = 0 //In deciseconds, how long between the telegraph and ranged shot
 	var/ranged_ignores_vision = FALSE //if it'll fire ranged attacks even if it lacks vision on its target, only works with environment smash
 	var/check_friendly_fire = 0 // Should the ranged mob check for friendlies when shooting
 	var/retreat_distance = null //If our mob runs from players when they're too close, set in tile distance. By default, mobs do not retreat.
@@ -231,9 +228,6 @@
 	if(!target || !CanAttack(target))
 		LoseTarget()
 		return 0
-	if(ismob(target.loc))
-		LoseTarget()
-		return 0
 	if(target in possible_targets)
 		if(target.z != z)
 			LoseTarget()
@@ -241,14 +235,7 @@
 		var/target_distance = get_dist(targets_from,target)
 		if(ranged) //We ranged? Shoot at em
 			if(!target.Adjacent(targets_from) && ranged_cooldown <= world.time) //But make sure they're not in range for a melee attack and our range attack is off cooldown
-				if(!ranged_telegraph_time || client)
-					OpenFire(target)
-				else
-					if(ranged_telegraph)
-						visible_message("<span class='danger'>[src] [replacetext(ranged_telegraph, "*TARGET*", "[target]")]</span>")
-					if(ranged_telegraph_sound)
-						playsound(src, ranged_telegraph_sound, 75, FALSE)
-					addtimer(CALLBACK(src, .proc/OpenFire, target), ranged_telegraph_time)
+				OpenFire(target)
 		if(!Process_Spacemove()) //Drifting
 			walk(src,0)
 			return 1
@@ -412,7 +399,6 @@ mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with mega
 			DestroyObjectsInDirection(dir)


-
 /mob/living/simple_animal/hostile/proc/EscapeConfinement()
 	if(buckled)
 		buckled.attack_animal(src)
@@ -283,9 +283,8 @@

 /mob/living/simple_animal/hostile/syndicate/mecha_pilot/Move(NewLoc,Dir=0,step_x=0,step_y=0)
 	if(mecha && loc == mecha)
-		mecha.relaymove(src, Dir)
-		return
-	..()
+		return mecha.relaymove(src, Dir)
+	return ..()


 /mob/living/simple_animal/hostile/syndicate/mecha_pilot/Goto(target, delay, minimum_distance)
@@ -114,7 +114,7 @@ Difficulty: Medium
 		if(L.stat == DEAD)
 			visible_message("<span class='danger'>[src] butchers [L]!</span>",
 			"<span class='userdanger'>You butcher [L], restoring your health!</span>")
-			if(!(z in GLOB.station_z_levels && !client)) //NPC monsters won't heal while on station
+			if(!(z in GLOB.station_z_levels) || client) //NPC monsters won't heal while on station
 				if(guidance)
 					adjustHealth(-L.maxHealth)
 				else
@@ -251,9 +251,9 @@ Difficulty: Medium

 	animate(src, transform = M, pixel_y = -6, dir = final_dir, time = 2, easing = EASE_IN|EASE_OUT)
 	sleep(5)
-	animate(src, color = list("#A7A19E", "#A7A19E", "#A7A19E", list(0, 0, 0)), time = 10, easing = EASE_IN, flags_1 = ANIMATION_PARALLEL)
+	animate(src, color = list("#A7A19E", "#A7A19E", "#A7A19E", list(0, 0, 0)), time = 10, easing = EASE_IN, flags = ANIMATION_PARALLEL)
 	sleep(4)
-	animate(src, alpha = 0, time = 6, easing = EASE_OUT, flags_1 = ANIMATION_PARALLEL)
+	animate(src, alpha = 0, time = 6, easing = EASE_OUT, flags = ANIMATION_PARALLEL)

 /obj/item/device/gps/internal/miner
 	icon_state = null
@@ -783,4 +783,4 @@ Difficulty: Very Hard
 #undef ACTIVATE_WEAPON
 #undef ACTIVATE_MAGIC

-#undef MEDAL_PREFIX
+#undef MEDAL_PREFIX
@@ -192,7 +192,7 @@ Difficulty: Medium
 			qdel(F)
 			if(stat == DEAD)
 				swooping &= ~SWOOP_DAMAGEABLE
-				animate(src, alpha = 255, transform = oldtransform, time = 0, flags_1 = ANIMATION_END_NOW) //reset immediately
+				animate(src, alpha = 255, transform = oldtransform, time = 0, flags = ANIMATION_END_NOW) //reset immediately
 			return
 	animate(src, alpha = 100, transform = matrix()*0.7, time = 7)
 	swooping |= SWOOP_INVULNERABLE
@@ -89,15 +89,11 @@
 	. = ..()
 	if(. && isliving(target))
 		var/mob/living/L = target
-		if(L.stat >= SOFT_CRIT)
-			if(vore_active == TRUE && L.devourable == TRUE)
-				dragon_feeding(src,L)
-			else if(L.stat == DEAD)
-				devour(L)
+		if(L.stat != DEAD)
+			if(!client && ranged && ranged_cooldown <= world.time)
+				OpenFire()
 		else
-			if(L.stat != DEAD)
-				if(!client && ranged && ranged_cooldown <= world.time)
-					OpenFire()
+			devour(L)

 /mob/living/simple_animal/hostile/megafauna/proc/devour(mob/living/L)
 	if(!L)
@@ -105,7 +101,7 @@
 	visible_message(
 		"<span class='danger'>[src] devours [L]!</span>",
 		"<span class='userdanger'>You feast on [L], restoring your health!</span>")
-	if(!(z in GLOB.station_z_levels && !client)) //NPC monsters won't heal while on station
+	if(!(z in GLOB.station_z_levels) || client) //NPC monsters won't heal while on station
 		adjustBruteLoss(-L.maxHealth/2)
 	L.gib()

@@ -14,9 +14,6 @@
 	ranged = 1
 	ranged_message = "stares"
 	ranged_cooldown_time = 30
-	ranged_telegraph = "gathers energy and stares at *TARGET*!"
-	ranged_telegraph_sound = 'sound/magic/magic_missile.ogg'
-	ranged_telegraph_time = 7
 	throw_message = "does nothing against the hard shell of"
 	vision_range = 2
 	speed = 3
@@ -74,11 +71,9 @@
 	melee_damage_lower = 15
 	melee_damage_upper = 15
 	attacktext = "impales"
-	ranged_telegraph = "fixates on *TARGET* as its eye shines blue!"
-	ranged_telegraph_sound = 'sound/magic/tail_swing.ogg'
-	ranged_telegraph_time = 5
 	a_intent = INTENT_HARM
 	speak_emote = list("telepathically cries")
+	attack_sound = 'sound/weapons/bladeslice.ogg'
 	stat_attack = UNCONSCIOUS
 	movement_type = FLYING
 	robust_searching = 1
@@ -123,7 +123,8 @@
 /obj/item/udder/gutlunch
 	name = "nutrient sac"

-/obj/item/udder/gutlunch/New()
+/obj/item/udder/gutlunch/Initialize()
+	. = ..()
 	reagents = new(50)
 	reagents.my_atom = src

@@ -64,3 +64,4 @@
 	projectiletype = /obj/item/projectile/beam/laser
 	loot = list(/obj/effect/mob_spawn/human/corpse/pirate/ranged,
 			/obj/item/gun/energy/laser)
+
@@ -12,8 +12,8 @@
 	var/growth_time = 1200


-/obj/structure/alien/resin/flower_bud_enemy/New()
-	..()
+/obj/structure/alien/resin/flower_bud_enemy/Initialize()
+	. = ..()
 	var/list/anchors = list()
 	anchors += locate(x-2,y+2,z)
 	anchors += locate(x+2,y+2,z)
@@ -127,7 +127,7 @@

 /mob/living/simple_animal/parrot/death(gibbed)
 	if(held_item)
-		held_item.loc = src.loc
+		held_item.forceMove(drop_location())
 		held_item = null
 	walk(src,0)

@@ -702,7 +702,7 @@
 				continue

 			held_item = I
-			I.loc = src
+			I.forceMove(src)
 			visible_message("[src] grabs [held_item]!", "<span class='notice'>You grab [held_item]!</span>", "<span class='italics'>You hear the sounds of wings flapping furiously.</span>")
 			return held_item

@@ -777,7 +777,7 @@
 	if(!drop_gently)
 		if(istype(held_item, /obj/item/grenade))
 			var/obj/item/grenade/G = held_item
-			G.loc = src.loc
+			G.forceMove(drop_location())
 			G.prime()
 			to_chat(src, "You let go of [held_item]!")
 			held_item = null
@@ -785,7 +785,7 @@

 	to_chat(src, "You drop [held_item].")

-	held_item.loc = src.loc
+	held_item.forceMove(drop_location())
 	held_item = null
 	return 1

@@ -801,7 +801,7 @@
 		for(var/atom/movable/AM in view(src,1))
 			for(var/perch_path in desired_perches)
 				if(istype(AM, perch_path))
-					src.loc = AM.loc
+					src.forceMove(AM.loc)
 					icon_state = icon_sit
 					return
 	to_chat(src, "<span class='warning'>There is no perch nearby to sit on!</span>")
@@ -838,7 +838,7 @@
 /mob/living/simple_animal/parrot/proc/perch_on_human(mob/living/carbon/human/H)
 	if(!H)
 		return
-	loc = get_turf(H)
+	forceMove(get_turf(H))
 	H.buckle_mob(src, force=1)
 	pixel_y = 9
 	pixel_x = pick(-8,8) //pick left or right shoulder
@@ -996,11 +996,12 @@
 		return
 	var/datum/disease/parrot_possession/P = new
 	P.parrot = src
-	loc = H
+	forceMove(H)
 	H.ForceContractDisease(P)
 	parrot_interest = null
 	H.visible_message("<span class='danger'>[src] dive bombs into [H]'s chest and vanishes!</span>", "<span class='userdanger'>[src] dive bombs into your chest, vanishing! This can't be good!</span>")

+
 /mob/living/simple_animal/parrot/clock_hawk
 	name = "clock hawk"
 	desc = "Cbyl jnaan penpxre! Fdhnnnjx!"