mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-25 17:02:04 +00:00
5a68c5f6d3
* WE'RE SO BACK * LET THERE BE SOUND * More bugs * fixes * sound * hmm * clothing sprites + minor code changes to clothes * meestake * spritening * YARR * hiss * Cyberiad explorer remap * hand telover * delta days * rooms done * VENDOR * Mapping done * Salvage mapped * qol * Forgot the hivelord. * woops * oops redux * reviews and more * consistency * Update code/game/jobs/job_globals.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * character * Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/hostile/pirate.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/boxes.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/research/designs/machine_designs.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * some reviews * Update code/game/machinery/constructable_frame.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * supply * area repathing and ambience * mapping * metamapping * Update code/game/objects/items/weapons/storage/belt.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * the doorening * redooring * modsuit * more reviews * the plasmamamninigngg * add random salvage generation across space ruins * add blackbox tracking for salvage sold * gun * deconflicts and reviews * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/garment.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * all conversations resolved * maybe work now? * please no more, too many apcs * Update code/modules/mob/living/simple_animal/corpse.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mining/machine_vending.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * henri review + action figure * Update code/game/objects/items/toys.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * PDA * conflicts * more conflicts * maybe all conflcits? * wait fuck * maybe fixed??? * KIDAN SPRITES * MAYBE? * access fixes * explorer hotfixes 1: - fixes space pirates dying in space - gives explorers ORM access - box: fixes access on NTR airlock - box: fixes naming on BS airlock - box: adds expedition access to mail sorting room * add salvage selling back * NOT FOR SALE * oh my god actually sell the fucking salvage this time * maybe fine now? * carpover * NO MORE CABLE * balance tweaks * some depot loot updates * merge conflict * deconflicted??? * woops more oversights * skirts, bombers, exploredrobe code + sprites * woops (again) * deconflicting * remove old explorer room again * Hat fix * minor changes to sprites and code for hats * yarrr fix 1 * first fixes * don't drop loot from syndies gibbed by depot destruction * add selling back with new signal based system * speedmerge this shit * minor changes to collars/bomber resprite * docking port in * ruins * WE DON'T NEED CONFIG CHANGES WE NEED PICTURES PICTURES OF SPIDERMAN * no more murder hallway on whiteship * undelete meson sunglasses, redelete uristrunes * BOOTY BAGS * don't drop ashdrake loot from crusher kills * box: fix ntrep fax, add explorer access to ORMroom * add meson sunglasses item icon back * fix cere handtele, meta shutter control, death sound arg * cleaning up * she mosins on my russian till i dj station * Update code/modules/clothing/head/soft_caps.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/modules/mining/machine_vending.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/game/gamemodes/game_mode.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * mapping * Cleaning up * revert changes in tools/{bootstrap,ci} --------- Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
357 lines
11 KiB
Plaintext
357 lines
11 KiB
Plaintext
/obj/effect/spawner/random_spawners
|
|
name = "random spawners"
|
|
icon = 'icons/effects/spawner_icons.dmi'
|
|
icon_state = "questionmark"
|
|
var/list/result = list(
|
|
/datum/nothing = 1,
|
|
/obj/effect/decal/cleanable/blood/splatter = 1,
|
|
/obj/effect/decal/cleanable/blood/oil = 1,
|
|
/obj/effect/decal/cleanable/fungus = 1)
|
|
var/spawn_inside = null
|
|
|
|
// This needs to use New() instead of Initialize() because the thing it creates might need to be initialized too
|
|
// AA 2022-08-11: The above comment doesnt even make sense. If extra atoms are loaded during SSatoms.Initialize(), they still get initialised!
|
|
/obj/effect/spawner/random_spawners/New()
|
|
. = ..()
|
|
var/turf/T = get_turf(src)
|
|
if(!T)
|
|
stack_trace("Spawner placed in nullspace!")
|
|
return
|
|
randspawn(T)
|
|
|
|
/obj/effect/spawner/random_spawners/proc/randspawn(turf/T)
|
|
var/thing_to_place = pickweight(result)
|
|
if(ispath(thing_to_place, /datum/nothing))
|
|
// Nothing.
|
|
qdel(src) // See line 13, this needs moving to /Initialize() so we can use the qdel hint already
|
|
return
|
|
else if(ispath(thing_to_place, /turf))
|
|
T.ChangeTurf(thing_to_place)
|
|
else
|
|
if(ispath(spawn_inside, /obj))
|
|
var/obj/O = new thing_to_place(T)
|
|
var/obj/E = new spawn_inside(T)
|
|
O.forceMove(E)
|
|
else
|
|
new thing_to_place(T)
|
|
qdel(src)
|
|
|
|
/obj/effect/spawner/random_spawners/blood_maybe
|
|
name = "blood maybe"
|
|
icon_state = "blood"
|
|
result = list(
|
|
/datum/nothing = 20,
|
|
/obj/effect/decal/cleanable/blood/splatter = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/blood_often
|
|
name = "blood often"
|
|
icon_state = "blood"
|
|
result = list(
|
|
/datum/nothing = 5,
|
|
/obj/effect/decal/cleanable/blood/splatter = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/oil_maybe
|
|
name = "oil maybe"
|
|
icon_state = "oil"
|
|
result = list(
|
|
/datum/nothing = 20,
|
|
/obj/effect/decal/cleanable/blood/oil = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/oil_often
|
|
name = "oil often"
|
|
icon_state = "oil"
|
|
result = list(
|
|
/datum/nothing = 5,
|
|
/obj/effect/decal/cleanable/blood/oil = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/proc/rustify(turf/T)
|
|
var/turf/simulated/wall/W = T
|
|
if(istype(W) && !W.rusted)
|
|
W.rust()
|
|
|
|
/obj/effect/spawner/random_spawners/wall_rusted_probably
|
|
name = "rusted wall probably"
|
|
icon_state = "rust"
|
|
|
|
/obj/effect/spawner/random_spawners/wall_rusted_probably/randspawn(turf/T)
|
|
if(prob(75))
|
|
rustify(T)
|
|
qdel(src)
|
|
|
|
/obj/effect/spawner/random_spawners/wall_rusted_maybe
|
|
name = "rusted wall maybe"
|
|
icon_state = "rust"
|
|
|
|
/obj/effect/spawner/random_spawners/wall_rusted_maybe/randspawn(turf/T)
|
|
if(prob(25))
|
|
rustify(T)
|
|
qdel(src)
|
|
|
|
/obj/effect/spawner/random_spawners/wall_rusted_always
|
|
name = "rusted wall always"
|
|
icon_state = "rust"
|
|
|
|
/obj/effect/spawner/random_spawners/wall_rusted_always/randspawn(turf/T)
|
|
rustify(T)
|
|
qdel(src)
|
|
|
|
/obj/effect/spawner/random_spawners/cobweb_left_frequent
|
|
name = "cobweb left frequent"
|
|
icon_state = "cobwebl"
|
|
result = list(
|
|
/datum/nothing = 1,
|
|
/obj/effect/decal/cleanable/cobweb = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/cobweb_right_frequent
|
|
name = "cobweb right frequent"
|
|
icon_state = "cobwebr"
|
|
result = list(
|
|
/datum/nothing = 1,
|
|
/obj/effect/decal/cleanable/cobweb2 = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/cobweb_left_rare
|
|
name = "cobweb left rare"
|
|
icon_state = "cobwebl"
|
|
result = list(
|
|
/datum/nothing = 10,
|
|
/obj/effect/decal/cleanable/cobweb = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/cobweb_right_rare
|
|
name = "cobweb right rare"
|
|
icon_state = "cobwebr"
|
|
result = list(
|
|
/datum/nothing = 10,
|
|
/obj/effect/decal/cleanable/cobweb2 = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/dirt_frequent
|
|
name = "dirt frequent"
|
|
icon_state = "dirt"
|
|
result = list(
|
|
/datum/nothing = 1,
|
|
/obj/effect/decal/cleanable/dirt = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/dirt_often
|
|
name = "dirt often"
|
|
icon_state = "dirt"
|
|
result = list(
|
|
/datum/nothing = 5,
|
|
/obj/effect/decal/cleanable/dirt = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/dirt_maybe
|
|
name = "dirt maybe"
|
|
icon_state = "dirt"
|
|
result = list(
|
|
/datum/nothing = 7,
|
|
/obj/effect/decal/cleanable/dirt = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/fungus_maybe
|
|
name = "fungus maybe"
|
|
icon_state = "fungus"
|
|
color = "#D5820B"
|
|
result = list(
|
|
/datum/nothing = 7,
|
|
/obj/effect/decal/cleanable/fungus = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/fungus_probably
|
|
name = "fungus probably"
|
|
icon_state = "fungus"
|
|
color = "#D5820B"
|
|
result = list(
|
|
/datum/nothing = 1,
|
|
/obj/effect/decal/cleanable/fungus = 7)
|
|
|
|
/obj/effect/spawner/random_spawners/mod
|
|
name = "MOD module spawner"
|
|
desc = "Modularize this, please."
|
|
icon_state = "circuit"
|
|
|
|
/obj/effect/spawner/random_spawners/mod/maint
|
|
name = "maint MOD module spawner"
|
|
result = list(
|
|
/obj/item/mod/module/springlock = 2,
|
|
/obj/item/mod/module/balloon = 1,
|
|
/obj/item/mod/module/stamp = 1
|
|
)
|
|
|
|
|
|
// z6 DEPOT SPAWNERS
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate
|
|
|
|
|
|
|
|
// Turrets
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/turret
|
|
name = "50pc int turret"
|
|
icon_state = "x"
|
|
result = list(/datum/nothing = 1,
|
|
/obj/machinery/porta_turret/syndicate/interior = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/turret/external
|
|
name = "50pc ext turret"
|
|
result = list(/datum/nothing = 1,
|
|
/obj/machinery/porta_turret/syndicate/exterior = 1)
|
|
|
|
// Mobs
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/mob
|
|
name = "50pc melee syndimob"
|
|
icon_state = "x"
|
|
color = "#333333"
|
|
result = list(/datum/nothing = 1,
|
|
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot = 1)
|
|
|
|
// Traps
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/trap
|
|
icon_state = "x"
|
|
color = "#000000"
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/trap/pizzabomb
|
|
name = "33pc trap pizza"
|
|
result = list(/obj/item/pizzabox/meat = 1,
|
|
/obj/item/pizzabox/hawaiian = 1,
|
|
/obj/item/pizzabox/margherita = 1,
|
|
/obj/item/pizzabox/vegetable = 1,
|
|
/obj/item/pizzabox/mushroom = 1,
|
|
/obj/item/pizzabox/pepperoni = 7, //Higher weight as a pizza bomb looks like pepperoni by default
|
|
/obj/item/pizzabox/garlic = 1,
|
|
/obj/item/pizzabox/firecracker = 1,
|
|
/obj/item/pizzabox/pizza_bomb/autoarm = 7)
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/trap/medbot
|
|
name = "50pc trap medibot"
|
|
result = list(/datum/nothing = 1,
|
|
/mob/living/simple_animal/bot/medbot/syndicate/emagged = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/trap/mine
|
|
name = "50pc trap landmine"
|
|
result = list(/datum/nothing = 1,
|
|
/obj/effect/mine/depot = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/trap/documents
|
|
name = "66pc trapped documents"
|
|
result = list(/obj/item/documents/syndicate/yellow = 1,
|
|
/obj/item/documents/syndicate/yellow/trapped = 1)
|
|
|
|
|
|
|
|
|
|
// Loot
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/loot
|
|
name = "common loot"
|
|
icon_state = "x3"
|
|
spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot
|
|
// Loot schema: costumes, toys, useless gimmick items
|
|
result = list(/datum/nothing = 13,
|
|
/obj/item/storage/toolbox/syndicate = 1,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1,
|
|
/obj/item/deck/cards/syndicate = 1,
|
|
/obj/item/storage/secure/briefcase/syndie = 1,
|
|
/obj/item/toy/syndicateballoon = 1,
|
|
/obj/item/soap/syndie = 1,
|
|
/obj/item/clothing/under/syndicate = 1,
|
|
/obj/item/clothing/mask/gas/syndicate = 1,
|
|
/obj/item/suppressor = 1,
|
|
/obj/item/coin/antagtoken/syndicate = 1,
|
|
/obj/item/storage/box/syndie_kit/space = 1,
|
|
/obj/item/clothing/shoes/magboots/syndie = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/loot/stetchkin
|
|
name = "20pc stetchkin"
|
|
icon_state = "x3"
|
|
spawn_inside = null
|
|
result = list(/datum/nothing = 1,
|
|
/obj/item/wrench = 1,
|
|
/obj/item/food/snacks/syndicake = 1,
|
|
/obj/item/coin/antagtoken/syndicate = 1,
|
|
/obj/item/gun/projectile/automatic/pistol = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/loot/level2
|
|
name = "rare loot"
|
|
// Basic stealth, utility and environmental gear.
|
|
result = list(/datum/nothing = 27,
|
|
/obj/item/mod/control/pre_equipped/traitor = 1,
|
|
/obj/item/ammo_box/magazine/m10mm = 1,
|
|
/obj/item/storage/backpack/duffel/syndie/med/surgery = 1,
|
|
/obj/item/clothing/shoes/chameleon/noslip = 1,
|
|
/obj/item/storage/belt/military = 1,
|
|
/obj/item/clothing/under/chameleon = 1,
|
|
/obj/item/storage/backpack/satchel_flat = 1,
|
|
/obj/item/stamp/chameleon = 1,
|
|
/obj/item/lighter/zippo/gonzofist = 1,
|
|
/obj/item/stack/sheet/mineral/plasma{amount = 20} = 1,
|
|
/obj/item/stack/sheet/mineral/silver{amount = 20} = 1,
|
|
/obj/item/stack/sheet/mineral/gold{amount = 20} = 1,
|
|
/obj/item/stack/sheet/mineral/uranium{amount = 20} = 1,
|
|
/obj/item/mod/module/noslip = 1,
|
|
/obj/item/mod/module/visor/night = 1,
|
|
/obj/item/clothing/gloves/color/black/thief = 1,
|
|
/obj/item/clothing/suit/storage/iaa/blackjacket/armored = 1,
|
|
/obj/item/clothing/suit/jacket/syndicatebomber = 1,
|
|
/obj/item/mod/module/holster/hidden = 1,
|
|
/obj/item/storage/firstaid/tactical = 1,
|
|
/obj/item/clothing/under/syndicate/silicon_cham = 1,
|
|
/obj/item/storage/box/syndie_kit/camera_bug = 1,
|
|
/obj/item/gun/projectile/automatic/toy/pistol/riot = 1,
|
|
/obj/item/flash/cameraflash = 1,
|
|
/obj/item/mod/module/chameleon = 1,
|
|
/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium = 1)
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/loot/level3
|
|
name = "officer loot"
|
|
// Primarily utility items with occasional low damage weaponry.
|
|
result = list(/datum/nothing = 25,
|
|
/obj/item/jammer = 1,
|
|
/obj/item/encryptionkey/binary = 1,
|
|
/obj/item/pinpointer/advpinpointer = 1,
|
|
/obj/item/borg/upgrade/syndicate = 1,
|
|
/obj/item/borg/upgrade/selfrepair = 1,
|
|
/obj/item/storage/box/syndie_kit/stechkin = 1,
|
|
/obj/item/stack/sheet/mineral/diamond{amount = 10} = 1,
|
|
/obj/item/stack/sheet/mineral/uranium{amount = 10} = 1,
|
|
/obj/item/clothing/shoes/magboots/elite = 1,
|
|
/obj/item/clothing/glasses/hud/security/chameleon = 1,
|
|
/obj/item/mod/module/visor/thermal = 1,
|
|
/obj/item/mod/module/stealth = 1,
|
|
/obj/item/mod/module/power_kick = 1,
|
|
/obj/item/storage/box/syndidonkpockets = 1,
|
|
/obj/item/pen/edagger = 1,
|
|
/obj/item/door_remote/omni/access_tuner = 1,
|
|
/obj/item/clothing/glasses/thermal = 1)
|
|
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/loot/level4
|
|
name = "armory loot"
|
|
spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot/armory
|
|
// Combat orientated items that could give the player an advantage if an antag messes with them.
|
|
result = list(/obj/item/melee/energy/sword/saber = 1,
|
|
/obj/item/autosurgeon/organ/syndicate/razorwire = 1,
|
|
/obj/item/chameleon = 1,
|
|
/obj/item/CQC_manual = 1,
|
|
/obj/item/reagent_containers/hypospray/autoinjector/stimulants = 1,
|
|
/obj/item/clothing/gloves/fingerless/rapid = 1,
|
|
/obj/item/gun/medbeam = 1,
|
|
/obj/item/shield/energy = 1,
|
|
/obj/item/storage/box/syndie_kit/teleporter = 1,
|
|
/obj/item/weaponcrafting/gunkit/universal_gun_kit = 1)
|
|
|
|
|
|
// Layout-affecting spawns
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/layout
|
|
icon_state = "x2"
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/layout/door
|
|
name = "50pc door 25pc falsewall 25pc wall"
|
|
result = list(/obj/machinery/door/airlock/hatch/syndicate = 6,
|
|
/turf/simulated/wall/mineral/plastitanium/nodiagonal = 2,
|
|
/obj/structure/falsewall/plastitanium = 2)
|
|
|
|
/obj/effect/spawner/random_spawners/syndicate/layout/door/vault
|
|
name = "80pc vaultdoor 20pc wall"
|
|
result = list(/obj/machinery/door/airlock/hatch/syndicate/vault = 4,
|
|
/turf/simulated/wall/mineral/plastitanium/nodiagonal = 1)
|