Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290

modular_citadel/code/controllers/subsystem/shuttle.dm

@@ -1,7 +1,7 @@
 /datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end after 2 hours have passed.
 	if((world.realtime - SSshuttle.realtimeofstart) > auto_call && EMERGENCY_IDLE_OR_RECALLED) //2 hours
 		SSshuttle.emergency.request(silent = TRUE)
-		priority_announce("The shift has come to an end and the shuttle called. [seclevel2num(get_security_level()) == SEC_LEVEL_RED ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [emergency.timeLeft(600)] minutes.", null, 'sound/ai/shuttlecalled.ogg', "Priority")
+		priority_announce("The shift has come to an end and the shuttle called. [seclevel2num(get_security_level()) == SEC_LEVEL_RED ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [emergency.timeLeft(600)] minutes.", null, "shuttlecalled", "Priority")
 		log_game("Round time limit reached. Shuttle has been auto-called.")
 		message_admins("Round time limit reached. Shuttle called.")
 		emergencyNoRecall = TRUE

modular_citadel/code/datums/status_effects/chems.dm

@@ -499,7 +499,7 @@
 				cooldown += 1 //Cooldown doesn't process till status is done
 
 		else if(status == "charge")
-			ADD_TRAIT(owner, TRAIT_GOTTAGOFAST, "MKUltra")
+			owner.add_movespeed_modifier(MOVESPEED_ID_MKULTRA, update=TRUE, priority=100, multiplicative_slowdown=-2, blacklisted_movetypes=(FLYING|FLOATING))
 			status = "charged"
 			if(master.client?.prefs.lewdchem)
 				to_chat(owner, "<span class='notice'><i>Your [enthrallGender]'s order fills you with a burst of speed!</i></span>")
@@ -509,7 +509,7 @@
 		else if (status == "charged")
 			if (statusStrength < 0)
 				status = null
-				REMOVE_TRAIT(owner, TRAIT_GOTTAGOFAST, "MKUltra")
+				owner.remove_movespeed_modifier(MOVESPEED_ID_MKULTRA)
 				owner.Knockdown(50)
 				to_chat(owner, "<span class='notice'><i>Your body gives out as the adrenaline in your system runs out.</i></span>")
 			else

modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm

@@ -13,13 +13,23 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 	w_class = 3
 	hitsound = 'sound/weapons/bite.ogg'
 	sharpness = IS_SHARP
+	var/stamtostunconversion = 0.1 //Total stamloss gets multiplied by this value for the help intent hard stun. Resting adds an additional 2x multiplier on top. Keep this low or so help me god.
+	var/stuncooldown = 4 SECONDS //How long it takes before you're able to attempt to stun a target again
+	var/nextstuntime
+
+/obj/item/dogborg/jaws/examine(mob/user)
+	. = ..()
+	if(!CONFIG_GET(flag/weaken_secborg))
+		to_chat(user, "<span class='notice'>Use help intent to attempt to non-lethally incapacitate the target by latching on with your maw. This is more effective against exhausted and resting targets.</span>")
 
 /obj/item/dogborg/jaws/big
 	name = "combat jaws"
 	desc = "The jaws of the law. Very sharp."
 	icon_state = "jaws"
-	force = 10 //Lowered to match secborg. No reason it should be more than a secborg's baton.
+	force = 15 //Chomp chomp. Crew harm.
 	attack_verb = list("chomped", "bit", "ripped", "mauled", "enforced")
+	stamtostunconversion = 0.2 // 100*0.2*2=40. Stun's just long enough to slap on cuffs with click delay if the target is near hard stamcrit.
+	stuncooldown = 6 SECONDS
 
 
 /obj/item/dogborg/jaws/small
@@ -31,11 +41,36 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 	var/status = 0
 
 /obj/item/dogborg/jaws/attack(atom/A, mob/living/silicon/robot/user)
