From 6ef1a5130cfc4385c42add55c64d242b2004f47c Mon Sep 17 00:00:00 2001 From: evilew Date: Thu, 9 Nov 2023 13:15:56 +0100 Subject: [PATCH] new shuttle loan event, small fixes - you can place 4 energy harvesters now - slight fix to fountain - new job titles - new shuttle loan event: Snack Attack --- GainStation13/code/obj/structure/fountain.dm | 2 +- code/modules/events/shuttle_loan.dm | 40 +++++++++++-------- code/modules/jobs/job_types/job_alt_titles.dm | 4 +- .../code/modules/power/energyharvester.dm | 4 +- 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/GainStation13/code/obj/structure/fountain.dm b/GainStation13/code/obj/structure/fountain.dm index db8f64dc..ab18274e 100644 --- a/GainStation13/code/obj/structure/fountain.dm +++ b/GainStation13/code/obj/structure/fountain.dm @@ -22,7 +22,7 @@ return if (ishuman(user) && user.has_dna()) user.cursed_fat = 1 - user.fattening_steps_left = 100 + user.fattening_steps_left += 100 icon_state = "empty" to_chat(user, "The glittering orange liquid disappears instantly as you touch it. You feel a strange, warm sensation inside, growing stronger the more you move...") curse_given = 1 diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index 208abfa5..f36973b4 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -6,7 +6,7 @@ #define PIZZA_DELIVERY 6 #define ITS_HIP_TO 7 #define MY_GOD_JC 8 -#define DELTA_CRATES 9 +#define SNACK_ATTACK 9 //GS13 - slime shuttle loan /datum/round_event_control/shuttle_loan name = "Shuttle Loan" @@ -24,7 +24,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, SNACK_ATTACK) /datum/round_event/shuttle_loan/announce(fake) SSshuttle.shuttle_loan = src @@ -57,10 +57,9 @@ message = "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." title = "CentCom Security Division" bonus_points = 45000 //If you mess up, people die and the shuttle gets turned into swiss cheese - if(DELTA_CRATES) - message = "Cargo: We have discovered a warehouse of DELTA locked crates, we cant store any more of them at CC can you take them for us?." - title = "CentCom Security Division" - bonus_points = 25000 //If you mess up, people die and the shuttle gets turned into swiss cheese + if(SNACK_ATTACK) //GS13 - basically just spawns some slimes and feeder mobs + message = "Cargo: Our science division took couple too many samples from one the local candy biohabitats. Would you care to dispose of the unneeded specimen?" + title = "CentCom Science Division" if(prob(50)) priority_announce(message, title) else @@ -94,8 +93,8 @@ SSshuttle.centcom_message += "Biohazard cleanup incoming." if(MY_GOD_JC) SSshuttle.centcom_message += "Live explosive ordnance incoming. Exercise extreme caution." - if(DELTA_CRATES) - SSshuttle.centcom_message += "DELTA Locked crates incoming. Exercise extreme caution." + if(SNACK_ATTACK) + SSshuttle.centcom_message += "Snack attack en route." /datum/round_event/shuttle_loan/tick() if(dispatched) @@ -240,14 +239,19 @@ else shuttle_spawns.Add(/obj/item/paper/fluff/cargo/bomb/allyourbase) - if(DELTA_CRATES) //Delta crates can stack on eacher, and are basicly a 1/3/5 bombs - for(var/i in 1 to 7) //7 seems fair - shuttle_spawns.Add(/obj/structure/closet/crate/secure/loot) + if(SNACK_ATTACK) //GS13 + shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime) + shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime) + shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast) + if(prob(50)) + shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast) - for(var/i in 1 to 5) - var/turf/T = pick_n_take(empty_shuttle_turfs) - new /obj/structure/spider/stickyweb(T) - new /obj/effect/decal/cleanable/ash(T) + shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco) + shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco) + shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco) + shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange) + shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange) + shuttle_spawns.Add(/obj/item/paper/fluff/chocoslime_research) var/false_positive = 0 while(shuttle_spawns.len && empty_shuttle_turfs.len) @@ -259,7 +263,9 @@ var/spawn_type = pick_n_take(shuttle_spawns) new spawn_type(T) -//items that appear only in shuttle loan events +/obj/item/paper/fluff/chocoslime_research + name = "Stained Research Papers" + info = "AUDIO LOG OF CHOCOLATE SLIME REPORT NO.3. Despite possessing no obvious combat capabilities, the chocolate slime can feed itself to its victim, possibly rupturing its st-- mmhfph- grhm... ...(AUDIO LOG END)." /obj/item/storage/belt/fannypack/yellow/bee_terrorist/PopulateContents() new /obj/item/grenade/plastic/c4 (src) @@ -292,4 +298,4 @@ #undef PIZZA_DELIVERY #undef ITS_HIP_TO #undef MY_GOD_JC -#undef DELTA_CRATES +#undef SNACK_ATTACK diff --git a/code/modules/jobs/job_types/job_alt_titles.dm b/code/modules/jobs/job_types/job_alt_titles.dm index 9b7d460a..b72fdf16 100644 --- a/code/modules/jobs/job_types/job_alt_titles.dm +++ b/code/modules/jobs/job_types/job_alt_titles.dm @@ -17,7 +17,7 @@ alt_titles = list("Civilian", "Morale Officer", "Stripper", "Off-Duty", "Escort", "Visitor", "Businessman", "Trader", "Entertainer", "Tourist") /datum/job/cook - alt_titles = list("Cook", "Culinary Artist", "Butcher", "Chef de partie", "Poissonier") + alt_titles = list("Cook", "Culinary Artist", "Butcher", "Chef de partie", "Poissonier", "Baker") /datum/job/hydro alt_titles = list("Gardener", "Herbalist", "Botanical Researcher", "Hydroponicist", "Farmer", "Beekeeper", "Vintner") @@ -29,7 +29,7 @@ alt_titles = list("Priest", "Priestess", "Bishop", "Prior", "Monk", "Nun", "Counselor") /datum/job/janitor - alt_titles = list("Custodian", "Sanitation Technician", "Maid") + alt_titles = list("Custodian", "Sanitation Technician", "Maid", "Trash Can", "Disposal Unit") /datum/job/lawyer alt_titles = list("Human Resources Agent", "Internal Affairs Agent", "Attorney") diff --git a/yogstation/code/modules/power/energyharvester.dm b/yogstation/code/modules/power/energyharvester.dm index fd92f850..e85e2def 100644 --- a/yogstation/code/modules/power/energyharvester.dm +++ b/yogstation/code/modules/power/energyharvester.dm @@ -1,7 +1,7 @@ GLOBAL_LIST_EMPTY(energy_harvesters) /obj/item/energy_harvester - desc = "A Device which upon connection to a node, will harvest the energy and send it to engineerless stations in return for credits, derived from a syndicate powersink model. The instructions say to never use more than 2 harvesters at a time." + desc = "A Device which upon connection to a node, will harvest the energy and send it to engineerless stations in return for credits, derived from a syndicate powersink model. The instructions say to never use more than 4 harvesters at a time." name = "Energy Harvesting Module" icon_state = "powersink0" icon = 'icons/obj/device.dmi' @@ -101,7 +101,7 @@ GLOBAL_LIST_EMPTY(energy_harvesters) gpstag = "Energy Harvester" /obj/item/energy_harvester/proc/overloadCheck() - if(LAZYLEN(GLOB.energy_harvesters) > 2) + if(LAZYLEN(GLOB.energy_harvesters) > 4) switch(overloadprog) if(0 to 25) if(prob(7))