From 63245d7b76e37b1884a658bf1492373eee5359fb Mon Sep 17 00:00:00 2001 From: Redmoogle Date: Wed, 22 Jun 2022 19:01:00 -0400 Subject: [PATCH 1/2] PETA --- code/modules/events/shuttle_loan.dm | 20 ++++++++++++++++++- .../mob/living/simple_animal/hostile/bear.dm | 3 +++ .../mob/living/simple_animal/hostile/carp.dm | 3 +++ .../living/simple_animal/hostile/feral_cat.dm | 3 +++ .../mob/living/simple_animal/hostile/rat.dm | 3 +++ 5 files changed, 31 insertions(+), 1 deletion(-) diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index cab2d87fab75..573f041bee5c 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -6,6 +6,7 @@ #define PIZZA_DELIVERY 6 #define ITS_HIP_TO 7 #define MY_GOD_JC 8 +#define PETA 9 /datum/round_event_control/shuttle_loan @@ -24,7 +25,7 @@ var/thanks_msg = "The cargo shuttle should return in five minutes. Have some supply points for your trouble." /datum/round_event/shuttle_loan/setup() - dispatch_type = pick(HIJACK_SYNDIE, RUSKY_PARTY, SPIDER_GIFT, DEPARTMENT_RESUPPLY, ANTIDOTE_NEEDED, PIZZA_DELIVERY, ITS_HIP_TO, MY_GOD_JC) + dispatch_type = pick(HIJACK_SYNDIE, RUSKY_PARTY, SPIDER_GIFT, DEPARTMENT_RESUPPLY, ANTIDOTE_NEEDED, PIZZA_DELIVERY, ITS_HIP_TO, MY_GOD_JC, PETA) /datum/round_event/shuttle_loan/announce(fake) SSshuttle.shuttle_loan = src @@ -52,6 +53,10 @@ priority_announce("Cargo: We have discovered an active Syndicate bomb near our VIP shuttle's fuel lines. If you feel up to the task, we will pay you for defusing it.", "CentCom Security Division") thanks_msg = "Live explosive ordnance incoming via supply shuttle. Evacuating cargo bay is recommended." bonus_points = 45000 //If you mess up, people die and the shuttle gets turned into swiss cheese + if(PETA) + priority_announce("Cargo: A group calling themselves PETA whatever that means is asking to inspect your station. Do you want to check it out?", "CentCom Diplomatic Corps") + thanks_msg = "Inspectors Incoming." + bonus_points = 10000 // Funny hostile mobs /datum/round_event/shuttle_loan/proc/loan_shuttle() priority_announce(thanks_msg, "Cargo shuttle commandeered by CentCom.") @@ -83,6 +88,8 @@ SSshuttle.centcom_message += "Biohazard cleanup incoming." if(MY_GOD_JC) SSshuttle.centcom_message += "Live explosive ordnance incoming. Exercise extreme caution." + if(PETA) + SSshuttle.centcom_message += "Inspectors Incoming." /datum/round_event/shuttle_loan/tick() if(dispatched) @@ -227,6 +234,17 @@ else shuttle_spawns.Add(/obj/item/paper/fluff/cargo/bomb/allyourbase) + if(PETA) + for(var/i in 1 to 10) + if(prob(50)) + shuttle_spawns.Add(/mob/living/simple_animal/hostile/rat/loan) + if(prob(40)) + shuttle_spawns.Add(/mob/living/simple_animal/hostile/carp/loan) + if(prob(20)) + shuttle_spawns.Add(/mob/living/simple_animal/hostile/bear/loan) + if(prob(30)) + shuttle_spawns.Add(/mob/living/simple_animal/hostile/feral_cat/loan) + var/false_positive = 0 while(shuttle_spawns.len && empty_shuttle_turfs.len) var/turf/T = pick_n_take(empty_shuttle_turfs) diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 6c2a9bdecfc9..cf41c87b1782 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -44,6 +44,9 @@ do_footstep = TRUE +/mob/living/simple_animal/hostile/bear/loan + faction = list("hostile") + //SPACE BEARS! SQUEEEEEEEE~ OW! FUCK! IT BIT MY HAND OFF!! /mob/living/simple_animal/hostile/bear/Hudson name = "Hudson" diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 5a5bb3f09a5a..fa33c574058b 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -62,6 +62,9 @@ "silver" = "#fdfbf3", \ ) +/mob/living/simple_animal/hostile/carp/loan + faction = list("hostile") + /mob/living/simple_animal/hostile/carp/Initialize(mapload) . = ..() carp_randomify(rarechance) diff --git a/code/modules/mob/living/simple_animal/hostile/feral_cat.dm b/code/modules/mob/living/simple_animal/hostile/feral_cat.dm index 4067d5520898..0907140b0508 100644 --- a/code/modules/mob/living/simple_animal/hostile/feral_cat.dm +++ b/code/modules/mob/living/simple_animal/hostile/feral_cat.dm @@ -26,3 +26,6 @@ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) unsuitable_atmos_damage = 5 pass_flags = PASSTABLE + +/mob/living/simple_animal/hostile/feral_cat/loan + faction = list("hostile") diff --git a/code/modules/mob/living/simple_animal/hostile/rat.dm b/code/modules/mob/living/simple_animal/hostile/rat.dm index 3a36252cdc54..c2363ec25c44 100644 --- a/code/modules/mob/living/simple_animal/hostile/rat.dm +++ b/code/modules/mob/living/simple_animal/hostile/rat.dm @@ -26,6 +26,9 @@ faction = list("rat") var/body_color +/mob/living/simple_animal/hostile/rat/loan + faction = list("hostile") + /mob/living/simple_animal/hostile/rat/Initialize() . = ..() if(mind) From ad76fe6cbde802685190ffc35c9e92672ba5704d Mon Sep 17 00:00:00 2001 From: Redmoogle Date: Fri, 24 Jun 2022 13:49:13 -0400 Subject: [PATCH 2/2] Vibe check --- code/modules/events/shuttle_loan.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index 573f041bee5c..5f96b5b052f8 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -235,7 +235,7 @@ shuttle_spawns.Add(/obj/item/paper/fluff/cargo/bomb/allyourbase) if(PETA) - for(var/i in 1 to 10) + for(var/i in 1 to 20) if(prob(50)) shuttle_spawns.Add(/mob/living/simple_animal/hostile/rat/loan) if(prob(40))