-	..()
-	user.do_attack_animation(A, ATTACK_EFFECT_BITE)
+	if(!istype(user))
+		return
+	if(!CONFIG_GET(flag/weaken_secborg) && user.a_intent != INTENT_HARM && istype(A, /mob/living))
+		if(A == user.pulling)
+			to_chat(user, "<span class='warning'>You already have [A] in your jaws.</span>")
+			return
+		if(nextstuntime >= world.time)
+			to_chat(user, "<span class='warning'>Your jaw servos are still recharging.</span>")
+			return
+		nextstuntime = world.time + stuncooldown
+		var/mob/living/M = A
+		var/cachedstam = M.getStaminaLoss()
+		var/totalstuntime = cachedstam * stamtostunconversion * (M.lying ? 2 : 1)
+		if(!M.resting)
+			M.Knockdown(cachedstam*2) //BORK BORK. GET DOWN.
+		M.Stun(totalstuntime)
+		user.do_attack_animation(A, ATTACK_EFFECT_BITE)
+		user.start_pulling(M, TRUE) //Yip yip. Come with.
+		user.changeNext_move(CLICK_CD_MELEE)
+		M.visible_message("<span class='danger'>[user] clamps [user.p_their()] [src] onto [M] and latches on!</span>", "<span class='userdanger'>[user] clamps [user.p_their()] [src] onto you and latches on!</span>")
+		if(totalstuntime >= 4 SECONDS)
+			playsound(usr, 'sound/effects/k9_jaw_strong.ogg', 75, FALSE, 2) //Wuff wuff. Big stun.
+		else
+			playsound(usr, 'sound/effects/k9_jaw_weak.ogg', 50, TRUE, -1) //Arf arf. Pls buff.
+	else
+		. = ..()
+		user.do_attack_animation(A, ATTACK_EFFECT_BITE)
 
 /obj/item/dogborg/jaws/small/attack_self(mob/user)
-	var/mob/living/silicon/robot.R = user
+	var/mob/living/silicon/robot/R = user
 	if(R.cell && R.cell.charge > 100)
 		if(R.emagged && status == 0)
 			name = "combat jaws"
@@ -43,14 +78,18 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 			desc = "The jaws of the law."
 			force = 12
 			attack_verb = list("chomped", "bit", "ripped", "mauled", "enforced")
