Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion code/modules/events/shuttle_loan.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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.")
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -227,6 +234,17 @@
else
shuttle_spawns.Add(/obj/item/paper/fluff/cargo/bomb/allyourbase)

if(PETA)
for(var/i in 1 to 20)
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)
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/simple_animal/hostile/bear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/simple_animal/hostile/carp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/simple_animal/hostile/feral_cat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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")
3 changes: 3 additions & 0 deletions code/modules/mob/living/simple_animal/hostile/rat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down