From 80aa3648a631d3c1de3620abab6993826bb670f4 Mon Sep 17 00:00:00 2001 From: Geeves Date: Fri, 23 Oct 2020 14:15:34 +0200 Subject: [PATCH] Trash Piles (#10257) --- aurorastation.dme | 1 + code/game/objects/structures/trash_pile.dm | 222 ++++++++++++++++++ .../projectiles/guns/projectile/improvised.dm | 3 + html/changelogs/geeves-trash_piles.yml | 6 + icons/obj/trash_piles.dmi | Bin 0 -> 9367 bytes maps/aurora/aurora-3_sublevel.dmm | 14 +- maps/aurora/aurora-4_mainlevel.dmm | 89 +++++-- maps/aurora/aurora-5_interstitial.dmm | 11 +- maps/aurora/aurora-6_surface.dmm | 15 +- 9 files changed, 327 insertions(+), 34 deletions(-) create mode 100644 code/game/objects/structures/trash_pile.dm create mode 100644 html/changelogs/geeves-trash_piles.yml create mode 100644 icons/obj/trash_piles.dmi diff --git a/aurorastation.dme b/aurorastation.dme index 0742a4a3b09..9308f1b5c9b 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1027,6 +1027,7 @@ #include "code\game\objects\structures\therapy.dm" #include "code\game\objects\structures\tranqcabinet.dm" #include "code\game\objects\structures\transit_tubes.dm" +#include "code\game\objects\structures\trash_pile.dm" #include "code\game\objects\structures\under_wardrobe.dm" #include "code\game\objects\structures\warp_drive.dm" #include "code\game\objects\structures\watercloset.dm" diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm new file mode 100644 index 00000000000..79ea0029347 --- /dev/null +++ b/code/game/objects/structures/trash_pile.dm @@ -0,0 +1,222 @@ +/obj/structure/trash_pile + name = "trash pile" + desc = "A heap of garbage, but maybe there's something interesting inside?" + icon = 'icons/obj/trash_piles.dmi' + icon_state = "randompile" + anchored = TRUE + + var/list/searched_by // Characters that have searched this trashpile, with values of searched time. + var/mob/living/hider // Someone or something hiding inside our pile + + var/chance_alpha = 79 // Alpha list is junk items and normal random stuff. + var/chance_beta = 20 // Beta list is actually maybe some useful illegal items. If it's not alpha or gamma, it's beta. + var/chance_gamma = 1 // Gamma list is unique items only, and will only spawn one of each. This is a sub-chance of beta chance. + + //These are types that can only spawn once, and then will be removed from this list. + //Alpha and beta lists are in their respective procs. + var/list/unique_gamma = list( + /obj/item/hand_tele, + /obj/item/rfd/construction, + /obj/item/reagent_containers/hypospray/cmo, + /obj/item/gun/projectile/improvised_handgun/loaded, + /obj/item/gun/launcher/crossbow, + /obj/item/gun/launcher/pneumatic + ) + +/obj/structure/trash_pile/Initialize() + . = ..() + if(icon_state == initial(icon_state)) + icon_state = pick(icon_states(icon) - icon_state) + +/obj/structure/trash_pile/MouseDrop_T(obj/structure/trash_pile/target, mob/user) + if(!Adjacent(user) || use_check_and_message(user)) + return + user.visible_message("[user] starts climbing into \the [src]...", SPAN_NOTICE("You start climbing into \the [src]...")) + if(do_after(user, 3 SECONDS)) + user.visible_message("[user] climbs into \the [src], disappearing from sight.", SPAN_NOTICE("You climb into \the [src], finally finding a good spot to hide.")) + user.forceMove(src) + hider = user + if(ishuman(user) && prob(5)) + var/mob/living/carbon/human/H = user + H.take_overall_damage(5, 0, DAM_SHARP, src) + to_chat(user, SPAN_WARNING("You cut yourself while climbing into \the [src]!")) + +/obj/structure/trash_pile/relaymove(mob/user) + if(user.stat || user.resting) // don't care too much about use_check here, checking these will suffice + return + user.forceMove(get_turf(src)) + if(user == hider) + hider = null + +/obj/structure/trash_pile/attack_hand(mob/user) + //Human mob + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(H.a_intent == I_HURT) + H.visible_message("[user] starts taking \the [src] apart...", SPAN_NOTICE("You start taking \the [src] apart...")) + if(do_after(user, 2 MINUTES)) + H.visible_message("[user] takes \the [src] apart.", SPAN_NOTICE("You takes \the [src] apart.")) + for(var/i = 1 to 5) + var/obj/item/I = give_item() + I.forceMove(get_turf(src)) + eject_hider(100, user) + qdel(src) + return + H.visible_message("[user] starts searching through \the [src]...", SPAN_NOTICE("You start searching through \the [src]...")) + if(hider) + to_chat(hider, SPAN_WARNING("[user] is searching the trash pile you're in!")) + //Do the searching + if(do_after(user, rand(4 SECONDS, 6 SECONDS))) + var/unique_string = "[user.ckey]-[user.real_name]" + //If there was a hider, chance to reveal them + if(eject_hider(50, user)) + return + + // This person already searched through this pile + else if(unique_string in searched_by) + to_chat(H, SPAN_WARNING("You already searched through \the [src], you find nothing of value, though someone else might.")) + + //You found an item! + else + var/obj/item/I = give_item() + //We either have an item to hand over or we don't, at this point! + if(I) + LAZYADD(searched_by, unique_string) + H.put_in_hands(I) + to_chat(H, SPAN_NOTICE("You found \a [I]!")) + else + return ..() + +/obj/structure/trash_pile/proc/eject_hider(var/chance, var/mob/user) + if(hider && prob(chance)) + to_chat(hider, SPAN_DANGER("You've been discovered!")) + hider.forceMove(get_turf(src)) + to_chat(user, SPAN_DANGER("You discover that \the [hider] was hiding inside \the [src]!")) + hider = null + return TRUE + return FALSE + +/obj/structure/trash_pile/proc/give_item() + var/obj/item/I + var/luck = rand(1, 100) + if(luck <= chance_alpha) + I = produce_alpha_item() + else if(luck <= chance_alpha + chance_beta) + I = produce_beta_item() + else if(luck <= chance_alpha + chance_beta + chance_gamma) + I = produce_gamma_item() + return I + +//Random lists +/obj/structure/trash_pile/proc/produce_alpha_item() + var/list/possible_path = list( + /obj/item/clothing/gloves/black = 5, + /obj/item/clothing/gloves/white = 5, + /obj/item/storage/backpack = 5, + /obj/item/storage/backpack/satchel = 5, + /obj/item/storage/box = 5, + /obj/item/clothing/head/hardhat = 4, + /obj/item/clothing/mask/breath = 4, + /obj/item/clothing/shoes/black = 4, + /obj/item/clothing/shoes/laceup = 4, + /obj/item/clothing/shoes/laceup/brown = 4, + /obj/item/clothing/suit/storage/hazardvest = 4, + /obj/item/clothing/under/color/grey = 4, + /obj/item/clothing/suit/caution = 4, + /obj/item/cell/device = 4, + /obj/item/reagent_containers/food/snacks/liquidfood = 4, + /obj/item/spacecash/c1 = 4, + /obj/item/storage/backpack/satchel = 4, + /obj/item/storage/briefcase = 4, + /obj/item/clothing/accessory/storage/webbing = 3, + /obj/item/clothing/gloves/botanic_leather = 3, + /obj/item/clothing/head/hardhat/red = 3, + /obj/item/clothing/mask/gas = 3, + /obj/item/clothing/suit/apron = 3, + /obj/item/clothing/suit/storage/toggle/bomber = 3, + /obj/item/clothing/suit/storage/toggle/brown_jacket = 3, + /obj/item/clothing/suit/storage/hooded/wintercoat/hoodie = 3, + /obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/short = 3, + /obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/sleeveless = 3, + /obj/item/storage/box/fancy/cigarettes = 3, + /obj/item/storage/box/fancy/cigarettes/acmeco = 3, + /obj/item/storage/box/fancy/cigarettes/blank = 3, + /obj/item/device/radio/headset = 3, + /obj/item/camera_assembly = 3, + /obj/item/clothing/head/cone = 3, + /obj/item/cell/high = 3, + /obj/item/spacecash/c10 = 3, + /obj/item/spacecash/c20 = 3, + /obj/item/storage/backpack/duffel = 3, + /obj/item/storage/box/donkpockets = 3, + /obj/item/storage/box/mousetraps = 3, + /obj/item/storage/wallet = 3, + /obj/item/clothing/gloves/fyellow = 2, + /obj/item/clothing/gloves/latex = 2, + /obj/item/clothing/head/welding = 2, + /obj/item/clothing/mask/gas/alt = 2, + /obj/item/clothing/shoes/galoshes = 2, + /obj/item/clothing/under/pants/camo = 2, + /obj/item/clothing/under/syndicate/tacticool = 2, + /obj/item/device/camera = 2, + /obj/item/device/flashlight/flare = 2, + /obj/item/device/flashlight/flare/glowstick/random = 2, + /obj/item/cell/super = 2, + /obj/item/contraband/poster = 2, + /obj/item/reagent_containers/glass/rag = 2, + /obj/item/storage/box/sinpockets = 2, + /obj/item/storage/secure/briefcase = 2, + /obj/item/clothing/glasses/sunglasses = 1, + /obj/item/clothing/glasses/welding = 1, + /obj/item/clothing/gloves/yellow = 1, + /obj/item/clothing/head/bio_hood/general = 1, + /obj/item/clothing/head/ushanka = 1, + /obj/item/clothing/shoes/syndigaloshes = 1, + /obj/item/clothing/suit/bio_suit/general = 1, + /obj/item/clothing/suit/space/emergency = 1, + /obj/item/clothing/under/gearharness = 1, + /obj/item/clothing/under/tactical = 1, + /obj/item/clothing/suit/armor/material/makeshift/plasteel = 1, + /obj/item/clothing/mask/gas/voice = 1, + /obj/item/spacecash/c100 = 1, + /obj/item/spacecash/c200 = 1, + ) + + var/path = pickweight(possible_path) + var/obj/item/I = new path() + return I + +/obj/structure/trash_pile/proc/produce_beta_item() + var/list/possible_path = list( + /obj/item/storage/pill_bottle/mortaphenyl = 6, + /obj/item/storage/pill_bottle/minaphobin = 4, + /obj/item/storage/pill_bottle/inaprovaline = 4, + /obj/item/seeds/ambrosiavulgarisseed = 4, + /obj/item/gun/energy/mousegun = 4, + /obj/item/material/knife/butterfly = 3, + /obj/item/material/knife/butterfly/switchblade = 3, + /obj/item/clothing/gloves/brassknuckles = 3, + /obj/item/reagent_containers/syringe/drugs = 3, + /obj/item/handcuffs = 2, + /obj/item/legcuffs = 2, + /obj/item/grenade/chem_grenade/gas = 2, + /obj/item/clothing/suit/storage/vest/heavy = 1, + /obj/item/device/radiojammer = 1, + /obj/item/trap = 1, + /obj/item/cell/hyper/empty = 1, + /obj/item/material/knife/tacknife = 1, + /obj/item/storage/firstaid/brute = 1, + /obj/item/reagent_containers/pill/dexalin_plus = 1 + ) + + var/path = pickweight(possible_path) + var/obj/item/I = new path() + return I + +/obj/structure/trash_pile/proc/produce_gamma_item() + var/path = pick_n_take(unique_gamma) + if(path) + var/obj/item/I = new path() + return I + else + return produce_beta_item() diff --git a/code/modules/projectiles/guns/projectile/improvised.dm b/code/modules/projectiles/guns/projectile/improvised.dm index 5e3a36b98f3..027085dbc92 100644 --- a/code/modules/projectiles/guns/projectile/improvised.dm +++ b/code/modules/projectiles/guns/projectile/improvised.dm @@ -152,6 +152,9 @@ jam_chance = 20 needspin = FALSE +/obj/item/gun/projectile/improvised_handgun/loaded + magazine_type = /obj/item/ammo_magazine/c45m + /obj/item/gun/projectile/improvised_handgun/examine(mob/user) ..(user) switch(jam_chance) diff --git a/html/changelogs/geeves-trash_piles.yml b/html/changelogs/geeves-trash_piles.yml new file mode 100644 index 00000000000..de6cdd78b73 --- /dev/null +++ b/html/changelogs/geeves-trash_piles.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Added various trash piles to maintenance, holding loot for anyone to discover." \ No newline at end of file diff --git a/icons/obj/trash_piles.dmi b/icons/obj/trash_piles.dmi new file mode 100644 index 0000000000000000000000000000000000000000..a8eea0b14edc146e39f605fd4bf1603d538b2c6f GIT binary patch literal 9367 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 IUe-M9e}GSu-v9sr literal 0 HcmV?d00001 diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 98bc5474358..1e4c3edb77e 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -34907,6 +34907,10 @@ }, /turf/simulated/floor/tiled, /area/outpost/engineering/hallway) +"uMk" = ( +/obj/structure/trash_pile, +/turf/simulated/floor/tiled, +/area/maintenance/disposal) "uMH" = ( /obj/effect/floor_decal/corner/green{ dir = 1 @@ -34967,6 +34971,10 @@ /obj/machinery/power/tesla_coil, /turf/simulated/floor/plating, /area/outpost/engineering/power) +"uRE" = ( +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/research_xenobiology) "uRU" = ( /obj/structure/table/standard, /obj/structure/window/reinforced, @@ -61915,7 +61923,7 @@ aFV aFV aFV aFV -aJW +uRE awa aFW aba @@ -65751,7 +65759,7 @@ aFW aGS aHX aHX -aJW +uRE aKY aMb aMb @@ -66046,7 +66054,7 @@ aaa aaa aaa aZV -aZW +uMk aZW aZW bcb diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 713b0733b6b..6580a94ea1e 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -30821,7 +30821,7 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/cryo) "bbo" = ( -/obj/random/junk, +/obj/structure/trash_pile, /turf/simulated/floor/plating, /area/maintenance/maintcentral) "bbp" = ( @@ -35699,7 +35699,6 @@ /obj/machinery/conveyor_switch/oneway{ desc = "A conveyor control switch. It appears to only go in one direction. Controls the components conveyor belt."; id = "Robocompo"; - name = "conveyor switch"; pixel_x = -10 }, /turf/simulated/floor/tiled, @@ -59351,12 +59350,20 @@ /obj/structure/closet/lawcloset, /turf/simulated/floor/wood, /area/lawoffice/representative) +"cXG" = ( +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/atmos_control) "cXM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /turf/simulated/floor/plating, /area/maintenance/research_port) +"cXY" = ( +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/research_port) "das" = ( /obj/structure/table/rack, /obj/random/loot, @@ -60943,6 +60950,11 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/old, /area/maintenance/vault) +"gJn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/bar) "gKs" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -61546,6 +61558,11 @@ }, /turf/simulated/floor/plating, /area/quartermaster/storage) +"hQf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/vault) "hQD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63585,6 +63602,11 @@ "mKz" = ( /turf/simulated/wall, /area/maintenance/library) +"mKD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/research_port) "mMJ" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/old_dark, @@ -64414,6 +64436,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/research_port) +"oDJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/medbay) "oEG" = ( /obj/effect/floor_decal/corner/yellow{ dir = 4 @@ -64624,6 +64651,10 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet, /area/lawoffice/consular) +"peg" = ( +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/bar) "pfO" = ( /obj/structure/table/steel, /obj/item/reagent_containers/food/drinks/bottle{ @@ -65500,6 +65531,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/vault) +"qOX" = ( +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/library) "qPd" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/random/junk, @@ -66379,6 +66414,10 @@ }, /turf/simulated/floor/wood, /area/maintenance/bar) +"sAC" = ( +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/security_starboard) "sAE" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -68407,6 +68446,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"weJ" = ( +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/bridge_elevator) "wfx" = ( /obj/machinery/button/remote/airlock{ dir = 8; @@ -84565,7 +84608,7 @@ aKV aOw aQc aRQ -bcY +cXY bbs bbs aXI @@ -87112,7 +87155,7 @@ qba eFC aja vOd -aid +cXG aih ahk anJ @@ -88179,7 +88222,7 @@ bbq bbs bbs bnt -bcY +cXY bqh brq bss @@ -89758,7 +89801,7 @@ bPs bPs bQF bcY -bPs +mKD bbs bFT bcY @@ -91817,7 +91860,7 @@ sYg aKT bNn bRK -bNn +qOX cbQ rXO oud @@ -93097,7 +93140,7 @@ fqD xqw bRK bNn -bNn +qOX bSh bSh bSh @@ -99448,7 +99491,7 @@ aaV aaA aaA aaA -aah +sAC aah aae aah @@ -101350,7 +101393,7 @@ bEK bPH bGC bGC -bGC +peg bEK aab aab @@ -101599,13 +101642,13 @@ bZt bSM bGC bGC -bGC +peg bMU pDF cdi bEK bMV -bGC +peg bPH bGC bEK @@ -103366,7 +103409,7 @@ bMp bMp bGC eNR -pie +gJn bNO jPX yfc @@ -103915,7 +103958,7 @@ bGC bGC bEK bFF -bGC +peg bEK aab aab @@ -104061,7 +104104,7 @@ aah aah aah aah -aah +sAC aaV abE aeJ @@ -105868,7 +105911,7 @@ afj ePU eZE pFK -xOq +hQf nHe hRF tzU @@ -110017,7 +110060,7 @@ baW bct aYy bfw -aSL +bbo bhZ bjp bku @@ -112034,7 +112077,7 @@ aaa aox aox nHe -xOq +hQf qqz txW amk @@ -112352,7 +112395,7 @@ blN blN blN blL -bJq +oDJ blN bBo hSJ @@ -114675,7 +114718,7 @@ dNy hTO bMu dNy -dNy +weJ hTO aaa aaa @@ -117728,7 +117771,7 @@ bal bal bal aTf -aSL +bbo aSL bam aab @@ -118750,9 +118793,9 @@ aUU aUS aXF aXC -aSL bbo -aSL +bbo +bbo aSL aSL bha diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index 85816da5523..c16343d4594 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -3967,8 +3967,7 @@ "iw" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/blast/regular{ - id = "sat_blast"; - name = "Blast Door" + id = "sat_blast" }, /turf/simulated/floor/plating, /area/bridge/selfdestruct) @@ -9718,6 +9717,10 @@ }, /turf/simulated/floor/tiled/white, /area/maintenance/medbay_virology) +"JB" = ( +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/interstitial_cargo) "JC" = ( /turf/simulated/floor/tiled, /area/maintenance/bridge_elevator) @@ -12442,7 +12445,7 @@ /turf/simulated/floor/plating, /area/maintenance/medbay_interstitial) "XA" = ( -/obj/structure/closet/firecloset/full, +/obj/structure/trash_pile, /turf/simulated/floor/plating, /area/maintenance/elevator) "XG" = ( @@ -44111,7 +44114,7 @@ aa aa aa KJ -Lk +JB Lv Ly KJ diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index 604ca7b6db4..c4bf1c11a96 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -12825,6 +12825,10 @@ }, /turf/simulated/floor/wood, /area/store) +"yt" = ( +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/turret_protected/tcomsat) "yu" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -22710,8 +22714,7 @@ /turf/simulated/floor/grass/alt, /area/hydroponics/garden) "QO" = ( -/obj/structure/table/rack, -/obj/random/loot, +/obj/structure/trash_pile, /turf/simulated/floor/plating, /area/maintenance/elevator) "QP" = ( @@ -22812,6 +22815,10 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/port) +"QZ" = ( +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/telecoms_ladder) "Ra" = ( /turf/simulated/wall/shuttle/unique/research{ desc = "The largest commercially available sublight engine, with a shuttle built around it and painted in NanoTrasen research division colors. Looks sleek, and fast."; @@ -36909,7 +36916,7 @@ aP aa bg bg -bx +yt bW cr cI @@ -41049,7 +41056,7 @@ bg Of Mp cl -Mp +QZ Nc ag ag