+			stamtostunconversion = 0.15
+			stuncooldown = 5 SECONDS
 			status = 1
 			to_chat(user, "<span class='notice'>Your jaws are now [status ? "Combat" : "Pup'd"].</span>")
 		else
 			name = "puppy jaws"
 			icon_state = "smalljaws"
 			desc = "The jaws of a small dog."
-			force = 5
+			force = initial(force)
 			attack_verb = list("nibbled", "bit", "gnawed", "chomped", "nommed")
+			stamtostunconversion = initial(stamtostunconversion)
+			stuncooldown = initial(stuncooldown)
 			status = 0
 			if(R.emagged)
 				to_chat(user, "<span class='notice'>Your jaws are now [status ? "Combat" : "Pup'd"].</span>")
@@ -167,7 +206,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 	item_flags |= NOBLUDGEON //No more attack messages
 
 /obj/item/soap/tongue/attack_self(mob/user)
-	var/mob/living/silicon/robot.R = user
+	var/mob/living/silicon/robot/R = user
 	if(R.cell && R.cell.charge > 100)
 		if(R.emagged && status == 0)
 			status = !status
@@ -187,7 +226,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 	update_icon()
 
 /obj/item/soap/tongue/afterattack(atom/target, mob/user, proximity)
-	var/mob/living/silicon/robot.R = user
+	var/mob/living/silicon/robot/R = user
 	if(!proximity || !check_allowed_items(target))
 		return
 	if(R.client && (target in R.client.screen))
@@ -307,8 +346,10 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 /mob/living/silicon/robot
 	var/leaping = 0
 	var/pounce_cooldown = 0
-	var/pounce_cooldown_time = 20 //Buffed to counter balance changes
-	var/pounce_spoolup = 1
+	var/pounce_cooldown_time = 30 //Time in deciseconds between pounces
+	var/pounce_spoolup = 5 //Time in deciseconds for the pounce to happen after clicking
+	var/pounce_stamloss_cap = 120 //How much staminaloss pounces alone are capable of bringing a spaceman to
+	var/pounce_stamloss = 80 //Base staminaloss value of the pounce
 	var/leap_at
 	var/disabler
 	var/laser
@@ -320,13 +361,12 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 
 /obj/item/dogborg/pounce/afterattack(atom/A, mob/user)
 	var/mob/living/silicon/robot/R = user
-	if(R && !R.pounce_cooldown)
-		R.pounce_cooldown = !R.pounce_cooldown
+	if(R && (world.time >= R.pounce_cooldown))
+		R.pounce_cooldown = world.time + R.pounce_cooldown_time
 		to_chat(R, "<span class ='warning'>Your targeting systems lock on to [A]...</span>")
+		playsound(R, 'sound/effects/servostep.ogg', 100, TRUE)
 		addtimer(CALLBACK(R, /mob/living/silicon/robot.proc/leap_at, A), R.pounce_spoolup)
-		spawn(R.pounce_cooldown_time)
-			R.pounce_cooldown = !R.pounce_cooldown
-	else if(R && R.pounce_cooldown)
+	else if(R && (world.time < R.pounce_cooldown))
 		to_chat(R, "<span class='danger'>Your leg actuators are still recharging!</span>")
 
 /mob/living/silicon/robot/proc/leap_at(atom/A)
@@ -349,6 +389,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 		update_icons()
 		throw_at(A, MAX_K9_LEAP_DIST, 1, spin=0, diagonals_first = 1)
 		cell.use(750) //Less than a stunbaton since stunbatons hit everytime.
+		playsound(src, 'sound/effects/stealthoff.ogg', 25, TRUE, -1)
 		weather_immunities -= "lava"
 
 /mob/living/silicon/robot/throw_impact(atom/A)
@@ -366,7 +407,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 					blocked = 1
 			if(!blocked)
 				L.visible_message("<span class ='danger'>[src] pounces on [L]!</span>", "<span class ='userdanger'>[src] pounces on you!</span>")
-				L.Knockdown(iscarbon(L) ? 225 : 45) // Temporary. If someone could rework how dogborg pounces work to accomodate for combat changes, that'd be nice.
+				L.Knockdown(iscarbon(L) ? 60 : 45, override_stamdmg = CLAMP(pounce_stamloss, 0, pounce_stamloss_cap-L.getStaminaLoss())) // Temporary. If someone could rework how dogborg pounces work to accomodate for combat changes, that'd be nice.
 				playsound(src, 'sound/weapons/Egloves.ogg', 50, 1)
 				sleep(2)//Runtime prevention (infinite bump() calls on hulks)
 				step_towards(src,L)

modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -53,6 +53,7 @@
 	has_snowflake_deadsprite = TRUE
 	dogborg = TRUE
 	cyborg_pixel_offset = -16
+	borghealth = 80
 
 /obj/item/robot_module/k9/do_transform_animation()
 	..()

modular_citadel/code/modules/mob/living/simple_animal/banana_spider.dm

@@ -1,151 +0,0 @@
-/obj/item/seeds/banana/Initialize()
-	. = ..()
-	mutatelist += /obj/item/seeds/banana/exotic_banana
-
-
-/obj/item/seeds/banana/exotic_banana
-	name = "pack of exotic banana seeds"
-	desc = "They're seeds that grow into banana trees. However, those bananas might be alive."
-	icon = 'modular_citadel/icons/mob/BananaSpider.dmi'
-	icon_state = "seed_ExoticBanana"
-	species = "banana"
-	plantname = "Exotic Banana Tree"
-	product = /obj/item/reagent_containers/food/snacks/grown/banana/banana_spider_spawnable
-	growing_icon = 'modular_citadel/icons/mob/BananaSpider.dmi'
-	icon_dead = "banana-dead"
-	mutatelist = list()
-	genes = list(/datum/plant_gene/trait/slip)
-	reagents_add = list("banana" = 0.1, "potassium" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
-
-
-/obj/item/reagent_containers/food/snacks/grown/banana/banana_spider_spawnable
-	seed = /obj/item/seeds/banana/exotic_banana
-	name = "banana spider"
-	desc = "You do not know what it is, but you can bet the clown would love it."
-	icon = 'modular_citadel/icons/mob/BananaSpider.dmi'
-	icon_state = "banana"
-	item_state = "banana"
-	filling_color = "#FFFF00"
-	list_reagents = list("nutriment" = 3, "vitamin" = 2)
-	foodtype = GROSS | MEAT | RAW | FRUIT
-	grind_results = list("blood" = 20, "liquidgibs" = 5)
-	juice_results = list("banana" = 0)
-	var/awakening = 0
-
-
-/obj/item/reagent_containers/food/snacks/grown/banana/banana_spider_spawnable/attack_self(mob/user)
-	if(awakening || isspaceturf(user.loc))
-		return
-	to_chat(user, "<span class='notice'>You decide to wake up the banana spider...</span>")
-	awakening = 1
-
-	spawn(30)
-		if(!QDELETED(src))
-			var/mob/living/simple_animal/banana_spider/S = new /mob/living/simple_animal/banana_spider(get_turf(src.loc))
-			S.speed += round(10 / seed.potency)
-			S.visible_message("<span class='notice'>The banana spider chitters as it stretches its legs.</span>")
-			qdel(src)
-
-
-/mob/living/simple_animal/banana_spider
-	icon = 'modular_citadel/icons/mob/BananaSpider.dmi'
-	name = "banana spider"
-	desc = "What the fuck is this abomination?"
-	icon_state = "banana"
-	icon_dead = "banana_peel"
-	health = 1
-	maxHealth = 1
-	turns_per_move = 5			//this isn't player speed =|
-	speed = 2				//this is player speed
-	loot = list(/obj/item/reagent_containers/food/snacks/deadbanana_spider)
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	minbodytemp = 270
-	maxbodytemp = INFINITY
-	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
-	mob_size = MOB_SIZE_TINY
-	response_help  = "pokes"
-	response_disarm = "shoos"
-	response_harm   = "splats"
-	speak_emote = list("chitters")
-	mouse_opacity = 2
-	density = TRUE
-	ventcrawler = VENTCRAWLER_ALWAYS
-	gold_core_spawnable = FRIENDLY_SPAWN
-	verb_say = "chitters"
-	verb_ask = "chitters inquisitively"
-	verb_exclaim = "chitters loudly"
-	verb_yell = "chitters loudly"
-	var/squish_chance = 50
-	var/projectile_density = TRUE		//griffons get shot
-	del_on_death = TRUE
-
-/mob/living/simple_animal/banana_spider/Initialize()
-	. = ..()
-	var/area/A = get_area(src)
-	if(A)
-		notify_ghosts("A banana spider has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE)
-
-/mob/living/simple_animal/banana_spider/attack_ghost(mob/user)
-	if(key)			//please stop using src. without a good reason.
-		return
-	if(CONFIG_GET(flag/use_age_restriction_for_jobs))
-		if(!isnum(user.client.player_age))
-			return
-	if(!SSticker.mode)
-		to_chat(user, "Can't become a banana spider before the game has started.")
-		return
-	var/be_spider = alert("Become a banana spider? (Warning, You can no longer be cloned!)",,"Yes","No")
-	if(be_spider == "No" || QDELETED(src) || !isobserver(user))
-		return
-	sentience_act()
-	user.transfer_ckey(src, FALSE)
-	density = TRUE
-
-/mob/living/simple_animal/banana_spider/ComponentInitialize()
-	. = ..()
-	AddComponent(/datum/component/slippery, 40)
-
-/mob/living/simple_animal/banana_spider/Crossed(atom/movable/AM)		//no /var in proc headers
-	. = ..()
-	if(istype(AM, /obj/item/projectile) && projectile_density)		//forced projectile density
-		var/obj/item/projectile/P = AM
-		P.Bump(src)
-	if(ismob(AM))
-		if(isliving(AM))
-			var/mob/living/A = AM
-			if(A.mob_size > MOB_SIZE_SMALL && !(A.movement_type & FLYING))
-				if(prob(squish_chance))
-					A.visible_message("<span class='notice'>[A] squashed [src].</span>", "<span class='notice'>You squashed [src] under your weight as you fell.</span>")
-					adjustBruteLoss(1)
-				else
-					visible_message("<span class='notice'>[src] avoids getting crushed.</span>")
-	else
-		if(isstructure(AM))
-			if(prob(squish_chance))
-				AM.visible_message("<span class='notice'>[src] was crushed under [AM]'s weight as they fell.</span>")
-				adjustBruteLoss(1)
-			else
-				visible_message("<span class='notice'>[src] avoids getting crushed.</span>")
-
-/mob/living/simple_animal/banana_spider/ex_act()
-	return
-
-/mob/living/simple_animal/banana_spider/start_pulling()
-	return FALSE			//No.
-
-/obj/item/reagent_containers/food/snacks/deadbanana_spider
-	name = "dead banana spider"
-	desc = "Thank god it's gone...but it does look slippery."
-	icon = 'modular_citadel/icons/mob/BananaSpider.dmi'
-	icon_state = "banana_peel"
-	bitesize = 3
-	eatverb = "devours"
-	list_reagents = list("nutriment" = 3, "vitamin" = 2)
-	foodtype = GROSS | MEAT | RAW
-	grind_results = list("blood" = 20, "liquidgibs" = 5)
-	juice_results = list("banana" = 0)
-
-
-/obj/item/reagent_containers/food/snacks/deadbanana_spider/Initialize()
-	. = ..()
-	AddComponent(/datum/component/slippery, 20)

modular_citadel/code/modules/mob/living/simple_animal/kiwi.dm

@@ -1,134 +0,0 @@
-/mob/living/simple_animal/kiwi
-	name = "space kiwi"
-	desc = "Exposure to low gravity made them grow larger."
-	gender = FEMALE
-	icon = 'modular_citadel/icons/mob/kiwi.dmi'
-	icon_state = "kiwi"
-	icon_living = "kiwi"
-	icon_dead = "dead"
-	speak = list("Chirp!","Cheep cheep chirp!!","Cheep.")
-	speak_emote = list("chirps","trills")
-	emote_hear = list("chirps.")
-	emote_see = list("pecks at the ground.","jumps in place.")
-	density = FALSE
-	speak_chance = 2
-	turns_per_move = 3
-	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 3)
-	var/egg_type = /obj/item/reagent_containers/food/snacks/egg/kiwiEgg
-	var/food_type = /obj/item/reagent_containers/food/snacks/grown/wheat
-	response_help  = "pets"
-	response_disarm = "gently pushes aside"
-	response_harm   = "kicks"
-	attacktext = "kicks"
-	health = 25
-	maxHealth = 25
-	ventcrawler = VENTCRAWLER_ALWAYS
-	var/eggsleft = 0
-	var/eggsFertile = TRUE
-	pass_flags = PASSTABLE | PASSMOB
-	mob_size = MOB_SIZE_SMALL
-	var/list/feedMessages = list("It chirps happily.","It chirps happily.")
-	var/list/layMessage = list("lays an egg.","squats down and croons.","begins making a huge racket.","begins chirping raucously.")
-	gold_core_spawnable = FRIENDLY_SPAWN
-	var/static/kiwi_count = 0
-
-/mob/living/simple_animal/kiwi/Destroy()
-	--kiwi_count
-	return ..()
-
-
-/mob/living/simple_animal/kiwi/Initialize()
-	. = ..()
-	++kiwi_count
-
-
-/mob/living/simple_animal/kiwi/Life()
-	. =..()
-	if(!.)
-		return
-	if((!stat && prob(3) && eggsleft > 0) && egg_type)
-		visible_message("[src] [pick(layMessage)]")
-		eggsleft--
-		var/obj/item/E = new egg_type(get_turf(src))
-		E.pixel_x = rand(-6,6)
-		E.pixel_y = rand(-6,6)
-		if(eggsFertile)
-			if(kiwi_count < MAX_CHICKENS && prob(25))
-				START_PROCESSING(SSobj, E)
-
-/obj/item/reagent_containers/food/snacks/egg/kiwiEgg/process()
-	if(isturf(loc))
-		amount_grown += rand(1,2)
-		if(amount_grown >= 100)
-			visible_message("[src] hatches with a quiet cracking sound.")
-			new /mob/living/simple_animal/babyKiwi(get_turf(src))
-			STOP_PROCESSING(SSobj, src)
-			qdel(src)
-	else
-		STOP_PROCESSING(SSobj, src)
-
-
-/mob/living/simple_animal/kiwi/attackby(obj/item/O, mob/user, params)
-	if(istype(O, food_type)) //feedin' dem kiwis
-		if(!stat && eggsleft < 8)
-			var/feedmsg = "[user] feeds [O] to [name]! [pick(feedMessages)]"
-			user.visible_message(feedmsg)
-			qdel(O)
-			eggsleft += rand(1, 4)
-		else
-			to_chat(user, "<span class='warning'>[name] doesn't seem hungry!</span>")
-	else
-		..()
-
-
-/mob/living/simple_animal/babyKiwi
-	name = "baby space kiwi"
-	desc = "So huggable."
-	icon = 'modular_citadel/icons/mob/kiwi.dmi'
-	icon_state = "babyKiwi"
-	icon_living = "babyKiwi"
-	icon_dead = "deadBaby"
-	icon_gib = "chick_gib"
-	gender = FEMALE
-	speak = list("Cherp.","Cherp?","Chirrup.","Cheep!")
-	speak_emote = list("chirps")
-	emote_hear = list("chirps.")
-	emote_see = list("pecks at the ground.","Happily bounces in place.")
-	density = FALSE
-	speak_chance = 2
-	turns_per_move = 2
-	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2)
-	response_help  = "pets"
-	response_disarm = "gently pushes aside"
-	response_harm   = "kicks"
-	attacktext = "kicks"
-	health = 10
-	maxHealth = 10
-	ventcrawler = VENTCRAWLER_ALWAYS
-	var/amount_grown = 0
-	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
-	mob_size = MOB_SIZE_TINY
-	gold_core_spawnable = FRIENDLY_SPAWN
-
-/mob/living/simple_animal/babyKiwi/Initialize()
-	. = ..()
-	pixel_x = rand(-6, 6)
-	pixel_y = rand(0, 10)
-
-/mob/living/simple_animal/babyKiwi/Life()
-	. =..()
-	if(!.)
-		return
-	if(!stat && !ckey)
-		amount_grown += rand(1,2)
-		if(amount_grown >= 100)
-			new /mob/living/simple_animal/kiwi(src.loc)
-			qdel(src)
-
-
-/obj/item/reagent_containers/food/snacks/egg/kiwiEgg
-	name = "kiwi egg"
-	icon = 'modular_citadel/icons/mob/kiwi.dmi'
-	desc = "A slightly bigger egg!"
-	icon_state = "egg"
-