From 31b5559139faf102de21c203861e3475fd45572e Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sat, 25 Nov 2023 01:35:23 -0600 Subject: [PATCH 01/70] kills waldo and loops --- .../hostile/mining_mobs/hivelord.dm | 95 ++++++------------- 1 file changed, 27 insertions(+), 68 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index bdc4124ed929..9f678446ad1b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -411,7 +411,7 @@ ) var/type = pickweight(list( "Miner" = 44, - "Waldo" = 3, + "Infiltrator" = 3, "Ashwalker" = 7, "Soldier" = 3, "Oldminer" = 8, @@ -558,63 +558,26 @@ if(prob(85)) back = /obj/item/storage/backpack/explorer //someone could totally make these backpacks a subtype and just have them be there. It'd cut down this file size a bit. backpack_contents = list() - if(prob(70)) - backpack_contents += pickweight(list( - /obj/item/borg/upgrade/modkit/damage = 1, - /obj/item/borg/upgrade/modkit/trigger_guard = 1, - /obj/item/soap/nanotrasen = 1, - /obj/item/wormhole_jaunter = 1, - /obj/item/fulton_core = 1, - /obj/item/extraction_pack = 2, - /obj/item/stack/sheet/animalhide/goliath_hide = 3, - /obj/item/hivelordstabilizer = 2, - /obj/item/stack/marker_beacon/ten = 2, - /obj/item/mining_scanner = 2, - /obj/item/extinguisher/mini = 2, - /obj/item/kitchen/knife/combat/survival = 3, - /obj/item/flashlight/seclite=3, - /obj/item/stack/sheet/sinew = 3, - /obj/item/stack/sheet/bone = 3 - ) - ) - if(prob(70)) - backpack_contents += pickweight(list( - /obj/item/borg/upgrade/modkit/damage = 1, - /obj/item/borg/upgrade/modkit/trigger_guard = 1, - /obj/item/soap/nanotrasen = 1, - /obj/item/wormhole_jaunter = 1, - /obj/item/fulton_core = 1, - /obj/item/extraction_pack = 2, - /obj/item/stack/sheet/animalhide/goliath_hide = 3, - /obj/item/hivelordstabilizer = 2, - /obj/item/stack/marker_beacon/ten = 2, - /obj/item/mining_scanner = 2, - /obj/item/extinguisher/mini = 2, - /obj/item/kitchen/knife/combat/survival = 3, - /obj/item/flashlight/seclite=3, - /obj/item/stack/sheet/sinew = 3, - /obj/item/stack/sheet/bone = 3 - ) - ) - if(prob(70)) - backpack_contents += pickweight(list( - /obj/item/borg/upgrade/modkit/damage = 1, - /obj/item/borg/upgrade/modkit/trigger_guard = 1, - /obj/item/soap/nanotrasen = 1, - /obj/item/wormhole_jaunter = 1, - /obj/item/fulton_core = 1, - /obj/item/extraction_pack = 2, - /obj/item/stack/sheet/animalhide/goliath_hide = 3, - /obj/item/hivelordstabilizer = 2, - /obj/item/stack/marker_beacon/ten = 2, - /obj/item/mining_scanner = 2, - /obj/item/extinguisher/mini = 2, - /obj/item/kitchen/knife/combat/survival = 3, - /obj/item/flashlight/seclite=3, - /obj/item/stack/sheet/sinew = 3, - /obj/item/stack/sheet/bone = 3 + for(var/i = 1 to 3) + if(prob(70)) + backpack_contents += pickweight(list( + /obj/item/borg/upgrade/modkit/damage = 1, + /obj/item/borg/upgrade/modkit/trigger_guard = 1, + /obj/item/soap/nanotrasen = 1, + /obj/item/wormhole_jaunter = 1, + /obj/item/fulton_core = 1, + /obj/item/extraction_pack = 2, + /obj/item/stack/sheet/animalhide/goliath_hide = 3, + /obj/item/hivelordstabilizer = 2, + /obj/item/stack/marker_beacon/ten = 2, + /obj/item/mining_scanner = 2, + /obj/item/extinguisher/mini = 2, + /obj/item/kitchen/knife/combat/survival = 3, + /obj/item/flashlight/seclite=3, + /obj/item/stack/sheet/sinew = 3, + /obj/item/stack/sheet/bone = 3 + ) ) - ) if(prob(30)) backpack_contents += list( /obj/item/reagent_containers/hypospray/medipen/survival = pickweight(list( @@ -926,25 +889,21 @@ outfit = /datum/outfit/syndicatestormtroopercorpse else outfit = /datum/outfit/syndicatecommandocorpse - if("Waldo")//WE FINALLY FOUND HIM - name = "Waldo" - uniform = /obj/item/clothing/under/pants/jeans - suit = /obj/item/clothing/suit/striped_sweater - head = /obj/item/clothing/head/beanie/waldo - shoes = /obj/item/clothing/shoes/sneakers/brown + if("Infiltrator")//WE FINALLY FOUND HIM + uniform = /obj/item/clothing/under/syndicate/bloodred + gloves = /obj/item/clothing/gloves/color/latex/nitrile/infiltrator + suit = /obj/item/clothing/suit/armor/vest/infiltrator + head = /obj/item/clothing/head/helmet/infiltrator + shoes = /obj/item/clothing/shoes/combat/sneakboots ears = /obj/item/radio/headset glasses = /obj/item/clothing/glasses/regular/circle + mask = new /obj/item/clothing/mask/infiltrator back = /obj/item/storage/backpack/satchel/leather backpack_contents = list() if(prob(50)) backpack_contents += pickweight(list( - /obj/item/book/granter/spell/knock = 1, - /obj/item/book/granter/spell/blind = 1, /obj/item/shadowcloak = 1, - /obj/item/book/granter/spell/smoke = 2, /obj/item/reagent_containers/syringe/mulligan = 2, - /obj/item/dice/d20 = 3, - /obj/item/dice/d20/fate/stealth/one_use = 1, /obj/item/clothing/head/chameleon/broken = 3, /obj/item/stack/marker_beacon/ten = 3, /obj/item/grenade/smokebomb = 3, From bd0d884b74b1cd3d2f0fb6bfe92751ba0d828850 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sat, 25 Nov 2023 01:39:32 -0600 Subject: [PATCH 02/70] more loops --- .../hostile/mining_mobs/hivelord.dm | 203 ++++-------------- 1 file changed, 47 insertions(+), 156 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 9f678446ad1b..dc55747d1676 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -647,63 +647,26 @@ if(prob(85)) back = /obj/item/storage/backpack backpack_contents = list() - if(prob(75)) - backpack_contents += pickweight(list( - /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 1, - /obj/item/storage/firstaid/tactical = 1, - /obj/item/gun/ballistic/automatic/pistol/solgov = 1, - /obj/item/gps = 1, - /obj/item/stock_parts/cell/gun/upgraded = 2, - /obj/item/ammo_box/magazine/pistol556mm = 3, - /obj/item/desk_flag/solgov = 3, - /obj/item/stack/marker_beacon/ten = 3, - /obj/item/detective_scanner = 2, - /obj/item/extinguisher/mini = 3, - /obj/item/kitchen/knife/combat = 3, - /obj/item/flashlight/seclite=3, - /obj/item/ammo_casing/shotgun = 3, - /obj/item/binoculars = 3, - /obj/item/clipboard = 3 - ) - ) - if(prob(75)) - backpack_contents += pickweight(list( - /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 1, - /obj/item/storage/firstaid/tactical = 1, - /obj/item/gun/ballistic/automatic/pistol/solgov = 1, - /obj/item/gps = 1, - /obj/item/stock_parts/cell/gun/upgraded = 2, - /obj/item/ammo_box/magazine/pistol556mm = 3, - /obj/item/desk_flag/solgov = 3, - /obj/item/stack/marker_beacon/ten = 3, - /obj/item/detective_scanner = 2, - /obj/item/extinguisher/mini = 3, - /obj/item/kitchen/knife/combat = 3, - /obj/item/flashlight/seclite=3, - /obj/item/ammo_casing/shotgun = 3, - /obj/item/binoculars = 3, - /obj/item/clipboard = 3 - ) - ) - if(prob(75)) - backpack_contents += pickweight(list( - /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 1, - /obj/item/storage/firstaid/tactical = 1, - /obj/item/gun/ballistic/automatic/pistol/solgov = 1, - /obj/item/gps = 1, - /obj/item/stock_parts/cell/gun/upgraded = 2, - /obj/item/ammo_box/magazine/pistol556mm = 3, - /obj/item/desk_flag/solgov = 3, - /obj/item/stack/marker_beacon/ten = 3, - /obj/item/detective_scanner = 2, - /obj/item/extinguisher/mini = 3, - /obj/item/kitchen/knife/combat = 3, - /obj/item/flashlight/seclite=3, - /obj/item/ammo_casing/shotgun = 3, - /obj/item/binoculars = 3, - /obj/item/clipboard = 3 + for(var/i = 1 to 3) + if(prob(75)) + backpack_contents += pickweight(list( + /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 1, + /obj/item/storage/firstaid/tactical = 1, + /obj/item/gun/ballistic/automatic/pistol/solgov = 1, + /obj/item/gps = 1, + /obj/item/stock_parts/cell/gun/upgraded = 2, + /obj/item/ammo_box/magazine/pistol556mm = 3, + /obj/item/desk_flag/solgov = 3, + /obj/item/stack/marker_beacon/ten = 3, + /obj/item/detective_scanner = 2, + /obj/item/extinguisher/mini = 3, + /obj/item/kitchen/knife/combat = 3, + /obj/item/flashlight/seclite=3, + /obj/item/ammo_casing/shotgun = 3, + /obj/item/binoculars = 3, + /obj/item/clipboard = 3 + ) ) - ) else back = pickweight(list( /obj/item/energyhalberd = 5, @@ -721,15 +684,6 @@ /obj/item/melee/transforming/energy/ctf/solgov = 1 ) ) - if(prob(50)) - l_pocket = pickweight(list( - /obj/item/reagent_containers/hypospray/medipen/stimpack = 1, - /obj/item/kitchen/knife/letter_opener = 3, - /obj/item/radio/off = 3, - /obj/item/grenade/syndieminibomb/concussion = 1, - /obj/item/melee/transforming/energy/ctf/solgov = 1 - ) - ) if(prob(70)) glasses = pickweight(list( /obj/item/clothing/glasses/sunglasses = 3, @@ -774,60 +728,25 @@ if(prob(70)) back = /obj/item/storage/backpack backpack_contents = list() - if(prob(75)) - backpack_contents += pickweight(list( - /obj/item/slime_extract/grey = 1, - /obj/item/slime_scanner = 1, - /obj/item/resonator/upgraded = 1, - /obj/item/gps = 1, - /obj/item/fulton_core = 2, - /obj/item/extraction_pack = 3, - /obj/item/stack/sheet/mineral/plasma/twenty = 3, - /obj/item/stack/marker_beacon/ten = 3, - /obj/item/mining_scanner = 2, - /obj/item/extinguisher/mini = 3, - /obj/item/flashlight/seclite=3, - /obj/item/research_notes/loot/medium = 3, - /obj/item/stack/sheet/metal/fifty = 3, - /obj/item/research_notes/loot/big = 1 - ) - ) - if(prob(75)) - backpack_contents += pickweight(list( - /obj/item/slime_extract/grey = 1, - /obj/item/slime_scanner = 1, - /obj/item/resonator/upgraded = 1, - /obj/item/gps = 1, - /obj/item/fulton_core = 2, - /obj/item/extraction_pack = 3, - /obj/item/stack/sheet/mineral/plasma/twenty = 3, - /obj/item/stack/marker_beacon/ten = 3, - /obj/item/mining_scanner = 2, - /obj/item/extinguisher/mini = 3, - /obj/item/flashlight/seclite=3, - /obj/item/research_notes/loot/medium = 3, - /obj/item/stack/sheet/metal/fifty = 3, - /obj/item/research_notes/loot/big = 1 - ) - ) - if(prob(75)) - backpack_contents += pickweight(list( - /obj/item/slime_extract/grey = 1, - /obj/item/slime_scanner = 1, - /obj/item/resonator/upgraded = 1, - /obj/item/gps = 1, - /obj/item/fulton_core = 2, - /obj/item/extraction_pack = 3, - /obj/item/stack/sheet/mineral/plasma/twenty = 3, - /obj/item/stack/marker_beacon/ten = 3, - /obj/item/mining_scanner = 2, - /obj/item/extinguisher/mini = 3, - /obj/item/flashlight/seclite=3, - /obj/item/research_notes/loot/medium = 3, - /obj/item/stack/sheet/metal/fifty = 3, - /obj/item/research_notes/loot/big = 1 + for(var/i = 1 to 3) + if(prob(75)) + backpack_contents += pickweight(list( + /obj/item/slime_extract/grey = 1, + /obj/item/slime_scanner = 1, + /obj/item/resonator/upgraded = 1, + /obj/item/gps = 1, + /obj/item/fulton_core = 2, + /obj/item/extraction_pack = 3, + /obj/item/stack/sheet/mineral/plasma/twenty = 3, + /obj/item/stack/marker_beacon/ten = 3, + /obj/item/mining_scanner = 2, + /obj/item/extinguisher/mini = 3, + /obj/item/flashlight/seclite=3, + /obj/item/research_notes/loot/medium = 3, + /obj/item/stack/sheet/metal/fifty = 3, + /obj/item/research_notes/loot/big = 1 + ) ) - ) if(prob(3)) backpack_contents += list( /obj/item/storage/box/rndboards @@ -900,45 +819,17 @@ mask = new /obj/item/clothing/mask/infiltrator back = /obj/item/storage/backpack/satchel/leather backpack_contents = list() - if(prob(50)) - backpack_contents += pickweight(list( - /obj/item/shadowcloak = 1, - /obj/item/reagent_containers/syringe/mulligan = 2, - /obj/item/clothing/head/chameleon/broken = 3, - /obj/item/stack/marker_beacon/ten = 3, - /obj/item/grenade/smokebomb = 3, - /obj/item/grenade/flashbang = 3 - ) - ) - if(prob(50)) - backpack_contents += pickweight(list( - /obj/item/book/granter/spell/knock = 1, - /obj/item/book/granter/spell/blind = 1, - /obj/item/shadowcloak = 1, - /obj/item/book/granter/spell/smoke = 2, - /obj/item/reagent_containers/syringe/mulligan = 2, - /obj/item/dice/d20/fate/stealth/one_use = 1, - /obj/item/dice/d20 = 3, - /obj/item/clothing/head/chameleon/broken = 3, - /obj/item/stack/marker_beacon/ten = 3, - /obj/item/grenade/smokebomb = 3, - /obj/item/grenade/flashbang = 3 - ) - ) - if(prob(50)) - backpack_contents += pickweight(list( - /obj/item/book/granter/spell/knock = 1, - /obj/item/book/granter/spell/blind = 1, - /obj/item/shadowcloak = 1, - /obj/item/book/granter/spell/smoke = 2, - /obj/item/reagent_containers/syringe/mulligan = 2, - /obj/item/dice/d20/fate/stealth/one_use = 1, - /obj/item/clothing/head/chameleon/broken = 3, - /obj/item/stack/marker_beacon/ten = 3, - /obj/item/grenade/smokebomb = 3, - /obj/item/grenade/flashbang = 3 + for(var/i = 1 to 3) + if(prob(50)) + backpack_contents += pickweight(list( + /obj/item/shadowcloak = 1, + /obj/item/reagent_containers/syringe/mulligan = 2, + /obj/item/clothing/head/chameleon/broken = 3, + /obj/item/stack/marker_beacon/ten = 3, + /obj/item/grenade/smokebomb = 3, + /obj/item/grenade/flashbang = 3 + ) ) - ) if(prob(25)) r_pocket = pickweight(list( /obj/item/chameleon, From 694b5ff9f6494267a93d0549b4215aaeb9947496 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sat, 25 Nov 2023 01:46:08 -0600 Subject: [PATCH 03/70] sorts em --- .../hostile/mining_mobs/hivelord.dm | 277 +++++++++--------- 1 file changed, 144 insertions(+), 133 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index dc55747d1676..520e6232f00a 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -411,14 +411,14 @@ ) var/type = pickweight(list( "Miner" = 44, - "Infiltrator" = 3, - "Ashwalker" = 7, - "Soldier" = 3, + "SRM" = 10, "Oldminer" = 8, - "Kobold" = 5, + "Ashwalker" = 7, "Golem" = 6, - "SRM" = 10, - pick("Shadow", "YeOlde", "Operative", "Cultist") = 4 + "Kobold" = 5, + "Soldier" = 3, + "Infiltrator" = 3, + pick("YeOlde", "Operative", "Shadow", "Cultist") = 4 ) ) switch(type) @@ -545,6 +545,33 @@ ) else back = /obj/item/kinetic_crusher + + if("SRM") + uniform = /obj/item/clothing/under/suit/roumain + shoes = /obj/item/clothing/shoes/workboots/mining + if(prob(50)) + suit = /obj/item/clothing/suit/armor/roumain/shadow + head = /obj/item/clothing/head/cowboy/sec/roumain/shadow + else + suit = /obj/item/clothing/suit/armor/roumain + head = /obj/item/clothing/head/cowboy/sec/roumain + if(prob(25)) + suit_store = /obj/item/gun/ballistic/shotgun/winchester + r_pocket = /obj/item/book/manual/trickwines_4_brewers + belt = pick(list(/obj/item/kitchen/knife/hunting = 1, /obj/item/gun/ballistic/derringer = 1)) + back = /obj/item/storage/backpack/cultpack + backpack_contents = list() + if(prob(75)) + backpack_contents += list(/obj/item/ammo_box/c38_box = 1) + if(prob(75)) + backpack_contents += list(pick( + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine, + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine, + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine, + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine, + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine, + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine,) = 2) + if("Oldminer") suit = /obj/item/clothing/suit/hooded/explorer/old mask = /obj/item/clothing/mask/gas/explorer/old @@ -606,6 +633,7 @@ /obj/item/borg/upgrade/modkit/cooldown = 1 ) ) + if("Ashwalker") mob_species = /datum/species/lizard/ashwalker uniform = /obj/item/clothing/under/costume/gladiator/ash_walker @@ -627,92 +655,7 @@ r_pocket = /obj/item/restraints/legcuffs/bola/watcher if(prob(30)) l_pocket = /obj/item/kitchen/knife/combat/bone - if("Soldier") - mob_species = /datum/species/human - if(prob(90)) - uniform = /obj/item/clothing/under/solgov - suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov - shoes = /obj/item/clothing/shoes/jackboots - gloves = /obj/item/clothing/gloves/color/black - mask = /obj/item/clothing/mask/gas/sechailer - head = /obj/item/clothing/head/solgov/sonnensoldner - id = /obj/item/card/id/solgov - else - uniform = /obj/item/clothing/under/solgov - suit = /obj/item/clothing/suit/space/hardsuit/solgov - shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat - mask = /obj/item/clothing/mask/gas/sechailer/swat - id = /obj/item/card/id/solgov - if(prob(85)) - back = /obj/item/storage/backpack - backpack_contents = list() - for(var/i = 1 to 3) - if(prob(75)) - backpack_contents += pickweight(list( - /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 1, - /obj/item/storage/firstaid/tactical = 1, - /obj/item/gun/ballistic/automatic/pistol/solgov = 1, - /obj/item/gps = 1, - /obj/item/stock_parts/cell/gun/upgraded = 2, - /obj/item/ammo_box/magazine/pistol556mm = 3, - /obj/item/desk_flag/solgov = 3, - /obj/item/stack/marker_beacon/ten = 3, - /obj/item/detective_scanner = 2, - /obj/item/extinguisher/mini = 3, - /obj/item/kitchen/knife/combat = 3, - /obj/item/flashlight/seclite=3, - /obj/item/ammo_casing/shotgun = 3, - /obj/item/binoculars = 3, - /obj/item/clipboard = 3 - ) - ) - else - back = pickweight(list( - /obj/item/energyhalberd = 5, - /obj/item/gun/ballistic/rocketlauncher/unrestricted = 5 - ) - ) - if(prob(25)) - belt = /obj/item/storage/belt/military - if(prob(50)) - r_pocket = pickweight(list( - /obj/item/reagent_containers/hypospray/medipen/stimpack = 1, - /obj/item/kitchen/knife/letter_opener = 3, - /obj/item/radio/off = 3, - /obj/item/grenade/syndieminibomb/concussion = 1, - /obj/item/melee/transforming/energy/ctf/solgov = 1 - ) - ) - if(prob(70)) - glasses = pickweight(list( - /obj/item/clothing/glasses/sunglasses = 3, - /obj/item/clothing/glasses/hud/health = 3, - /obj/item/clothing/glasses/hud/health/night = 1, - /obj/item/clothing/glasses/night = 2 - ) - ) - if("Kobold") - mob_species = /datum/species/lizard/ashwalker/kobold - uniform = /obj/item/clothing/under/costume/gladiator/ash_walker - if(prob(95)) - head = /obj/item/clothing/head/helmet/gladiator - else - head = /obj/item/clothing/head/helmet/skull - suit = /obj/item/clothing/suit/armor/bone - gloves = /obj/item/clothing/gloves/bracer - if(prob(5)) - back = pickweight(list( - /obj/item/spear/bonespear = 3, - /obj/item/fireaxe/boneaxe = 2 - ) - ) - if(prob(10)) - belt = /obj/item/storage/belt/mining/primitive - if(prob(30)) - r_pocket = /obj/item/kitchen/knife/combat/bone - if(prob(30)) - l_pocket = /obj/item/kitchen/knife/combat/bone + if("Golem") mob_species = pickweight(list( /datum/species/golem/adamantine = 5, @@ -791,23 +734,95 @@ /obj/item/weldingtool/experimental ) ) - if("YeOlde") - mob_gender = FEMALE - uniform = /obj/item/clothing/under/costume/maid - gloves = /obj/item/clothing/gloves/color/white - shoes = /obj/item/clothing/shoes/laceup - head = /obj/item/clothing/head/helmet/knight - suit = /obj/item/clothing/suit/armor/riot/knight - back = /obj/item/shield/riot/buckler - belt = /obj/item/nullrod/claymore - r_pocket = /obj/item/tank/internals/emergency_oxygen - mask = /obj/item/clothing/mask/breath - if("Operative") - id_job = "Operative" - if(prob(15)) - outfit = /datum/outfit/syndicatestormtroopercorpse + + if("Kobold") + mob_species = /datum/species/lizard/ashwalker/kobold + uniform = /obj/item/clothing/under/costume/gladiator/ash_walker + if(prob(95)) + head = /obj/item/clothing/head/helmet/gladiator else - outfit = /datum/outfit/syndicatecommandocorpse + head = /obj/item/clothing/head/helmet/skull + suit = /obj/item/clothing/suit/armor/bone + gloves = /obj/item/clothing/gloves/bracer + if(prob(5)) + back = pickweight(list( + /obj/item/spear/bonespear = 3, + /obj/item/fireaxe/boneaxe = 2 + ) + ) + if(prob(10)) + belt = /obj/item/storage/belt/mining/primitive + if(prob(30)) + r_pocket = /obj/item/kitchen/knife/combat/bone + if(prob(30)) + l_pocket = /obj/item/kitchen/knife/combat/bone + + if("Soldier") + mob_species = /datum/species/human + if(prob(90)) + uniform = /obj/item/clothing/under/solgov + suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov + shoes = /obj/item/clothing/shoes/jackboots + gloves = /obj/item/clothing/gloves/color/black + mask = /obj/item/clothing/mask/gas/sechailer + head = /obj/item/clothing/head/solgov/sonnensoldner + id = /obj/item/card/id/solgov + else + uniform = /obj/item/clothing/under/solgov + suit = /obj/item/clothing/suit/space/hardsuit/solgov + shoes = /obj/item/clothing/shoes/combat + gloves = /obj/item/clothing/gloves/combat + mask = /obj/item/clothing/mask/gas/sechailer/swat + id = /obj/item/card/id/solgov + if(prob(85)) + back = /obj/item/storage/backpack + backpack_contents = list() + for(var/i = 1 to 3) + if(prob(75)) + backpack_contents += pickweight(list( + /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 1, + /obj/item/storage/firstaid/tactical = 1, + /obj/item/gun/ballistic/automatic/pistol/solgov = 1, + /obj/item/gps = 1, + /obj/item/stock_parts/cell/gun/upgraded = 2, + /obj/item/ammo_box/magazine/pistol556mm = 3, + /obj/item/desk_flag/solgov = 3, + /obj/item/stack/marker_beacon/ten = 3, + /obj/item/detective_scanner = 2, + /obj/item/extinguisher/mini = 3, + /obj/item/kitchen/knife/combat = 3, + /obj/item/flashlight/seclite=3, + /obj/item/ammo_casing/shotgun = 3, + /obj/item/binoculars = 3, + /obj/item/clipboard = 3 + ) + ) + else + back = pickweight(list( + /obj/item/energyhalberd = 5, + /obj/item/gun/ballistic/rocketlauncher/unrestricted = 5 + ) + ) + if(prob(25)) + belt = /obj/item/storage/belt/military + if(prob(50)) + r_pocket = pickweight(list( + /obj/item/reagent_containers/hypospray/medipen/stimpack = 1, + /obj/item/kitchen/knife/letter_opener = 3, + /obj/item/radio/off = 3, + /obj/item/grenade/syndieminibomb/concussion = 1, + /obj/item/melee/transforming/energy/ctf/solgov = 1 + ) + ) + if(prob(70)) + glasses = pickweight(list( + /obj/item/clothing/glasses/sunglasses = 3, + /obj/item/clothing/glasses/hud/health = 3, + /obj/item/clothing/glasses/hud/health/night = 1, + /obj/item/clothing/glasses/night = 2 + ) + ) + if("Infiltrator")//WE FINALLY FOUND HIM uniform = /obj/item/clothing/under/syndicate/bloodred gloves = /obj/item/clothing/gloves/color/latex/nitrile/infiltrator @@ -844,6 +859,26 @@ /obj/item/flashlight/flashdark = 1 ) ) + + if("YeOlde") + mob_gender = FEMALE + uniform = /obj/item/clothing/under/costume/maid + gloves = /obj/item/clothing/gloves/color/white + shoes = /obj/item/clothing/shoes/laceup + head = /obj/item/clothing/head/helmet/knight + suit = /obj/item/clothing/suit/armor/riot/knight + back = /obj/item/shield/riot/buckler + belt = /obj/item/nullrod/claymore + r_pocket = /obj/item/tank/internals/emergency_oxygen + mask = /obj/item/clothing/mask/breath + + if("Operative") + id_job = "Operative" + if(prob(15)) + outfit = /datum/outfit/syndicatestormtroopercorpse + else + outfit = /datum/outfit/syndicatecommandocorpse + if("Shadow") mob_species = /datum/species/shadow r_pocket = /obj/item/reagent_containers/pill/shadowtoxin @@ -854,6 +889,7 @@ glasses = /obj/item/clothing/glasses/blindfold back = /obj/item/tank/internals/oxygen mask = /obj/item/clothing/mask/breath + if("Cultist") uniform = /obj/item/clothing/under/costume/roman suit = /obj/item/clothing/suit/hooded/cultrobes @@ -868,29 +904,4 @@ /obj/item/flashlight/flare/culttorch = 1, /obj/item/stack/sheet/runed_metal = 15 ) - if("SRM") - uniform = /obj/item/clothing/under/suit/roumain - shoes = /obj/item/clothing/shoes/workboots/mining - if(prob(50)) - suit = /obj/item/clothing/suit/armor/roumain/shadow - head = /obj/item/clothing/head/cowboy/sec/roumain/shadow - else - suit = /obj/item/clothing/suit/armor/roumain - head = /obj/item/clothing/head/cowboy/sec/roumain - if(prob(25)) - suit_store = /obj/item/gun/ballistic/shotgun/winchester - r_pocket = /obj/item/book/manual/trickwines_4_brewers - belt = pick(list(/obj/item/kitchen/knife/hunting = 1, /obj/item/gun/ballistic/derringer = 1)) - back = /obj/item/storage/backpack/cultpack - backpack_contents = list() - if(prob(75)) - backpack_contents += list(/obj/item/ammo_box/c38_box = 1) - if(prob(75)) - backpack_contents += list(pick( - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine,) = 2) . = ..() From 5842d5d79000d0c9d4a6d00b86db28d9c7991cc0 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sat, 25 Nov 2023 01:51:53 -0600 Subject: [PATCH 04/70] glasses c: --- .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 520e6232f00a..9f1c22b1912e 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -830,7 +830,8 @@ head = /obj/item/clothing/head/helmet/infiltrator shoes = /obj/item/clothing/shoes/combat/sneakboots ears = /obj/item/radio/headset - glasses = /obj/item/clothing/glasses/regular/circle + if(prob(25)) + glasses = /obj/item/clothing/glasses/regular/circle mask = new /obj/item/clothing/mask/infiltrator back = /obj/item/storage/backpack/satchel/leather backpack_contents = list() From 8d4425147dab37236980bc9aca6eda373153126f Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sat, 25 Nov 2023 02:01:53 -0600 Subject: [PATCH 05/70] tweaking the loot for infiltrator --- .../hostile/mining_mobs/hivelord.dm | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 9f1c22b1912e..f7708b5d32ea 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -832,32 +832,33 @@ ears = /obj/item/radio/headset if(prob(25)) glasses = /obj/item/clothing/glasses/regular/circle - mask = new /obj/item/clothing/mask/infiltrator + mask = /obj/item/clothing/mask/infiltrator + id = /obj/item/card/id/syndicate back = /obj/item/storage/backpack/satchel/leather backpack_contents = list() for(var/i = 1 to 3) if(prob(50)) backpack_contents += pickweight(list( - /obj/item/shadowcloak = 1, - /obj/item/reagent_containers/syringe/mulligan = 2, - /obj/item/clothing/head/chameleon/broken = 3, - /obj/item/stack/marker_beacon/ten = 3, - /obj/item/grenade/smokebomb = 3, - /obj/item/grenade/flashbang = 3 + + /obj/item/pen/sleepy = 3, + /obj/item/pen/edagger = 3, + /obj/item/reagent_containers/syringe/mulligan = 3, + /obj/item/suppressor = 5, + /obj/item/clothing/head/chameleon/broken = 5, + /obj/item/grenade/smokebomb = 5, + /obj/item/grenade/flashbang = 5 ) ) if(prob(25)) r_pocket = pickweight(list( - /obj/item/chameleon, + /obj/item/chameleon = 1, /obj/item/dnainjector/chameleonmut = 1, - /obj/item/flashlight/flashdark = 1 ) ) if(prob(25)) l_pocket = pickweight(list( - /obj/item/chameleon, + /obj/item/chameleon = 1, /obj/item/dnainjector/chameleonmut = 1, - /obj/item/flashlight/flashdark = 1 ) ) From 45882a2efe4176b74b9207c8d87547d5da093cd4 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sat, 25 Nov 2023 02:03:37 -0600 Subject: [PATCH 06/70] replaces the broken cham with full kit --- .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index f7708b5d32ea..b11e13aa93b0 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -839,12 +839,11 @@ for(var/i = 1 to 3) if(prob(50)) backpack_contents += pickweight(list( - /obj/item/pen/sleepy = 3, /obj/item/pen/edagger = 3, /obj/item/reagent_containers/syringe/mulligan = 3, /obj/item/suppressor = 5, - /obj/item/clothing/head/chameleon/broken = 5, + /obj/item/storage/box/syndie_kit/chameleon = 5, /obj/item/grenade/smokebomb = 5, /obj/item/grenade/flashbang = 5 ) From 55730ba1a8fc5ce108304116f7a3e0578ef02998 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sat, 25 Nov 2023 02:23:07 -0600 Subject: [PATCH 07/70] a gun --- .../living/simple_animal/hostile/mining_mobs/hivelord.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index b11e13aa93b0..1fd99d084e60 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -848,6 +848,12 @@ /obj/item/grenade/flashbang = 5 ) ) + if(prob(70)) + backpack_contents += (list( + /obj/item/gun/ballistic/automatic/pistol/APS, + /obj/item/ammo_box/magazine/pistolm9mm + ) + ) if(prob(25)) r_pocket = pickweight(list( /obj/item/chameleon = 1, From 054d8a91de7eb5b49c4c28defc877c4eb3f02217 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sat, 25 Nov 2023 02:31:19 -0600 Subject: [PATCH 08/70] cool glasses --- .../simple_animal/hostile/mining_mobs/hivelord.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 1fd99d084e60..67bd4dd04a31 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -830,8 +830,14 @@ head = /obj/item/clothing/head/helmet/infiltrator shoes = /obj/item/clothing/shoes/combat/sneakboots ears = /obj/item/radio/headset - if(prob(25)) - glasses = /obj/item/clothing/glasses/regular/circle + if(prob(70)) + glasses = pickweight(list( + /obj/item/clothing/glasses/regular/circle = 1, + /obj/item/clothing/glasses/sunglasses = 3, + /obj/item/clothing/glasses/thermal/syndi = 2, + /obj/item/clothing/glasses/night = 2 + ) + ) mask = /obj/item/clothing/mask/infiltrator id = /obj/item/card/id/syndicate back = /obj/item/storage/backpack/satchel/leather From b044626f404c1cd1ca05fdf0e23ecc79a53e5b2e Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sat, 25 Nov 2023 11:42:53 -0600 Subject: [PATCH 09/70] tweaks to operative --- .../hostile/mining_mobs/hivelord.dm | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 67bd4dd04a31..da0bfc123213 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -781,14 +781,13 @@ if(prob(75)) backpack_contents += pickweight(list( /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 1, - /obj/item/storage/firstaid/tactical = 1, + /obj/item/storage/firstaid/advanced = 1, /obj/item/gun/ballistic/automatic/pistol/solgov = 1, /obj/item/gps = 1, /obj/item/stock_parts/cell/gun/upgraded = 2, /obj/item/ammo_box/magazine/pistol556mm = 3, /obj/item/desk_flag/solgov = 3, /obj/item/stack/marker_beacon/ten = 3, - /obj/item/detective_scanner = 2, /obj/item/extinguisher/mini = 3, /obj/item/kitchen/knife/combat = 3, /obj/item/flashlight/seclite=3, @@ -829,18 +828,18 @@ suit = /obj/item/clothing/suit/armor/vest/infiltrator head = /obj/item/clothing/head/helmet/infiltrator shoes = /obj/item/clothing/shoes/combat/sneakboots - ears = /obj/item/radio/headset + ears = /obj/item/radio/headset/syndicate if(prob(70)) glasses = pickweight(list( /obj/item/clothing/glasses/regular/circle = 1, - /obj/item/clothing/glasses/sunglasses = 3, /obj/item/clothing/glasses/thermal/syndi = 2, - /obj/item/clothing/glasses/night = 2 + /obj/item/clothing/glasses/night = 2, + /obj/item/clothing/glasses/sunglasses = 3 ) ) mask = /obj/item/clothing/mask/infiltrator id = /obj/item/card/id/syndicate - back = /obj/item/storage/backpack/satchel/leather + back = /obj/item/storage/backpack backpack_contents = list() for(var/i = 1 to 3) if(prob(50)) @@ -887,10 +886,27 @@ if("Operative") id_job = "Operative" - if(prob(15)) - outfit = /datum/outfit/syndicatestormtroopercorpse + uniform = /obj/item/clothing/under/syndicate + shoes = /obj/item/clothing/shoes/combat + ears = /obj/item/radio/headset/syndicate + id = /obj/item/card/id/syndicate + r_pocket = /obj/item/tank/internals/emergency_oxygen + if(prob(25)) + suit = /obj/item/clothing/suit/space/hardsuit/syndi/scarlet + gloves = /obj/item/clothing/gloves/tackler/combat/insulated + mask = /obj/item/clothing/mask/gas/syndicate + back = /obj/item/tank/jetpack/oxygen + if else(prob(25)) + suit = /obj/item/clothing/head/helmet/space/hardsuit/syndi + gloves = /obj/item/clothing/gloves/tackler/combat/insulated + mask = /obj/item/clothing/mask/gas/syndicate + back = /obj/item/tank/jetpack/oxygen else - outfit = /datum/outfit/syndicatecommandocorpse + suit = /obj/item/clothing/suit/armor/vest + gloves = /obj/item/clothing/gloves/tackler/combat/insulated + mask = /obj/item/clothing/mask/gas + head = /obj/item/clothing/head/helmet/swat + back = /obj/item/storage/backpack if("Shadow") mob_species = /datum/species/shadow From 884bf0e79aed18e2c5d2dd80ba4543a26a967049 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sat, 25 Nov 2023 11:44:08 -0600 Subject: [PATCH 10/70] gloves --- .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index da0bfc123213..a3279be6322b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -891,19 +891,17 @@ ears = /obj/item/radio/headset/syndicate id = /obj/item/card/id/syndicate r_pocket = /obj/item/tank/internals/emergency_oxygen + gloves = /obj/item/clothing/gloves/tackler/combat/insulated if(prob(25)) suit = /obj/item/clothing/suit/space/hardsuit/syndi/scarlet - gloves = /obj/item/clothing/gloves/tackler/combat/insulated mask = /obj/item/clothing/mask/gas/syndicate back = /obj/item/tank/jetpack/oxygen if else(prob(25)) suit = /obj/item/clothing/head/helmet/space/hardsuit/syndi - gloves = /obj/item/clothing/gloves/tackler/combat/insulated mask = /obj/item/clothing/mask/gas/syndicate back = /obj/item/tank/jetpack/oxygen else suit = /obj/item/clothing/suit/armor/vest - gloves = /obj/item/clothing/gloves/tackler/combat/insulated mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/helmet/swat back = /obj/item/storage/backpack From c68df9b089555fa72d463dfd0ba2f66fec11fd4e Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sat, 25 Nov 2023 11:45:30 -0600 Subject: [PATCH 11/70] hardsuit was helmet --- .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index a3279be6322b..0c5923700c70 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -897,7 +897,7 @@ mask = /obj/item/clothing/mask/gas/syndicate back = /obj/item/tank/jetpack/oxygen if else(prob(25)) - suit = /obj/item/clothing/head/helmet/space/hardsuit/syndi + suit = /obj/item/clothing/suit/space/hardsuit/syndi mask = /obj/item/clothing/mask/gas/syndicate back = /obj/item/tank/jetpack/oxygen else From a8f970ac19388f50c5f2a08c65bcf0fef9d451b6 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sat, 25 Nov 2023 11:46:05 -0600 Subject: [PATCH 12/70] no thermals --- .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 0c5923700c70..21682d41e253 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -832,7 +832,6 @@ if(prob(70)) glasses = pickweight(list( /obj/item/clothing/glasses/regular/circle = 1, - /obj/item/clothing/glasses/thermal/syndi = 2, /obj/item/clothing/glasses/night = 2, /obj/item/clothing/glasses/sunglasses = 3 ) From f3ab61efd66a85b02f215c9d6f386655b6f74cc3 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sat, 25 Nov 2023 13:24:45 -0600 Subject: [PATCH 13/70] backwards statment --- .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 21682d41e253..3d5d9343895f 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -895,7 +895,7 @@ suit = /obj/item/clothing/suit/space/hardsuit/syndi/scarlet mask = /obj/item/clothing/mask/gas/syndicate back = /obj/item/tank/jetpack/oxygen - if else(prob(25)) + else if(prob(25)) suit = /obj/item/clothing/suit/space/hardsuit/syndi mask = /obj/item/clothing/mask/gas/syndicate back = /obj/item/tank/jetpack/oxygen From f357feaac3b7d9d2886485e81ba272db06b3a42e Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sun, 26 Nov 2023 17:09:44 -0600 Subject: [PATCH 14/70] unsure why i am failing tests --- .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 3d5d9343895f..f0d34b3897cc 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -822,7 +822,7 @@ ) ) - if("Infiltrator")//WE FINALLY FOUND HIM + if("Infiltrator") uniform = /obj/item/clothing/under/syndicate/bloodred gloves = /obj/item/clothing/gloves/color/latex/nitrile/infiltrator suit = /obj/item/clothing/suit/armor/vest/infiltrator From bbdce8857ad42f0d51c6f09c2211af91c82b3c92 Mon Sep 17 00:00:00 2001 From: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com> Date: Tue, 28 Nov 2023 18:16:24 -0600 Subject: [PATCH 15/70] Apply suggestions from code review Co-authored-by: Mark Suckerberg Signed-off-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com> --- .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index f0d34b3897cc..d01ebeb7185f 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -585,7 +585,7 @@ if(prob(85)) back = /obj/item/storage/backpack/explorer //someone could totally make these backpacks a subtype and just have them be there. It'd cut down this file size a bit. backpack_contents = list() - for(var/i = 1 to 3) + for(var/count in 1 to 3) if(prob(70)) backpack_contents += pickweight(list( /obj/item/borg/upgrade/modkit/damage = 1, @@ -671,7 +671,7 @@ if(prob(70)) back = /obj/item/storage/backpack backpack_contents = list() - for(var/i = 1 to 3) + for(var/count in 1 to 3) if(prob(75)) backpack_contents += pickweight(list( /obj/item/slime_extract/grey = 1, From 6ed38c79f24876ef049378ff141896038d326bdb Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Tue, 28 Nov 2023 18:20:28 -0600 Subject: [PATCH 16/70] yuh --- .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index d01ebeb7185f..6e143d27b17c 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -411,14 +411,13 @@ ) var/type = pickweight(list( "Miner" = 44, - "SRM" = 10, + "SRM" = 12, "Oldminer" = 8, "Ashwalker" = 7, "Golem" = 6, "Kobold" = 5, "Soldier" = 3, - "Infiltrator" = 3, - pick("YeOlde", "Operative", "Shadow", "Cultist") = 4 + pick("Infiltrator", "YeOlde", "Operative", "Shadow", "Cultist") = 5 ) ) switch(type) From 6d052a46136343c617c3ea208c98bb594cd0c027 Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 07:31:36 -0600 Subject: [PATCH 17/70] wanna test if this works --- .../hostile/mining_mobs/hivelord.dm | 226 +++--------------- .../hostile/mining_mobs/hivelord_outfits.dm | 51 ++++ 2 files changed, 80 insertions(+), 197 deletions(-) create mode 100644 code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 6e143d27b17c..0dc589b3acd5 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -410,14 +410,9 @@ ) ) var/type = pickweight(list( - "Miner" = 44, - "SRM" = 12, - "Oldminer" = 8, - "Ashwalker" = 7, - "Golem" = 6, - "Kobold" = 5, - "Soldier" = 3, - pick("Infiltrator", "YeOlde", "Operative", "Shadow", "Cultist") = 5 + "Miner" = 50, + "Plain" = 40, + pick("Infiltrator", "Operative", "Soldier", "SRM") = 10 ) ) switch(type) @@ -544,33 +539,8 @@ ) else back = /obj/item/kinetic_crusher - - if("SRM") - uniform = /obj/item/clothing/under/suit/roumain - shoes = /obj/item/clothing/shoes/workboots/mining - if(prob(50)) - suit = /obj/item/clothing/suit/armor/roumain/shadow - head = /obj/item/clothing/head/cowboy/sec/roumain/shadow - else - suit = /obj/item/clothing/suit/armor/roumain - head = /obj/item/clothing/head/cowboy/sec/roumain - if(prob(25)) - suit_store = /obj/item/gun/ballistic/shotgun/winchester - r_pocket = /obj/item/book/manual/trickwines_4_brewers - belt = pick(list(/obj/item/kitchen/knife/hunting = 1, /obj/item/gun/ballistic/derringer = 1)) - back = /obj/item/storage/backpack/cultpack - backpack_contents = list() - if(prob(75)) - backpack_contents += list(/obj/item/ammo_box/c38_box = 1) - if(prob(75)) - backpack_contents += list(pick( - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine,) = 2) - + if("Plain") + outfit = /datum/outfit/generic if("Oldminer") suit = /obj/item/clothing/suit/hooded/explorer/old mask = /obj/item/clothing/mask/gas/explorer/old @@ -632,130 +602,6 @@ /obj/item/borg/upgrade/modkit/cooldown = 1 ) ) - - if("Ashwalker") - mob_species = /datum/species/lizard/ashwalker - uniform = /obj/item/clothing/under/costume/gladiator/ash_walker - if(prob(95)) - head = /obj/item/clothing/head/helmet/gladiator - else - head = /obj/item/clothing/head/helmet/skull - suit = /obj/item/clothing/suit/armor/bone - gloves = /obj/item/clothing/gloves/bracer - if(prob(45)) - back = pickweight(list( - /obj/item/spear/bonespear = 3, - /obj/item/fireaxe/boneaxe = 2 - ) - ) - if(prob(10)) - belt = /obj/item/storage/belt/mining/primitive - if(prob(30)) - r_pocket = /obj/item/restraints/legcuffs/bola/watcher - if(prob(30)) - l_pocket = /obj/item/kitchen/knife/combat/bone - - if("Golem") - mob_species = pickweight(list( - /datum/species/golem/adamantine = 5, - /datum/species/golem/plasma = 10, - /datum/species/golem/diamond = 10, - /datum/species/golem/gold = 10, - /datum/species/golem/silver = 10, - /datum/species/golem/plasteel = 10, - /datum/species/golem/titanium = 10, - /datum/species/golem/plastitanium = 10 - ) - ) - if(prob(70)) - back = /obj/item/storage/backpack - backpack_contents = list() - for(var/count in 1 to 3) - if(prob(75)) - backpack_contents += pickweight(list( - /obj/item/slime_extract/grey = 1, - /obj/item/slime_scanner = 1, - /obj/item/resonator/upgraded = 1, - /obj/item/gps = 1, - /obj/item/fulton_core = 2, - /obj/item/extraction_pack = 3, - /obj/item/stack/sheet/mineral/plasma/twenty = 3, - /obj/item/stack/marker_beacon/ten = 3, - /obj/item/mining_scanner = 2, - /obj/item/extinguisher/mini = 3, - /obj/item/flashlight/seclite=3, - /obj/item/research_notes/loot/medium = 3, - /obj/item/stack/sheet/metal/fifty = 3, - /obj/item/research_notes/loot/big = 1 - ) - ) - if(prob(3)) - backpack_contents += list( - /obj/item/storage/box/rndboards - ) - if(prob(20)) - backpack_contents += pickweight(list( - /obj/item/storage/box/stockparts/basic = 4, - /obj/item/storage/box/stockparts/t2 = 3, - /obj/item/storage/box/stockparts/t3 = 2, - /obj/item/storage/box/stockparts/deluxe = 1 - ) - ) - if(prob(30)) - glasses = pickweight(list( - /obj/item/clothing/glasses/meson = 2, - /obj/item/clothing/glasses/hud/health = 2, - /obj/item/clothing/glasses/hud/diagnostic =2, - /obj/item/clothing/glasses/science = 2, - /obj/item/clothing/glasses/welding = 2, - /obj/item/clothing/glasses/night = 1 - ) - ) - if(prob(10)) - belt = pickweight(list( - /obj/item/storage/belt/mining/vendor, - /obj/item/storage/belt/utility/full - ) - ) - if(prob(50)) - neck = /obj/item/bedsheet/rd/royal_cape - if(prob(10)) - l_pocket = pickweight(list( - /obj/item/crowbar/power, - /obj/item/screwdriver/power, - /obj/item/weldingtool/experimental - ) - ) - if(prob(10)) - r_pocket = pickweight(list( - /obj/item/crowbar/power, - /obj/item/screwdriver/power, - /obj/item/weldingtool/experimental - ) - ) - - if("Kobold") - mob_species = /datum/species/lizard/ashwalker/kobold - uniform = /obj/item/clothing/under/costume/gladiator/ash_walker - if(prob(95)) - head = /obj/item/clothing/head/helmet/gladiator - else - head = /obj/item/clothing/head/helmet/skull - suit = /obj/item/clothing/suit/armor/bone - gloves = /obj/item/clothing/gloves/bracer - if(prob(5)) - back = pickweight(list( - /obj/item/spear/bonespear = 3, - /obj/item/fireaxe/boneaxe = 2 - ) - ) - if(prob(10)) - belt = /obj/item/storage/belt/mining/primitive - if(prob(30)) - r_pocket = /obj/item/kitchen/knife/combat/bone - if(prob(30)) - l_pocket = /obj/item/kitchen/knife/combat/bone - if("Soldier") mob_species = /datum/species/human if(prob(90)) @@ -869,19 +715,6 @@ /obj/item/dnainjector/chameleonmut = 1, ) ) - - if("YeOlde") - mob_gender = FEMALE - uniform = /obj/item/clothing/under/costume/maid - gloves = /obj/item/clothing/gloves/color/white - shoes = /obj/item/clothing/shoes/laceup - head = /obj/item/clothing/head/helmet/knight - suit = /obj/item/clothing/suit/armor/riot/knight - back = /obj/item/shield/riot/buckler - belt = /obj/item/nullrod/claymore - r_pocket = /obj/item/tank/internals/emergency_oxygen - mask = /obj/item/clothing/mask/breath - if("Operative") id_job = "Operative" uniform = /obj/item/clothing/under/syndicate @@ -903,30 +736,29 @@ mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/helmet/swat back = /obj/item/storage/backpack - - if("Shadow") - mob_species = /datum/species/shadow - r_pocket = /obj/item/reagent_containers/pill/shadowtoxin - neck = /obj/item/clothing/accessory/medal/plasma/nobel_science - uniform = /obj/item/clothing/under/color/black - shoes = /obj/item/clothing/shoes/sneakers/black - suit = /obj/item/clothing/suit/toggle/labcoat - glasses = /obj/item/clothing/glasses/blindfold - back = /obj/item/tank/internals/oxygen - mask = /obj/item/clothing/mask/breath - - if("Cultist") - uniform = /obj/item/clothing/under/costume/roman - suit = /obj/item/clothing/suit/hooded/cultrobes - suit_store = /obj/item/tome - r_pocket = /obj/item/restraints/legcuffs/bola/cult - l_pocket = /obj/item/melee/cultblade/dagger - glasses = /obj/item/clothing/glasses/hud/health/night/cultblind + if("SRM") + uniform = /obj/item/clothing/under/suit/roumain + shoes = /obj/item/clothing/shoes/workboots/mining + if(prob(50)) + suit = /obj/item/clothing/suit/armor/roumain/shadow + head = /obj/item/clothing/head/cowboy/sec/roumain/shadow + else + suit = /obj/item/clothing/suit/armor/roumain + head = /obj/item/clothing/head/cowboy/sec/roumain + if(prob(25)) + suit_store = /obj/item/gun/ballistic/shotgun/winchester + r_pocket = /obj/item/book/manual/trickwines_4_brewers + belt = pick(list(/obj/item/kitchen/knife/hunting = 1, /obj/item/gun/ballistic/derringer = 1)) back = /obj/item/storage/backpack/cultpack - backpack_contents = list( - /obj/item/reagent_containers/glass/beaker/unholywater = 1, - /obj/item/cult_shift = 1, - /obj/item/flashlight/flare/culttorch = 1, - /obj/item/stack/sheet/runed_metal = 15 - ) + backpack_contents = list() + if(prob(75)) + backpack_contents += list(/obj/item/ammo_box/c38_box = 1) + if(prob(75)) + backpack_contents += list(pick( + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine, + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine, + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine, + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine, + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine, + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine,) = 2) . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm new file mode 100644 index 000000000000..12fedb3e76ee --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -0,0 +1,51 @@ +/datum/outfit/generic/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + uniform = pickweight(list( + /obj/item/clothing/under/utility = 1, + /obj/item/clothing/under/utility/skirt = 1, + /obj/item/clothing/under/color/black = 1, + /obj/item/clothing/under/color/white = 1, + /obj/item/clothing/under/color/random = 1, + /obj/item/clothing/under/shorts/black = 1, + /obj/item/clothing/under/shorts/grey = 1, + /obj/item/clothing/under/shorts/blue = 1, + /obj/item/clothing/under/shorts/green = 1, + /obj/item/clothing/under/pants/jeans = 1, + /obj/item/clothing/under/pants/khaki = 1, + /obj/item/clothing/under/pants/tan = 1, + /obj/item/clothing/under/pants/white = 1, + /obj/item/clothing/under/pants/red = 1, + /obj/item/clothing/under/pants/track = 1, + /obj/item/clothing/under/pants/blackjeans = 1, + /obj/item/clothing/under/pants/black = 1, + /obj/item/clothing/under/pants/camo = 1, + /obj/item/clothing/under/suit/sl = 1, + /obj/item/clothing/under/suit/white = 1, + /obj/item/clothing/under/suit/tan = 1, + /obj/item/clothing/under/suit/black_really = 1, + /obj/item/clothing/under/suit/black_really/skirt = 1, + /obj/item/clothing/under/suit/navy = 1, + /obj/item/clothing/under/suit/burgundy = 1, + /obj/item/clothing/under/suit/charcoal = 1, + /obj/item/clothing/under/rank/civilian/lawyer/galaxy = 1, + /obj/item/clothing/under/suit/black/skirt = 1, + /obj/item/clothing/under/rank/command/captain/suit/skirt = 1, + /obj/item/clothing/under/rank/command/head_of_personnel/suit/skirt = 1, + /obj/item/clothing/under/suit/black = 1, + /obj/item/clothing/under/suit/checkered = 1, + /obj/item/clothing/under/dress/sailor = 1, + /obj/item/clothing/under/dress/striped = 1, + /obj/item/clothing/under/dress/skirt/purple = 1, + /obj/item/clothing/under/dress/skirt/blue = 1, + /obj/item/clothing/under/dress/skirt/red = 1, + /obj/item/clothing/under/dress/skirt = 1, + /obj/item/clothing/under/dress/sundress = 1, + /obj/item/clothing/under/suit/dresssuit = 1, + /obj/item/clothing/under/suit/dresssuit/skirt = 1, + /obj/item/clothing/under/syndicate/tacticool = 1, + /obj/item/clothing/under/costume/maid = 1 + ) + ) + +/datum/outfit/generic + name "Generic" From f811f5b69f57dc457b8fd4ff3273f8e47de50a6b Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 08:03:12 -0600 Subject: [PATCH 18/70] shrug --- .../hostile/mining_mobs/hivelord_outfits.dm | 43 ++++++++++++++----- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 12fedb3e76ee..5291ecd3aac6 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -19,33 +19,54 @@ /obj/item/clothing/under/pants/blackjeans = 1, /obj/item/clothing/under/pants/black = 1, /obj/item/clothing/under/pants/camo = 1, - /obj/item/clothing/under/suit/sl = 1, /obj/item/clothing/under/suit/white = 1, /obj/item/clothing/under/suit/tan = 1, /obj/item/clothing/under/suit/black_really = 1, - /obj/item/clothing/under/suit/black_really/skirt = 1, /obj/item/clothing/under/suit/navy = 1, /obj/item/clothing/under/suit/burgundy = 1, /obj/item/clothing/under/suit/charcoal = 1, /obj/item/clothing/under/rank/civilian/lawyer/galaxy = 1, /obj/item/clothing/under/suit/black/skirt = 1, - /obj/item/clothing/under/rank/command/captain/suit/skirt = 1, - /obj/item/clothing/under/rank/command/head_of_personnel/suit/skirt = 1, /obj/item/clothing/under/suit/black = 1, - /obj/item/clothing/under/suit/checkered = 1, /obj/item/clothing/under/dress/sailor = 1, /obj/item/clothing/under/dress/striped = 1, - /obj/item/clothing/under/dress/skirt/purple = 1, /obj/item/clothing/under/dress/skirt/blue = 1, - /obj/item/clothing/under/dress/skirt/red = 1, - /obj/item/clothing/under/dress/skirt = 1, - /obj/item/clothing/under/dress/sundress = 1, - /obj/item/clothing/under/suit/dresssuit = 1, - /obj/item/clothing/under/suit/dresssuit/skirt = 1, /obj/item/clothing/under/syndicate/tacticool = 1, /obj/item/clothing/under/costume/maid = 1 ) ) + suit = pickweight(list( + /obj/item/clothing/suit/hooded/wintercoat = 1, + /obj/item/clothing/suit/jacket = 1, + /obj/item/clothing/suit/jacket/leather = 1, + /obj/item/clothing/suit/jacket/leather/overcoat = 1, + /obj/item/clothing/suit/jacket/leather/duster = 1, + /obj/item/clothing/suit/jacket/miljacket = 1, + /obj/item/clothing/suit/jacket/puffer = 1, + /obj/item/clothing/suit/gothcoat = 1, + /obj/item/clothing/suit/jacket/hoodie/black = 1, + /obj/item/clothing/suit/jacket/hoodie/red = 1, + /obj/item/clothing/suit/jacket/hoodie/blue = 1, + /obj/item/clothing/suit/jacket/hoodie/gray = 1, + /obj/item/clothing/suit/toggle/industrial = 1, + /obj/item/clothing/suit/toggle/hazard = 1, + /obj/item/clothing/suit/poncho/green = 1, + /obj/item/clothing/suit/apron/overalls = 1, + /obj/item/clothing/suit/ianshirt = 1 + ) + ) + shoes = pickweight(list( + /obj/item/clothing/shoes/laceup = 1, + /obj/item/clothing/shoes/sandal = 1, + /obj/item/clothing/shoes/winterboots = 1, + /obj/item/clothing/shoes/jackboots = 1, + /obj/item/clothing/shoes/workboots/mining = 1, + /obj/item/clothing/shoes/workboots = 1, + /obj/item/clothing/shoes/sneakers/black = 1, + /obj/item/clothing/shoes/sneakers/brown = 1, + /obj/item/clothing/shoes/sneakers/white = 1 + ) + ) /datum/outfit/generic name "Generic" From a3e9294e6ba9dc68980c920ba6bf631e4169b574 Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 08:15:03 -0600 Subject: [PATCH 19/70] forgot the include --- .../hostile/mining_mobs/hivelord_outfits.dm | 32 ++++++++++++++++++- shiptest.dme | 1 + 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 5291ecd3aac6..25fb67bc8679 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -32,7 +32,6 @@ /obj/item/clothing/under/dress/striped = 1, /obj/item/clothing/under/dress/skirt/blue = 1, /obj/item/clothing/under/syndicate/tacticool = 1, - /obj/item/clothing/under/costume/maid = 1 ) ) suit = pickweight(list( @@ -67,6 +66,37 @@ /obj/item/clothing/shoes/sneakers/white = 1 ) ) + glasses = pickweight(list( + /obj/item/clothing/glasses/regular = 1, + /obj/item/clothing/glasses/regular/circle = 1, + /obj/item/clothing/glasses/regular/jamjar = 1, + /obj/item/clothing/glasses/eyepatch = 1, + /obj/item/clothing/glasses/cheapsuns = 1, + /obj/item/clothing/glasses/regular/hipster = 1, + /obj/item/clothing/glasses/cold = 1, + /obj/item/clothing/glasses/heat = 1, + /obj/item/clothing/glasses/orange = 1, + /obj/item/clothing/glasses/red = 1 + ) + ) + if(prob(50)) + gloves = pickweight(list( + /obj/item/clothing/gloves/color/black = 1, + /obj/item/clothing/gloves/color/white = 1, + /obj/item/clothing/gloves/color/evening = 1, + ) + ) + if(prob(50)) + neck = pickweight(list( + /obj/item/clothing/neck/scarf/red = 1, + /obj/item/clothing/neck/scarf/green = 1, + /obj/item/clothing/neck/scarf/darkblue = 1, + /obj/item/clothing/neck/shemagh = 1, + /obj/item/clothing/neck/stripedredscarf = 1, + /obj/item/clothing/neck/stripedgreenscarf = 1, + /obj/item/clothing/neck/stripedbluescarf = 1 + ) + ) /datum/outfit/generic name "Generic" diff --git a/shiptest.dme b/shiptest.dme index ea4b5af13172..5d6b0c415129 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -2717,6 +2717,7 @@ #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\goldgrub.dm" #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\goliath.dm" #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\gutlunch.dm" +#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\hivelord_outfits.dm" #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\hivelord.dm" #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\ice demon.dm" #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\ice whelp.dm" From 94665b1c5923e75b5fc422919abe58385a1b20d0 Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 08:24:19 -0600 Subject: [PATCH 20/70] dunno --- .../hostile/mining_mobs/hivelord_outfits.dm | 53 +++++++++++++------ 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 25fb67bc8679..90a6b94e17b2 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -43,10 +43,6 @@ /obj/item/clothing/suit/jacket/miljacket = 1, /obj/item/clothing/suit/jacket/puffer = 1, /obj/item/clothing/suit/gothcoat = 1, - /obj/item/clothing/suit/jacket/hoodie/black = 1, - /obj/item/clothing/suit/jacket/hoodie/red = 1, - /obj/item/clothing/suit/jacket/hoodie/blue = 1, - /obj/item/clothing/suit/jacket/hoodie/gray = 1, /obj/item/clothing/suit/toggle/industrial = 1, /obj/item/clothing/suit/toggle/hazard = 1, /obj/item/clothing/suit/poncho/green = 1, @@ -66,19 +62,36 @@ /obj/item/clothing/shoes/sneakers/white = 1 ) ) - glasses = pickweight(list( - /obj/item/clothing/glasses/regular = 1, - /obj/item/clothing/glasses/regular/circle = 1, - /obj/item/clothing/glasses/regular/jamjar = 1, - /obj/item/clothing/glasses/eyepatch = 1, - /obj/item/clothing/glasses/cheapsuns = 1, - /obj/item/clothing/glasses/regular/hipster = 1, - /obj/item/clothing/glasses/cold = 1, - /obj/item/clothing/glasses/heat = 1, - /obj/item/clothing/glasses/orange = 1, - /obj/item/clothing/glasses/red = 1 + if(prob(50)) + hat = pickweight(list( + /obj/item/clothing/head/hardhat = 1, + /obj/item/clothing/head/hardhat/orange = 1, + /obj/item/clothing/head/hardhat/dblue = 1, + /obj/item/clothing/head/beret = 1, + /obj/item/clothing/head/beret/grey = 1, + /obj/item/clothing/head/beret/ce = 1, + /obj/item/clothing/head/flatcap = 1, + /obj/item/clothing/head/beanie = 1, + /obj/item/clothing/head/foilhat = 1, + /obj/item/clothing/head/cowboy = 1, + /obj/item/clothing/head/pirate = 1, + /obj/item/clothing/head/trapper = 1 + ) + ) + if(prob(50)) + glasses = pickweight(list( + /obj/item/clothing/glasses/regular = 1, + /obj/item/clothing/glasses/regular/circle = 1, + /obj/item/clothing/glasses/regular/jamjar = 1, + /obj/item/clothing/glasses/eyepatch = 1, + /obj/item/clothing/glasses/cheapsuns = 1, + /obj/item/clothing/glasses/regular/hipster = 1, + /obj/item/clothing/glasses/cold = 1, + /obj/item/clothing/glasses/heat = 1, + /obj/item/clothing/glasses/orange = 1, + /obj/item/clothing/glasses/red = 1 + ) ) - ) if(prob(50)) gloves = pickweight(list( /obj/item/clothing/gloves/color/black = 1, @@ -97,6 +110,14 @@ /obj/item/clothing/neck/stripedbluescarf = 1 ) ) + back = pickweight(list( + /obj/item/storage/backpack = 1, + /obj/item/storage/backpack/satchel = 1, + /obj/item/storage/backpack/duffelbag = 1, + /obj/item/storage/backpack/messenger = 1, + /obj/item/storage/backpack/satchel/leather = 1 + ) + ) /datum/outfit/generic name "Generic" From 74ea55a0b95a88a068aa1d495484aee163124a48 Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 08:29:06 -0600 Subject: [PATCH 21/70] fix --- .../hostile/mining_mobs/hivelord_outfits.dm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 90a6b94e17b2..05b59e0c6998 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -63,7 +63,7 @@ ) ) if(prob(50)) - hat = pickweight(list( + head = pickweight(list( /obj/item/clothing/head/hardhat = 1, /obj/item/clothing/head/hardhat/orange = 1, /obj/item/clothing/head/hardhat/dblue = 1, @@ -96,7 +96,6 @@ gloves = pickweight(list( /obj/item/clothing/gloves/color/black = 1, /obj/item/clothing/gloves/color/white = 1, - /obj/item/clothing/gloves/color/evening = 1, ) ) if(prob(50)) @@ -108,6 +107,13 @@ /obj/item/clothing/neck/stripedredscarf = 1, /obj/item/clothing/neck/stripedgreenscarf = 1, /obj/item/clothing/neck/stripedbluescarf = 1 + ) + ) + if(prob(50)) + mask = pickweight(list( + /obj/item/clothing/mask/balaclava = 1, + /obj/item/clothing/mask/bandana/red = 1, + ) ) back = pickweight(list( @@ -120,4 +126,3 @@ ) /datum/outfit/generic - name "Generic" From 7b67bbb11504211b0f1d8188a24ebd5feb172c85 Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 08:42:38 -0600 Subject: [PATCH 22/70] i cant even build rn cause im laptop gaming --- .../client/loadout/loadout_accessories.dm | 5 + .../hostile/mining_mobs/hivelord.dm | 123 +------------ .../hostile/mining_mobs/hivelord_outfits.dm | 169 +++++++++++++++++- 3 files changed, 174 insertions(+), 123 deletions(-) diff --git a/code/modules/client/loadout/loadout_accessories.dm b/code/modules/client/loadout/loadout_accessories.dm index b7f7944787db..1d60657c517d 100644 --- a/code/modules/client/loadout/loadout_accessories.dm +++ b/code/modules/client/loadout/loadout_accessories.dm @@ -81,6 +81,11 @@ description = "Standard hand coverings for everyday use." path = /obj/item/clothing/gloves/color/white +/datum/gear/accessory/gloves/fingerless + display_name = "fingerless gloves" + description = "Radical hand coverings for everyday use." + path = /obj/item/clothing/gloves/fingerless + /datum/gear/accessory/gloves/evening display_name = "evening gloves" description = "Excessively fancy elbow-length gloves." diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 0dc589b3acd5..21e369ba0912 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -417,128 +417,7 @@ ) switch(type) if("Miner") - if(prob(2)) - mob_species = /datum/species/plasmaman - uniform = /obj/item/clothing/under/plasmaman - head = /obj/item/clothing/head/helmet/space/plasmaman - belt = /obj/item/tank/internals/plasmaman/belt - else - uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland - if (prob(4)) - belt = pickweight(list( - /obj/item/storage/belt/mining = 2, - /obj/item/storage/belt/mining/alt = 2 - ) - ) - else if(prob(10)) - belt = pickweight(list( - /obj/item/pickaxe = 8, - /obj/item/pickaxe/mini = 4, - /obj/item/pickaxe/silver = 2, - /obj/item/pickaxe/diamond = 1, - /obj/item/gun/energy/kinetic_accelerator = 1 - ) - ) - else - belt = /obj/item/tank/internals/emergency_oxygen/engi - if(mob_species != /datum/species/lizard) - shoes = /obj/item/clothing/shoes/workboots/mining - gloves = /obj/item/clothing/gloves/color/black - mask = /obj/item/clothing/mask/gas/explorer - if(prob(45)) - glasses = /obj/item/clothing/glasses/meson - if(prob(20)) - suit = pickweight(list( - /obj/item/clothing/suit/hooded/explorer = 18, - /obj/item/clothing/suit/hooded/cloak/goliath = 2 - ) - ) - if(prob(30)) - r_pocket = pickweight(list( - /obj/item/stack/marker_beacon = 20, - /obj/item/spacecash/bundle/mediumrand = 7, - /obj/item/reagent_containers/hypospray/medipen/survival = 2, - /obj/item/borg/upgrade/modkit/damage = 1 - ) - ) - if(prob(10)) - l_pocket = pickweight(list( - /obj/item/spacecash/bundle/mediumrand = 7, - /obj/item/reagent_containers/hypospray/medipen/survival = 2, - /obj/item/borg/upgrade/modkit/cooldown = 1 - ) - ) - if(prob(95)) - back = /obj/item/storage/backpack/explorer - backpack_contents = list(/obj/item/radio) - if(prob(70)) - backpack_contents += pickweight(list( - /obj/item/borg/upgrade/modkit/damage = 1, - /obj/item/borg/upgrade/modkit/trigger_guard = 1, - /obj/item/soap/nanotrasen = 1, - /obj/item/wormhole_jaunter = 1, - /obj/item/fulton_core = 1, - /obj/item/extraction_pack = 2, - /obj/item/stack/sheet/animalhide/goliath_hide = 3, - /obj/item/hivelordstabilizer = 2, - /obj/item/stack/marker_beacon/ten = 2, - /obj/item/mining_scanner = 2, - /obj/item/extinguisher/mini = 2, - /obj/item/kitchen/knife/combat/survival = 3, - /obj/item/flashlight/seclite=3, - /obj/item/stack/sheet/sinew = 3, - /obj/item/stack/sheet/bone = 3 - ) - ) - if(prob(70)) - backpack_contents += pickweight(list( - /obj/item/borg/upgrade/modkit/damage = 1, - /obj/item/borg/upgrade/modkit/trigger_guard = 1, - /obj/item/soap/nanotrasen = 1, - /obj/item/wormhole_jaunter = 1, - /obj/item/fulton_core = 1, - /obj/item/extraction_pack = 2, - /obj/item/stack/sheet/animalhide/goliath_hide = 3, - /obj/item/hivelordstabilizer = 2, - /obj/item/stack/marker_beacon/ten = 2, - /obj/item/mining_scanner = 2, - /obj/item/extinguisher/mini = 2, - /obj/item/kitchen/knife/combat/survival = 3, - /obj/item/flashlight/seclite = 3, - /obj/item/stack/sheet/sinew = 3, - /obj/item/stack/sheet/bone = 3 - ) - ) - if(prob(70)) - backpack_contents += pickweight(list( - /obj/item/borg/upgrade/modkit/damage = 1, - /obj/item/borg/upgrade/modkit/trigger_guard = 1, - /obj/item/soap/nanotrasen = 1, - /obj/item/wormhole_jaunter = 1, - /obj/item/fulton_core = 1, - /obj/item/extraction_pack = 2, - /obj/item/stack/sheet/animalhide/goliath_hide = 3, - /obj/item/hivelordstabilizer = 2, - /obj/item/stack/marker_beacon/ten = 2, - /obj/item/mining_scanner = 2, - /obj/item/extinguisher/mini = 2, - /obj/item/kitchen/knife/combat/survival = 3, - /obj/item/flashlight/seclite = 3, - /obj/item/stack/sheet/sinew = 3, - /obj/item/stack/sheet/bone = 3 - ) - ) - if(prob(30)) - backpack_contents += list( - /obj/item/reagent_containers/hypospray/medipen/survival = pickweight(list( - 1 = 3, - 2 = 2, - 3 = 1 - ) - ) - ) - else - back = /obj/item/kinetic_crusher + outfit = /datum/outfit/generic/miner if("Plain") outfit = /datum/outfit/generic if("Oldminer") diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 05b59e0c6998..95ab6c9e02eb 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -95,6 +95,7 @@ if(prob(50)) gloves = pickweight(list( /obj/item/clothing/gloves/color/black = 1, + /obj/item/clothing/gloves/fingerless = 1, /obj/item/clothing/gloves/color/white = 1, ) ) @@ -113,7 +114,8 @@ mask = pickweight(list( /obj/item/clothing/mask/balaclava = 1, /obj/item/clothing/mask/bandana/red = 1, - + /obj/item/clothing/mask/gas = 1, + /obj/item/clothing/mask/breath = 1, ) ) back = pickweight(list( @@ -124,5 +126,170 @@ /obj/item/storage/backpack/satchel/leather = 1 ) ) + backpack_contents += pickweight(list( + /obj/item/dice/d20, + /obj/item/lipstick/black, + /obj/item/lipstick, + /obj/item/clothing/mask/balaclava, + /obj/item/clothing/mask/vape, + /obj/item/clothing/mask/vape/cigar, + /obj/item/clothing/mask/bandana/red, + /obj/item/storage/book/bible, + /obj/item/reagent_containers/food/drinks/flask, + /obj/item/reagent_containers/food/drinks/britcup, + /obj/item/lighter/greyscale, + /obj/item/lighter, + /obj/item/toy/cards/deck, + /obj/item/toy/eightball, + /obj/item/storage/wallet, + /obj/item/paicard, + /obj/item/modular_computer/tablet/preset/cheap, + /obj/item/modular_computer/laptop/preset/civilian, + /obj/item/pen, + /obj/item/pen/fourcolor, + /obj/item/paper_bin, + /obj/item/cane, + /obj/item/radio, + /obj/item/toy/plush/lizardplushie, + /obj/item/toy/plush/snakeplushie, + /obj/item/toy/plush/moth, + /obj/item/toy/plush/hornet, + /obj/item/toy/plush/hornet/gay, + /obj/item/toy/plush/knight, + /obj/item/toy/plush/among, + /obj/item/dyespray, + /obj/item/table_bell/brass, + /obj/item/flashlight, + /obj/item/crowbar/red, + ) + ) /datum/outfit/generic + +/datum/outfit/generric/miner/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(prob(2)) + mob_species = /datum/species/plasmaman + uniform = /obj/item/clothing/under/plasmaman + head = /obj/item/clothing/head/helmet/space/plasmaman + belt = /obj/item/tank/internals/plasmaman/belt + else + uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland + if (prob(4)) + belt = pickweight(list( + /obj/item/storage/belt/mining = 2, + /obj/item/storage/belt/mining/alt = 2 + ) + ) + else if(prob(10)) + belt = pickweight(list( + /obj/item/pickaxe = 8, + /obj/item/pickaxe/mini = 4, + /obj/item/pickaxe/silver = 2, + /obj/item/pickaxe/diamond = 1, + /obj/item/gun/energy/kinetic_accelerator = 1 + ) + ) + else + belt = /obj/item/tank/internals/emergency_oxygen/engi + if(mob_species != /datum/species/lizard) + shoes = /obj/item/clothing/shoes/workboots/mining + gloves = /obj/item/clothing/gloves/color/black + mask = /obj/item/clothing/mask/gas/explorer + if(prob(45)) + glasses = /obj/item/clothing/glasses/meson + if(prob(20)) + suit = pickweight(list( + /obj/item/clothing/suit/hooded/explorer = 18, + /obj/item/clothing/suit/hooded/cloak/goliath = 2 + ) + ) + if(prob(30)) + r_pocket = pickweight(list( + /obj/item/stack/marker_beacon = 20, + /obj/item/spacecash/bundle/mediumrand = 7, + /obj/item/reagent_containers/hypospray/medipen/survival = 2, + /obj/item/borg/upgrade/modkit/damage = 1 + ) + ) + if(prob(10)) + l_pocket = pickweight(list( + /obj/item/spacecash/bundle/mediumrand = 7, + /obj/item/reagent_containers/hypospray/medipen/survival = 2, + /obj/item/borg/upgrade/modkit/cooldown = 1 + ) + ) + if(prob(95)) + back = /obj/item/storage/backpack/explorer + backpack_contents = list(/obj/item/radio) + if(prob(70)) + backpack_contents += pickweight(list( + /obj/item/borg/upgrade/modkit/damage = 1, + /obj/item/borg/upgrade/modkit/trigger_guard = 1, + /obj/item/soap/nanotrasen = 1, + /obj/item/wormhole_jaunter = 1, + /obj/item/fulton_core = 1, + /obj/item/extraction_pack = 2, + /obj/item/stack/sheet/animalhide/goliath_hide = 3, + /obj/item/hivelordstabilizer = 2, + /obj/item/stack/marker_beacon/ten = 2, + /obj/item/mining_scanner = 2, + /obj/item/extinguisher/mini = 2, + /obj/item/kitchen/knife/combat/survival = 3, + /obj/item/flashlight/seclite=3, + /obj/item/stack/sheet/sinew = 3, + /obj/item/stack/sheet/bone = 3 + ) + ) + if(prob(70)) + backpack_contents += pickweight(list( + /obj/item/borg/upgrade/modkit/damage = 1, + /obj/item/borg/upgrade/modkit/trigger_guard = 1, + /obj/item/soap/nanotrasen = 1, + /obj/item/wormhole_jaunter = 1, + /obj/item/fulton_core = 1, + /obj/item/extraction_pack = 2, + /obj/item/stack/sheet/animalhide/goliath_hide = 3, + /obj/item/hivelordstabilizer = 2, + /obj/item/stack/marker_beacon/ten = 2, + /obj/item/mining_scanner = 2, + /obj/item/extinguisher/mini = 2, + /obj/item/kitchen/knife/combat/survival = 3, + /obj/item/flashlight/seclite = 3, + /obj/item/stack/sheet/sinew = 3, + /obj/item/stack/sheet/bone = 3 + ) + ) + if(prob(70)) + backpack_contents += pickweight(list( + /obj/item/borg/upgrade/modkit/damage = 1, + /obj/item/borg/upgrade/modkit/trigger_guard = 1, + /obj/item/soap/nanotrasen = 1, + /obj/item/wormhole_jaunter = 1, + /obj/item/fulton_core = 1, + /obj/item/extraction_pack = 2, + /obj/item/stack/sheet/animalhide/goliath_hide = 3, + /obj/item/hivelordstabilizer = 2, + /obj/item/stack/marker_beacon/ten = 2, + /obj/item/mining_scanner = 2, + /obj/item/extinguisher/mini = 2, + /obj/item/kitchen/knife/combat/survival = 3, + /obj/item/flashlight/seclite = 3, + /obj/item/stack/sheet/sinew = 3, + /obj/item/stack/sheet/bone = 3 + ) + ) + if(prob(30)) + backpack_contents += list( + /obj/item/reagent_containers/hypospray/medipen/survival = pickweight(list( + 1 = 3, + 2 = 2, + 3 = 1 + ) + ) + ) + else + back = /obj/item/kinetic_crusher + backpack_contents = list() + +/datum/outfit/generic/miner From bcd7f00f278f1b1bd11535f750771e24f10371b9 Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 08:55:02 -0600 Subject: [PATCH 23/70] good progress --- .../hostile/mining_mobs/hivelord.dm | 224 +---------------- .../hostile/mining_mobs/hivelord_outfits.dm | 236 ++++++++++++++++++ 2 files changed, 244 insertions(+), 216 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 21e369ba0912..5f5a4d837a0b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -410,8 +410,10 @@ ) ) var/type = pickweight(list( - "Miner" = 50, "Plain" = 40, + "Miner" = 40, + "Oldminer" = 10, + //faction stuff pick("Infiltrator", "Operative", "Soldier", "SRM") = 10 ) ) @@ -421,223 +423,13 @@ if("Plain") outfit = /datum/outfit/generic if("Oldminer") - suit = /obj/item/clothing/suit/hooded/explorer/old - mask = /obj/item/clothing/mask/gas/explorer/old - if(prob(95)) - glasses = /obj/item/clothing/glasses/meson - else - glasses = /obj/item/clothing/glasses/meson/night - suit_store = /obj/item/tank/internals/oxygen - gloves = /obj/item/clothing/gloves/explorer/old - uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland/old - if(prob(85)) - back = /obj/item/storage/backpack/explorer //someone could totally make these backpacks a subtype and just have them be there. It'd cut down this file size a bit. - backpack_contents = list() - for(var/count in 1 to 3) - if(prob(70)) - backpack_contents += pickweight(list( - /obj/item/borg/upgrade/modkit/damage = 1, - /obj/item/borg/upgrade/modkit/trigger_guard = 1, - /obj/item/soap/nanotrasen = 1, - /obj/item/wormhole_jaunter = 1, - /obj/item/fulton_core = 1, - /obj/item/extraction_pack = 2, - /obj/item/stack/sheet/animalhide/goliath_hide = 3, - /obj/item/hivelordstabilizer = 2, - /obj/item/stack/marker_beacon/ten = 2, - /obj/item/mining_scanner = 2, - /obj/item/extinguisher/mini = 2, - /obj/item/kitchen/knife/combat/survival = 3, - /obj/item/flashlight/seclite=3, - /obj/item/stack/sheet/sinew = 3, - /obj/item/stack/sheet/bone = 3 - ) - ) - if(prob(30)) - backpack_contents += list( - /obj/item/reagent_containers/hypospray/medipen/survival = pickweight(list( - 1 = 3, - 2 = 2, - 3 = 1 - ) - ) - ) - else - back = /obj/item/kinetic_crusher/old - if(prob(30)) - belt = /obj/item/gun/energy/kinetic_accelerator/old - if(prob(30)) - r_pocket = pickweight(list( - /obj/item/stack/marker_beacon = 20, - /obj/item/spacecash/bundle/mediumrand = 7, - /obj/item/reagent_containers/hypospray/medipen/survival = 2, - /obj/item/borg/upgrade/modkit/damage = 1 - ) - ) - if(prob(30)) - l_pocket = pickweight(list( - /obj/item/spacecash/bundle/mediumrand = 5, - /obj/item/reagent_containers/hypospray/medipen/survival = 2, - /obj/item/borg/upgrade/modkit/cooldown = 1 - ) - ) + outfit = /datum/outfit/generic/oldminer if("Soldier") - mob_species = /datum/species/human - if(prob(90)) - uniform = /obj/item/clothing/under/solgov - suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov - shoes = /obj/item/clothing/shoes/jackboots - gloves = /obj/item/clothing/gloves/color/black - mask = /obj/item/clothing/mask/gas/sechailer - head = /obj/item/clothing/head/solgov/sonnensoldner - id = /obj/item/card/id/solgov - else - uniform = /obj/item/clothing/under/solgov - suit = /obj/item/clothing/suit/space/hardsuit/solgov - shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat - mask = /obj/item/clothing/mask/gas/sechailer/swat - id = /obj/item/card/id/solgov - if(prob(85)) - back = /obj/item/storage/backpack - backpack_contents = list() - for(var/i = 1 to 3) - if(prob(75)) - backpack_contents += pickweight(list( - /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 1, - /obj/item/storage/firstaid/advanced = 1, - /obj/item/gun/ballistic/automatic/pistol/solgov = 1, - /obj/item/gps = 1, - /obj/item/stock_parts/cell/gun/upgraded = 2, - /obj/item/ammo_box/magazine/pistol556mm = 3, - /obj/item/desk_flag/solgov = 3, - /obj/item/stack/marker_beacon/ten = 3, - /obj/item/extinguisher/mini = 3, - /obj/item/kitchen/knife/combat = 3, - /obj/item/flashlight/seclite=3, - /obj/item/ammo_casing/shotgun = 3, - /obj/item/binoculars = 3, - /obj/item/clipboard = 3 - ) - ) - else - back = pickweight(list( - /obj/item/energyhalberd = 5, - /obj/item/gun/ballistic/rocketlauncher/unrestricted = 5 - ) - ) - if(prob(25)) - belt = /obj/item/storage/belt/military - if(prob(50)) - r_pocket = pickweight(list( - /obj/item/reagent_containers/hypospray/medipen/stimpack = 1, - /obj/item/kitchen/knife/letter_opener = 3, - /obj/item/radio/off = 3, - /obj/item/grenade/syndieminibomb/concussion = 1, - /obj/item/melee/transforming/energy/ctf/solgov = 1 - ) - ) - if(prob(70)) - glasses = pickweight(list( - /obj/item/clothing/glasses/sunglasses = 3, - /obj/item/clothing/glasses/hud/health = 3, - /obj/item/clothing/glasses/hud/health/night = 1, - /obj/item/clothing/glasses/night = 2 - ) - ) - + outfit = /datum/outfit/generic/solgov/soldier if("Infiltrator") - uniform = /obj/item/clothing/under/syndicate/bloodred - gloves = /obj/item/clothing/gloves/color/latex/nitrile/infiltrator - suit = /obj/item/clothing/suit/armor/vest/infiltrator - head = /obj/item/clothing/head/helmet/infiltrator - shoes = /obj/item/clothing/shoes/combat/sneakboots - ears = /obj/item/radio/headset/syndicate - if(prob(70)) - glasses = pickweight(list( - /obj/item/clothing/glasses/regular/circle = 1, - /obj/item/clothing/glasses/night = 2, - /obj/item/clothing/glasses/sunglasses = 3 - ) - ) - mask = /obj/item/clothing/mask/infiltrator - id = /obj/item/card/id/syndicate - back = /obj/item/storage/backpack - backpack_contents = list() - for(var/i = 1 to 3) - if(prob(50)) - backpack_contents += pickweight(list( - /obj/item/pen/sleepy = 3, - /obj/item/pen/edagger = 3, - /obj/item/reagent_containers/syringe/mulligan = 3, - /obj/item/suppressor = 5, - /obj/item/storage/box/syndie_kit/chameleon = 5, - /obj/item/grenade/smokebomb = 5, - /obj/item/grenade/flashbang = 5 - ) - ) - if(prob(70)) - backpack_contents += (list( - /obj/item/gun/ballistic/automatic/pistol/APS, - /obj/item/ammo_box/magazine/pistolm9mm - ) - ) - if(prob(25)) - r_pocket = pickweight(list( - /obj/item/chameleon = 1, - /obj/item/dnainjector/chameleonmut = 1, - ) - ) - if(prob(25)) - l_pocket = pickweight(list( - /obj/item/chameleon = 1, - /obj/item/dnainjector/chameleonmut = 1, - ) - ) + outfit = /datum/outfit/generic/syndicate/infiltrator if("Operative") - id_job = "Operative" - uniform = /obj/item/clothing/under/syndicate - shoes = /obj/item/clothing/shoes/combat - ears = /obj/item/radio/headset/syndicate - id = /obj/item/card/id/syndicate - r_pocket = /obj/item/tank/internals/emergency_oxygen - gloves = /obj/item/clothing/gloves/tackler/combat/insulated - if(prob(25)) - suit = /obj/item/clothing/suit/space/hardsuit/syndi/scarlet - mask = /obj/item/clothing/mask/gas/syndicate - back = /obj/item/tank/jetpack/oxygen - else if(prob(25)) - suit = /obj/item/clothing/suit/space/hardsuit/syndi - mask = /obj/item/clothing/mask/gas/syndicate - back = /obj/item/tank/jetpack/oxygen - else - suit = /obj/item/clothing/suit/armor/vest - mask = /obj/item/clothing/mask/gas - head = /obj/item/clothing/head/helmet/swat - back = /obj/item/storage/backpack + outfit = /datum/outfit/generic/syndicate/operative if("SRM") - uniform = /obj/item/clothing/under/suit/roumain - shoes = /obj/item/clothing/shoes/workboots/mining - if(prob(50)) - suit = /obj/item/clothing/suit/armor/roumain/shadow - head = /obj/item/clothing/head/cowboy/sec/roumain/shadow - else - suit = /obj/item/clothing/suit/armor/roumain - head = /obj/item/clothing/head/cowboy/sec/roumain - if(prob(25)) - suit_store = /obj/item/gun/ballistic/shotgun/winchester - r_pocket = /obj/item/book/manual/trickwines_4_brewers - belt = pick(list(/obj/item/kitchen/knife/hunting = 1, /obj/item/gun/ballistic/derringer = 1)) - back = /obj/item/storage/backpack/cultpack - backpack_contents = list() - if(prob(75)) - backpack_contents += list(/obj/item/ammo_box/c38_box = 1) - if(prob(75)) - backpack_contents += list(pick( - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine,) = 2) + outfit = /datum/outfit/generic/srm/hunter . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 95ab6c9e02eb..aa15072a5130 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -293,3 +293,239 @@ backpack_contents = list() /datum/outfit/generic/miner + +/datum/outfit/generic/oldminer/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + suit = /obj/item/clothing/suit/hooded/explorer/old + mask = /obj/item/clothing/mask/gas/explorer/old + if(prob(95)) + glasses = /obj/item/clothing/glasses/meson + else + glasses = /obj/item/clothing/glasses/meson/night + suit_store = /obj/item/tank/internals/oxygen + gloves = /obj/item/clothing/gloves/explorer/old + uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland/old + if(prob(85)) + back = /obj/item/storage/backpack/explorer //someone could totally make these backpacks a subtype and just have them be there. It'd cut down this file size a bit. + backpack_contents = list() + for(var/count in 1 to 3) + if(prob(70)) + backpack_contents += pickweight(list( + /obj/item/borg/upgrade/modkit/damage = 1, + /obj/item/borg/upgrade/modkit/trigger_guard = 1, + /obj/item/soap/nanotrasen = 1, + /obj/item/wormhole_jaunter = 1, + /obj/item/fulton_core = 1, + /obj/item/extraction_pack = 2, + /obj/item/stack/sheet/animalhide/goliath_hide = 3, + /obj/item/hivelordstabilizer = 2, + /obj/item/stack/marker_beacon/ten = 2, + /obj/item/mining_scanner = 2, + /obj/item/extinguisher/mini = 2, + /obj/item/kitchen/knife/combat/survival = 3, + /obj/item/flashlight/seclite=3, + /obj/item/stack/sheet/sinew = 3, + /obj/item/stack/sheet/bone = 3 + ) + ) + if(prob(30)) + backpack_contents += list( + /obj/item/reagent_containers/hypospray/medipen/survival = pickweight(list( + 1 = 3, + 2 = 2, + 3 = 1 + ) + ) + ) + else + back = /obj/item/kinetic_crusher/old + if(prob(30)) + belt = /obj/item/gun/energy/kinetic_accelerator/old + if(prob(30)) + r_pocket = pickweight(list( + /obj/item/stack/marker_beacon = 20, + /obj/item/spacecash/bundle/mediumrand = 7, + /obj/item/reagent_containers/hypospray/medipen/survival = 2, + /obj/item/borg/upgrade/modkit/damage = 1 + ) + ) + if(prob(30)) + l_pocket = pickweight(list( + /obj/item/spacecash/bundle/mediumrand = 5, + /obj/item/reagent_containers/hypospray/medipen/survival = 2, + /obj/item/borg/upgrade/modkit/cooldown = 1 + ) + ) +/datum/outfit/generic/oldminer + +/datum/outfit/generic/solgov/soldier/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(prob(90)) + uniform = /obj/item/clothing/under/solgov + suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov + shoes = /obj/item/clothing/shoes/jackboots + gloves = /obj/item/clothing/gloves/color/black + mask = /obj/item/clothing/mask/gas/sechailer + head = /obj/item/clothing/head/solgov/sonnensoldner + id = /obj/item/card/id/solgov + else + uniform = /obj/item/clothing/under/solgov + suit = /obj/item/clothing/suit/space/hardsuit/solgov + shoes = /obj/item/clothing/shoes/combat + gloves = /obj/item/clothing/gloves/combat + mask = /obj/item/clothing/mask/gas/sechailer/swat + id = /obj/item/card/id/solgov + if(prob(85)) + back = /obj/item/storage/backpack + backpack_contents = list() + for(var/i = 1 to 3) + if(prob(75)) + backpack_contents += pickweight(list( + /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 1, + /obj/item/storage/firstaid/advanced = 1, + /obj/item/gun/ballistic/automatic/pistol/solgov = 1, + /obj/item/gps = 1, + /obj/item/stock_parts/cell/gun/upgraded = 2, + /obj/item/ammo_box/magazine/pistol556mm = 3, + /obj/item/desk_flag/solgov = 3, + /obj/item/stack/marker_beacon/ten = 3, + /obj/item/extinguisher/mini = 3, + /obj/item/kitchen/knife/combat = 3, + /obj/item/flashlight/seclite=3, + /obj/item/ammo_casing/shotgun = 3, + /obj/item/binoculars = 3, + /obj/item/clipboard = 3 + ) + ) + else + back = pickweight(list( + /obj/item/energyhalberd = 5, + /obj/item/gun/ballistic/rocketlauncher/unrestricted = 5 + ) + ) + if(prob(25)) + belt = /obj/item/storage/belt/military + if(prob(50)) + r_pocket = pickweight(list( + /obj/item/reagent_containers/hypospray/medipen/stimpack = 1, + /obj/item/kitchen/knife/letter_opener = 3, + /obj/item/radio/off = 3, + /obj/item/grenade/syndieminibomb/concussion = 1, + /obj/item/melee/transforming/energy/ctf/solgov = 1 + ) + ) + if(prob(70)) + glasses = pickweight(list( + /obj/item/clothing/glasses/sunglasses = 3, + /obj/item/clothing/glasses/hud/health = 3, + /obj/item/clothing/glasses/hud/health/night = 1, + /obj/item/clothing/glasses/night = 2 + ) + ) + +/datum/outfit/generic/solgov/soldier + +/datum/outfit/generic/syndicate/infiltrator/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + uniform = /obj/item/clothing/under/syndicate/bloodred + gloves = /obj/item/clothing/gloves/color/latex/nitrile/infiltrator + suit = /obj/item/clothing/suit/armor/vest/infiltrator + head = /obj/item/clothing/head/helmet/infiltrator + shoes = /obj/item/clothing/shoes/combat/sneakboots + ears = /obj/item/radio/headset/syndicate + if(prob(70)) + glasses = pickweight(list( + /obj/item/clothing/glasses/regular/circle = 1, + /obj/item/clothing/glasses/night = 2, + /obj/item/clothing/glasses/sunglasses = 3 + ) + ) + mask = /obj/item/clothing/mask/infiltrator + id = /obj/item/card/id/syndicate + back = /obj/item/storage/backpack + backpack_contents = list() + for(var/i = 1 to 3) + if(prob(50)) + backpack_contents += pickweight(list( + /obj/item/pen/sleepy = 3, + /obj/item/pen/edagger = 3, + /obj/item/reagent_containers/syringe/mulligan = 3, + /obj/item/suppressor = 5, + /obj/item/storage/box/syndie_kit/chameleon = 5, + /obj/item/grenade/smokebomb = 5, + /obj/item/grenade/flashbang = 5 + ) + ) + if(prob(70)) + backpack_contents += (list( + /obj/item/gun/ballistic/automatic/pistol/APS, + /obj/item/ammo_box/magazine/pistolm9mm + ) + ) + if(prob(25)) + r_pocket = pickweight(list( + /obj/item/chameleon = 1, + /obj/item/dnainjector/chameleonmut = 1, + ) + ) + if(prob(25)) + l_pocket = pickweight(list( + /obj/item/chameleon = 1, + /obj/item/dnainjector/chameleonmut = 1, + ) + ) + +/datum/outfit/generic/syndicate/infiltrator + +/datum/outfit/generic/syndicate/operative/pre_equip(mob/living/carbon/human/H, visualsOnly) + id_job = "Operative" + uniform = /obj/item/clothing/under/syndicate + shoes = /obj/item/clothing/shoes/combat + ears = /obj/item/radio/headset/syndicate + id = /obj/item/card/id/syndicate + r_pocket = /obj/item/tank/internals/emergency_oxygen + gloves = /obj/item/clothing/gloves/tackler/combat/insulated + if(prob(25)) + suit = /obj/item/clothing/suit/space/hardsuit/syndi/scarlet + mask = /obj/item/clothing/mask/gas/syndicate + back = /obj/item/tank/jetpack/oxygen + else if(prob(25)) + suit = /obj/item/clothing/suit/space/hardsuit/syndi + mask = /obj/item/clothing/mask/gas/syndicate + back = /obj/item/tank/jetpack/oxygen + else + suit = /obj/item/clothing/suit/armor/vest + mask = /obj/item/clothing/mask/gas + head = /obj/item/clothing/head/helmet/swat + back = /obj/item/storage/backpack + +/datum/outfit/generic/syndicate/operative + +/datum/outfit/generic/srm/hunter/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + uniform = /obj/item/clothing/under/suit/roumain + shoes = /obj/item/clothing/shoes/workboots/mining + if(prob(50)) + suit = /obj/item/clothing/suit/armor/roumain/shadow + head = /obj/item/clothing/head/cowboy/sec/roumain/shadow + else + suit = /obj/item/clothing/suit/armor/roumain + head = /obj/item/clothing/head/cowboy/sec/roumain + if(prob(25)) + suit_store = /obj/item/gun/ballistic/shotgun/winchester + r_pocket = /obj/item/book/manual/trickwines_4_brewers + belt = pick(list(/obj/item/kitchen/knife/hunting = 1, /obj/item/gun/ballistic/derringer = 1)) + back = /obj/item/storage/backpack/cultpack + backpack_contents = list() + if(prob(75)) + backpack_contents += list(/obj/item/ammo_box/c38_box = 1) + if(prob(75)) + backpack_contents += list(pick( + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine, + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine, + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine, + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine, + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine, + /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine,) = 2) + +/datum/outfit/generic/srm/hunter From cd937a1d3708f92acccc9b2dacb0ed0d4956d986 Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 09:00:05 -0600 Subject: [PATCH 24/70] better pick --- .../simple_animal/hostile/mining_mobs/hivelord.dm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 5f5a4d837a0b..f81957f02315 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -410,11 +410,21 @@ ) ) var/type = pickweight(list( + //independent "Plain" = 40, "Miner" = 40, "Oldminer" = 10, - //faction stuff - pick("Infiltrator", "Operative", "Soldier", "SRM") = 10 + pick( + //solgov + "Solgov", + //cmm + //syndi + pick("Infiltrator", "Operative"), + //nanotrasen + //inteq + //srm + "SRM", + ) = 10 ) ) switch(type) From b790db6d071e76bc2a272195d345193b9b0224a9 Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 09:00:30 -0600 Subject: [PATCH 25/70] oop --- .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index f81957f02315..6d20b955ecb1 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -416,7 +416,7 @@ "Oldminer" = 10, pick( //solgov - "Solgov", + "Soldier", //cmm //syndi pick("Infiltrator", "Operative"), From 22c8ec887af7beda28e136e95b88afabc79f62cd Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 09:03:03 -0600 Subject: [PATCH 26/70] shrug --- .../hostile/mining_mobs/hivelord_outfits.dm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index aa15072a5130..27cec2b51821 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -168,11 +168,6 @@ /datum/outfit/generric/miner/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() - if(prob(2)) - mob_species = /datum/species/plasmaman - uniform = /obj/item/clothing/under/plasmaman - head = /obj/item/clothing/head/helmet/space/plasmaman - belt = /obj/item/tank/internals/plasmaman/belt else uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland if (prob(4)) @@ -192,8 +187,6 @@ ) else belt = /obj/item/tank/internals/emergency_oxygen/engi - if(mob_species != /datum/species/lizard) - shoes = /obj/item/clothing/shoes/workboots/mining gloves = /obj/item/clothing/gloves/color/black mask = /obj/item/clothing/mask/gas/explorer if(prob(45)) @@ -306,7 +299,7 @@ gloves = /obj/item/clothing/gloves/explorer/old uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland/old if(prob(85)) - back = /obj/item/storage/backpack/explorer //someone could totally make these backpacks a subtype and just have them be there. It'd cut down this file size a bit. + back = /obj/item/storage/backpack/explorer backpack_contents = list() for(var/count in 1 to 3) if(prob(70)) @@ -478,7 +471,6 @@ /datum/outfit/generic/syndicate/infiltrator /datum/outfit/generic/syndicate/operative/pre_equip(mob/living/carbon/human/H, visualsOnly) - id_job = "Operative" uniform = /obj/item/clothing/under/syndicate shoes = /obj/item/clothing/shoes/combat ears = /obj/item/radio/headset/syndicate From 9a4dddc0c182f93b1a46cf80e7a5257a2b6ca67a Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 09:09:49 -0600 Subject: [PATCH 27/70] fix --- .../hostile/mining_mobs/hivelord_outfits.dm | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 27cec2b51821..fca5a269b50f 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -166,27 +166,26 @@ /datum/outfit/generic -/datum/outfit/generric/miner/pre_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/generic/miner/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() - else - uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland - if (prob(4)) - belt = pickweight(list( - /obj/item/storage/belt/mining = 2, - /obj/item/storage/belt/mining/alt = 2 - ) + uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland + if (prob(4)) + belt = pickweight(list( + /obj/item/storage/belt/mining = 2, + /obj/item/storage/belt/mining/alt = 2 ) - else if(prob(10)) - belt = pickweight(list( - /obj/item/pickaxe = 8, - /obj/item/pickaxe/mini = 4, - /obj/item/pickaxe/silver = 2, - /obj/item/pickaxe/diamond = 1, - /obj/item/gun/energy/kinetic_accelerator = 1 - ) + ) + else if(prob(10)) + belt = pickweight(list( + /obj/item/pickaxe = 8, + /obj/item/pickaxe/mini = 4, + /obj/item/pickaxe/silver = 2, + /obj/item/pickaxe/diamond = 1, + /obj/item/gun/energy/kinetic_accelerator = 1 ) - else - belt = /obj/item/tank/internals/emergency_oxygen/engi + ) + else + belt = /obj/item/tank/internals/emergency_oxygen/engi gloves = /obj/item/clothing/gloves/color/black mask = /obj/item/clothing/mask/gas/explorer if(prob(45)) From 7762e54e99f40df97ead2a45a9ffd7923520cc71 Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 09:21:35 -0600 Subject: [PATCH 28/70] guns --- .../hostile/mining_mobs/hivelord_outfits.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index fca5a269b50f..97dc0be75b8b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -118,6 +118,15 @@ /obj/item/clothing/mask/breath = 1, ) ) + if (prob(5)) + belt = pickweight(list( + /obj/item/gun/ballistic/automatic/pistol/m1911 = 2, + /obj/item/gun/ballistic/automatic/pistol/commander = 1, + /obj/item/gun/ballistic/automatic/pistol = 1, + /obj/item/gun/ballistic/revolver = 1, + /obj/item/gun/ballistic/revolver/pepperbox = 1, + ) + ) back = pickweight(list( /obj/item/storage/backpack = 1, /obj/item/storage/backpack/satchel = 1, From 161c968d3808eb4c8db8ae2490af4393c392432b Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 09:40:12 -0600 Subject: [PATCH 29/70] engineer --- .../hostile/mining_mobs/hivelord_outfits.dm | 101 ++++++++---------- 1 file changed, 45 insertions(+), 56 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 97dc0be75b8b..79395f5e431b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -175,6 +175,32 @@ /datum/outfit/generic +/datum/outfit/generic/engineer/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(prob(75)) + uniform = pick(/obj/item/clothing/under/rank/engineering/engineer, /obj/item/clothing/under/rank/engineering/engineer/hazard, /obj/item/clothing/under/rank/security/officer/military/eng) + if(prob(75)) + suit = pick(/obj/item/clothing/suit/toggle/hazard, /obj/item/clothing/suit/hazardvest, /obj/item/clothing/suit/hooded/wintercoat/engineering) + if(prob(75)) + gloves = pick(/obj/item/clothing/gloves/color/yellow, /obj/item/clothing/gloves/color/fyellow, /obj/item/clothing/gloves/color/fyellow/old) + if(prob(75)) + belt = pick(/obj/item/storage/belt/utility/full, /obj/item/storage/belt/utility) + if(prob(50)) + glasses = /obj/item/clothing/glasses/welding + if(prob(75)) + accessory = /obj/item/clothing/accessory/armband/engine + if(prob(25)) + mask = /obj/item/clothing/mask/breath + suit = /obj/item/clothing/suit/space/engineer + head = /obj/item/clothing/head/helmet/space/light/engineer + suit_store = /obj/item/tank/internals/oxygen + head = null + internals_slot = ITEM_SLOT_SUITSTORE + if(prob(10)) + back = /obj/item/fireaxe + +/datum/outfit/generic/engineer + /datum/outfit/generic/miner/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland @@ -223,63 +249,26 @@ if(prob(95)) back = /obj/item/storage/backpack/explorer backpack_contents = list(/obj/item/radio) - if(prob(70)) - backpack_contents += pickweight(list( - /obj/item/borg/upgrade/modkit/damage = 1, - /obj/item/borg/upgrade/modkit/trigger_guard = 1, - /obj/item/soap/nanotrasen = 1, - /obj/item/wormhole_jaunter = 1, - /obj/item/fulton_core = 1, - /obj/item/extraction_pack = 2, - /obj/item/stack/sheet/animalhide/goliath_hide = 3, - /obj/item/hivelordstabilizer = 2, - /obj/item/stack/marker_beacon/ten = 2, - /obj/item/mining_scanner = 2, - /obj/item/extinguisher/mini = 2, - /obj/item/kitchen/knife/combat/survival = 3, - /obj/item/flashlight/seclite=3, - /obj/item/stack/sheet/sinew = 3, - /obj/item/stack/sheet/bone = 3 - ) - ) - if(prob(70)) - backpack_contents += pickweight(list( - /obj/item/borg/upgrade/modkit/damage = 1, - /obj/item/borg/upgrade/modkit/trigger_guard = 1, - /obj/item/soap/nanotrasen = 1, - /obj/item/wormhole_jaunter = 1, - /obj/item/fulton_core = 1, - /obj/item/extraction_pack = 2, - /obj/item/stack/sheet/animalhide/goliath_hide = 3, - /obj/item/hivelordstabilizer = 2, - /obj/item/stack/marker_beacon/ten = 2, - /obj/item/mining_scanner = 2, - /obj/item/extinguisher/mini = 2, - /obj/item/kitchen/knife/combat/survival = 3, - /obj/item/flashlight/seclite = 3, - /obj/item/stack/sheet/sinew = 3, - /obj/item/stack/sheet/bone = 3 - ) - ) - if(prob(70)) - backpack_contents += pickweight(list( - /obj/item/borg/upgrade/modkit/damage = 1, - /obj/item/borg/upgrade/modkit/trigger_guard = 1, - /obj/item/soap/nanotrasen = 1, - /obj/item/wormhole_jaunter = 1, - /obj/item/fulton_core = 1, - /obj/item/extraction_pack = 2, - /obj/item/stack/sheet/animalhide/goliath_hide = 3, - /obj/item/hivelordstabilizer = 2, - /obj/item/stack/marker_beacon/ten = 2, - /obj/item/mining_scanner = 2, - /obj/item/extinguisher/mini = 2, - /obj/item/kitchen/knife/combat/survival = 3, - /obj/item/flashlight/seclite = 3, - /obj/item/stack/sheet/sinew = 3, - /obj/item/stack/sheet/bone = 3 + for(var/count in 1 to 3) + if(prob(70)) + backpack_contents += pickweight(list( + /obj/item/borg/upgrade/modkit/damage = 1, + /obj/item/borg/upgrade/modkit/trigger_guard = 1, + /obj/item/soap/nanotrasen = 1, + /obj/item/wormhole_jaunter = 1, + /obj/item/fulton_core = 1, + /obj/item/extraction_pack = 2, + /obj/item/stack/sheet/animalhide/goliath_hide = 3, + /obj/item/hivelordstabilizer = 2, + /obj/item/stack/marker_beacon/ten = 2, + /obj/item/mining_scanner = 2, + /obj/item/extinguisher/mini = 2, + /obj/item/kitchen/knife/combat/survival = 3, + /obj/item/flashlight/seclite = 3, + /obj/item/stack/sheet/sinew = 3, + /obj/item/stack/sheet/bone = 3 + ) ) - ) if(prob(30)) backpack_contents += list( /obj/item/reagent_containers/hypospray/medipen/survival = pickweight(list( From 9d809d5a097d54b34941bb269de89dde9001e7bd Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 10:01:20 -0600 Subject: [PATCH 30/70] starting to think i can shrink the hivelord code --- .../hostile/mining_mobs/hivelord.dm | 10 ++++++-- .../hostile/mining_mobs/hivelord_outfits.dm | 24 ++++++++++++------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 6d20b955ecb1..c5fa03a9dca6 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -411,8 +411,9 @@ ) var/type = pickweight(list( //independent - "Plain" = 40, "Miner" = 40, + "Engi" = 20 + "Generic" = 20, "Oldminer" = 10, pick( //solgov @@ -422,6 +423,7 @@ pick("Infiltrator", "Operative"), //nanotrasen //inteq + "Inteq Engi", //srm "SRM", ) = 10 @@ -430,7 +432,9 @@ switch(type) if("Miner") outfit = /datum/outfit/generic/miner - if("Plain") + if("Engi") + outfit = /datum/outfit/generic/engineer/ + if("Generic") outfit = /datum/outfit/generic if("Oldminer") outfit = /datum/outfit/generic/oldminer @@ -440,6 +444,8 @@ outfit = /datum/outfit/generic/syndicate/infiltrator if("Operative") outfit = /datum/outfit/generic/syndicate/operative + if("Inteq Engi") + outfit = /datum/outfit/generic/engineer/inteq if("SRM") outfit = /datum/outfit/generic/srm/hunter . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 79395f5e431b..fd513d40e813 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -1,8 +1,8 @@ /datum/outfit/generic/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() uniform = pickweight(list( - /obj/item/clothing/under/utility = 1, - /obj/item/clothing/under/utility/skirt = 1, + /obj/item/clothing/under/utility = 5, + /obj/item/clothing/under/utility/skirt = 5, /obj/item/clothing/under/color/black = 1, /obj/item/clothing/under/color/white = 1, /obj/item/clothing/under/color/random = 1, @@ -189,18 +189,24 @@ glasses = /obj/item/clothing/glasses/welding if(prob(75)) accessory = /obj/item/clothing/accessory/armband/engine - if(prob(25)) - mask = /obj/item/clothing/mask/breath - suit = /obj/item/clothing/suit/space/engineer - head = /obj/item/clothing/head/helmet/space/light/engineer - suit_store = /obj/item/tank/internals/oxygen - head = null - internals_slot = ITEM_SLOT_SUITSTORE if(prob(10)) back = /obj/item/fireaxe /datum/outfit/generic/engineer +/datum/outfit/generic/engineer/inteq/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(prob(75)) + uniform = pick(/obj/item/clothing/under/syndicate/inteq/artificer, /obj/item/clothing/under/syndicate/inteq) + if(prob(75)) + head = pick(/obj/item/clothing/head/hardhat/white, /obj/item/clothing/head/soft/inteq) + if(prob(75)) + shoes = /obj/item/clothing/shoes/combat + if(prob(75)) + back = /obj/item/storage/backpack/messenger/inteq + +/datum/outfit/generic/engineer/inteq + /datum/outfit/generic/miner/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland From f5db127b3842da15625462c26e007c5417c5d351 Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 10:06:41 -0600 Subject: [PATCH 31/70] need to trim the size of this pick --- .../simple_animal/hostile/mining_mobs/hivelord_outfits.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index fd513d40e813..bd9e2044c3a4 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -135,7 +135,7 @@ /obj/item/storage/backpack/satchel/leather = 1 ) ) - backpack_contents += pickweight(list( + backpack_contents += pick( /obj/item/dice/d20, /obj/item/lipstick/black, /obj/item/lipstick, @@ -171,7 +171,6 @@ /obj/item/flashlight, /obj/item/crowbar/red, ) - ) /datum/outfit/generic From b040867f5a76afa05d9edf99064d587804429f72 Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 10:21:11 -0600 Subject: [PATCH 32/70] blind --- .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index c5fa03a9dca6..4526b41f06ee 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -412,7 +412,7 @@ var/type = pickweight(list( //independent "Miner" = 40, - "Engi" = 20 + "Engi" = 20, "Generic" = 20, "Oldminer" = 10, pick( From 9c6aa8bdc7e8000328fc69ee4a84c61d2b167e0b Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 10:21:54 -0600 Subject: [PATCH 33/70] there name is so cool..... --- .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 4526b41f06ee..6dfc1563d1fe 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -423,7 +423,7 @@ pick("Infiltrator", "Operative"), //nanotrasen //inteq - "Inteq Engi", + "Artificer", //srm "SRM", ) = 10 @@ -444,7 +444,7 @@ outfit = /datum/outfit/generic/syndicate/infiltrator if("Operative") outfit = /datum/outfit/generic/syndicate/operative - if("Inteq Engi") + if("Artificer") outfit = /datum/outfit/generic/engineer/inteq if("SRM") outfit = /datum/outfit/generic/srm/hunter From bed830bb1397f505710e65e52bc0d8b5cd31334f Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 10:31:14 -0600 Subject: [PATCH 34/70] minor tweaks --- .../hostile/mining_mobs/hivelord_outfits.dm | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index bd9e2044c3a4..a8b4412d144b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -137,16 +137,10 @@ ) backpack_contents += pick( /obj/item/dice/d20, - /obj/item/lipstick/black, /obj/item/lipstick, - /obj/item/clothing/mask/balaclava, /obj/item/clothing/mask/vape, /obj/item/clothing/mask/vape/cigar, - /obj/item/clothing/mask/bandana/red, - /obj/item/storage/book/bible, /obj/item/reagent_containers/food/drinks/flask, - /obj/item/reagent_containers/food/drinks/britcup, - /obj/item/lighter/greyscale, /obj/item/lighter, /obj/item/toy/cards/deck, /obj/item/toy/eightball, @@ -154,18 +148,19 @@ /obj/item/paicard, /obj/item/modular_computer/tablet/preset/cheap, /obj/item/modular_computer/laptop/preset/civilian, - /obj/item/pen, /obj/item/pen/fourcolor, /obj/item/paper_bin, /obj/item/cane, /obj/item/radio, - /obj/item/toy/plush/lizardplushie, - /obj/item/toy/plush/snakeplushie, - /obj/item/toy/plush/moth, - /obj/item/toy/plush/hornet, - /obj/item/toy/plush/hornet/gay, - /obj/item/toy/plush/knight, - /obj/item/toy/plush/among, + pick( + /obj/item/toy/plush/lizardplushie, + /obj/item/toy/plush/snakeplushie, + /obj/item/toy/plush/moth, + /obj/item/toy/plush/hornet, + /obj/item/toy/plush/hornet/gay, + /obj/item/toy/plush/knight, + /obj/item/toy/plush/among, + ), /obj/item/dyespray, /obj/item/table_bell/brass, /obj/item/flashlight, @@ -185,6 +180,8 @@ if(prob(75)) belt = pick(/obj/item/storage/belt/utility/full, /obj/item/storage/belt/utility) if(prob(50)) + head = /obj/item/clothimg/head/welding + else if(prob(50)) glasses = /obj/item/clothing/glasses/welding if(prob(75)) accessory = /obj/item/clothing/accessory/armband/engine From 9503b9861b13de2f832c7532187b6c7b29c64e58 Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 11:00:01 -0600 Subject: [PATCH 35/70] names and stuf --- .../hostile/mining_mobs/hivelord_outfits.dm | 40 ++++++++++++++----- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index a8b4412d144b..6257168f7f05 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -168,6 +168,7 @@ ) /datum/outfit/generic + name = "Generic" /datum/outfit/generic/engineer/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -202,6 +203,7 @@ back = /obj/item/storage/backpack/messenger/inteq /datum/outfit/generic/engineer/inteq + name = "Artificer" /datum/outfit/generic/miner/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -285,6 +287,7 @@ backpack_contents = list() /datum/outfit/generic/miner + name = "Miner" /datum/outfit/generic/oldminer/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -349,6 +352,7 @@ ) ) /datum/outfit/generic/oldminer + name = "Old Miner" /datum/outfit/generic/solgov/soldier/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -416,6 +420,7 @@ ) /datum/outfit/generic/solgov/soldier + name = "Soldier" /datum/outfit/generic/syndicate/infiltrator/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -468,6 +473,7 @@ ) /datum/outfit/generic/syndicate/infiltrator + name = "Infiltrator" /datum/outfit/generic/syndicate/operative/pre_equip(mob/living/carbon/human/H, visualsOnly) uniform = /obj/item/clothing/under/syndicate @@ -491,22 +497,34 @@ back = /obj/item/storage/backpack /datum/outfit/generic/syndicate/operative + name = "Operative" -/datum/outfit/generic/srm/hunter/pre_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/generic/srm/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() uniform = /obj/item/clothing/under/suit/roumain shoes = /obj/item/clothing/shoes/workboots/mining - if(prob(50)) - suit = /obj/item/clothing/suit/armor/roumain/shadow - head = /obj/item/clothing/head/cowboy/sec/roumain/shadow - else - suit = /obj/item/clothing/suit/armor/roumain - head = /obj/item/clothing/head/cowboy/sec/roumain - if(prob(25)) - suit_store = /obj/item/gun/ballistic/shotgun/winchester + if(prob(75)) + back = /obj/item/storage/backpack/cultpack + if(prob(75)) + belt = pick(list(/obj/item/kitchen/knife/hunting = 1, /obj/item/gun/ballistic/derringer = 1)) + +/datum/outfit/generic/srm + +/datum/outfit/generic/srm/shadow/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + suit = /obj/item/clothing/suit/armor/roumain/shadow + head = /obj/item/clothing/head/cowboy/sec/roumain/shadow + +/datum/outfit/generic/srm/shadow + name = "Shadow" + +/datum/outfit/generic/srm/hunter/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + suit = /obj/item/clothing/suit/armor/roumain + head = /obj/item/clothing/head/cowboy/sec/roumain + if(prob(75)) + suit_store = pickweight(list(/obj/item/gun/ballistic/shotgun/winchester = 9, /obj/item/gun/ballistic/shotgun/winchester = 1)) r_pocket = /obj/item/book/manual/trickwines_4_brewers - belt = pick(list(/obj/item/kitchen/knife/hunting = 1, /obj/item/gun/ballistic/derringer = 1)) - back = /obj/item/storage/backpack/cultpack backpack_contents = list() if(prob(75)) backpack_contents += list(/obj/item/ammo_box/c38_box = 1) From 52ceb1ae5c1e1f1479055f0ea71cbd670e3b199f Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 29 Nov 2023 12:02:26 -0600 Subject: [PATCH 36/70] hm plans in the works --- .../hostile/mining_mobs/hivelord.dm | 33 ++++++++++++------- .../hostile/mining_mobs/hivelord_outfits.dm | 30 +++++++++++++---- 2 files changed, 44 insertions(+), 19 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 6dfc1563d1fe..6246fb0205d4 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -410,21 +410,30 @@ ) ) var/type = pickweight(list( - //independent + //independent// "Miner" = 40, - "Engi" = 20, - "Generic" = 20, - "Oldminer" = 10, + //"Security" = 10 + "Assistant" = 10, + "Engineer" = 5, + //"Doctor" = 5, + //"Scientist" = 5, + //"Cargo" = 5, + //I dont like this guy, + "Oldminer" = 10 + pick( - //solgov + /*I think imma each faction have a minor and major outfit + 10% chance for the major + Both should reflect the factions strengths if convinent*/ + //solgov// "Soldier", - //cmm - //syndi + //cmm// + //syndi// pick("Infiltrator", "Operative"), - //nanotrasen - //inteq + //nanotrasen// + //inteq// "Artificer", - //srm + //srm// "SRM", ) = 10 ) @@ -432,9 +441,9 @@ switch(type) if("Miner") outfit = /datum/outfit/generic/miner - if("Engi") + if("Engineer") outfit = /datum/outfit/generic/engineer/ - if("Generic") + if("Assistant") outfit = /datum/outfit/generic if("Oldminer") outfit = /datum/outfit/generic/oldminer diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 6257168f7f05..e118fe1d9bb1 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -168,7 +168,7 @@ ) /datum/outfit/generic - name = "Generic" + name = "Generic (Legion)" /datum/outfit/generic/engineer/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -181,15 +181,23 @@ if(prob(75)) belt = pick(/obj/item/storage/belt/utility/full, /obj/item/storage/belt/utility) if(prob(50)) - head = /obj/item/clothimg/head/welding + head = /obj/item/clothing/head/welding else if(prob(50)) glasses = /obj/item/clothing/glasses/welding if(prob(75)) accessory = /obj/item/clothing/accessory/armband/engine + if(prob(75)) + back = pick( + /obj/item/storage/backpack/industrial, + /obj/item/storage/backpack/satchel/eng, + /obj/item/storage/backpack/duffelbag/engineering, + /obj/item/storage/backpack/messenger/engi + ) if(prob(10)) back = /obj/item/fireaxe /datum/outfit/generic/engineer + name = "Mechanic (Legion)" /datum/outfit/generic/engineer/inteq/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -203,7 +211,17 @@ back = /obj/item/storage/backpack/messenger/inteq /datum/outfit/generic/engineer/inteq - name = "Artificer" + name = "Artificer (Legion)" + + +/datum/outfit/generic/doctor/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(prob(75)) + uniform = pick(/obj/item/clothing/under/rank/medical/doctor, /obj/item/clothing/under/rank/medical/doctor/blue) + if(prob(75)) + accessory = /obj/item/clothing/accessory/armband/medblue +/datum/outfit/generic/doctor + name = "Medical Doctor (Legion)" /datum/outfit/generic/miner/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -252,7 +270,6 @@ ) if(prob(95)) back = /obj/item/storage/backpack/explorer - backpack_contents = list(/obj/item/radio) for(var/count in 1 to 3) if(prob(70)) backpack_contents += pickweight(list( @@ -287,7 +304,7 @@ backpack_contents = list() /datum/outfit/generic/miner - name = "Miner" + name = "Miner (Legion)" /datum/outfit/generic/oldminer/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -302,7 +319,6 @@ uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland/old if(prob(85)) back = /obj/item/storage/backpack/explorer - backpack_contents = list() for(var/count in 1 to 3) if(prob(70)) backpack_contents += pickweight(list( @@ -352,7 +368,7 @@ ) ) /datum/outfit/generic/oldminer - name = "Old Miner" + name = "Old Miner (Legion)" /datum/outfit/generic/solgov/soldier/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() From 0908bf927feda3ad506b5e011a840296bc202766 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Wed, 29 Nov 2023 17:26:31 -0600 Subject: [PATCH 37/70] testing it and it all seems to be functinal --- .../simple_animal/hostile/mining_mobs/hivelord.dm | 8 +++----- .../hostile/mining_mobs/hivelord_outfits.dm | 10 +--------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 6246fb0205d4..2a55cffb8ae6 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -410,17 +410,14 @@ ) ) var/type = pickweight(list( - //independent// "Miner" = 40, - //"Security" = 10 "Assistant" = 10, "Engineer" = 5, //"Doctor" = 5, //"Scientist" = 5, //"Cargo" = 5, //I dont like this guy, - "Oldminer" = 10 - + "Oldminer" = 10, pick( /*I think imma each faction have a minor and major outfit 10% chance for the major @@ -438,11 +435,12 @@ ) = 10 ) ) + switch(type) if("Miner") outfit = /datum/outfit/generic/miner if("Engineer") - outfit = /datum/outfit/generic/engineer/ + outfit = /datum/outfit/generic/engineer if("Assistant") outfit = /datum/outfit/generic if("Oldminer") diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index e118fe1d9bb1..037eadf5d588 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -146,8 +146,6 @@ /obj/item/toy/eightball, /obj/item/storage/wallet, /obj/item/paicard, - /obj/item/modular_computer/tablet/preset/cheap, - /obj/item/modular_computer/laptop/preset/civilian, /obj/item/pen/fourcolor, /obj/item/paper_bin, /obj/item/cane, @@ -187,12 +185,7 @@ if(prob(75)) accessory = /obj/item/clothing/accessory/armband/engine if(prob(75)) - back = pick( - /obj/item/storage/backpack/industrial, - /obj/item/storage/backpack/satchel/eng, - /obj/item/storage/backpack/duffelbag/engineering, - /obj/item/storage/backpack/messenger/engi - ) + back = pick(/obj/item/storage/backpack/industrial, /obj/item/storage/backpack/satchel/eng, /obj/item/storage/backpack/duffelbag/engineering, /obj/item/storage/backpack/messenger/engi) if(prob(10)) back = /obj/item/fireaxe @@ -213,7 +206,6 @@ /datum/outfit/generic/engineer/inteq name = "Artificer (Legion)" - /datum/outfit/generic/doctor/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() if(prob(75)) From 9a269f522bdd58a2452bab590dbbeedc8079ce42 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Wed, 29 Nov 2023 17:47:17 -0600 Subject: [PATCH 38/70] agh --- .../hostile/mining_mobs/hivelord_outfits.dm | 132 +++++++++--------- 1 file changed, 65 insertions(+), 67 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 037eadf5d588..5dfdfcd6fbac 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -50,6 +50,30 @@ /obj/item/clothing/suit/ianshirt = 1 ) ) + back = pickweight(list( + /obj/item/storage/backpack = 1, + /obj/item/storage/backpack/satchel = 1, + /obj/item/storage/backpack/duffelbag = 1, + /obj/item/storage/backpack/messenger = 1, + /obj/item/storage/backpack/satchel/leather = 1 + ) + ) + if (prob(25)) + belt = pickweight(list( + /obj/item/gun/ballistic/automatic/pistol/m1911 = 2, + /obj/item/gun/ballistic/automatic/pistol/commander = 1, + /obj/item/gun/ballistic/automatic/pistol = 1, + /obj/item/gun/ballistic/revolver = 1, + /obj/item/gun/ballistic/revolver/pepperbox = 1, + ) + ) + if(prob(50)) + gloves = pickweight(list( + /obj/item/clothing/gloves/color/black = 1, + /obj/item/clothing/gloves/fingerless = 1, + /obj/item/clothing/gloves/color/white = 1, + ) + ) shoes = pickweight(list( /obj/item/clothing/shoes/laceup = 1, /obj/item/clothing/shoes/sandal = 1, @@ -79,24 +103,11 @@ ) ) if(prob(50)) - glasses = pickweight(list( - /obj/item/clothing/glasses/regular = 1, - /obj/item/clothing/glasses/regular/circle = 1, - /obj/item/clothing/glasses/regular/jamjar = 1, - /obj/item/clothing/glasses/eyepatch = 1, - /obj/item/clothing/glasses/cheapsuns = 1, - /obj/item/clothing/glasses/regular/hipster = 1, - /obj/item/clothing/glasses/cold = 1, - /obj/item/clothing/glasses/heat = 1, - /obj/item/clothing/glasses/orange = 1, - /obj/item/clothing/glasses/red = 1 - ) - ) - if(prob(50)) - gloves = pickweight(list( - /obj/item/clothing/gloves/color/black = 1, - /obj/item/clothing/gloves/fingerless = 1, - /obj/item/clothing/gloves/color/white = 1, + mask = pickweight(list( + /obj/item/clothing/mask/balaclava = 1, + /obj/item/clothing/mask/bandana/red = 1, + /obj/item/clothing/mask/gas = 1, + /obj/item/clothing/mask/breath = 1, ) ) if(prob(50)) @@ -111,59 +122,45 @@ ) ) if(prob(50)) - mask = pickweight(list( - /obj/item/clothing/mask/balaclava = 1, - /obj/item/clothing/mask/bandana/red = 1, - /obj/item/clothing/mask/gas = 1, - /obj/item/clothing/mask/breath = 1, + glasses = pickweight(list( + /obj/item/clothing/glasses/regular = 1, + /obj/item/clothing/glasses/regular/circle = 1, + /obj/item/clothing/glasses/regular/jamjar = 1, + /obj/item/clothing/glasses/eyepatch = 1, + /obj/item/clothing/glasses/cheapsuns = 1, + /obj/item/clothing/glasses/regular/hipster = 1, + /obj/item/clothing/glasses/cold = 1, + /obj/item/clothing/glasses/heat = 1, + /obj/item/clothing/glasses/orange = 1, + /obj/item/clothing/glasses/red = 1 ) ) - if (prob(5)) - belt = pickweight(list( - /obj/item/gun/ballistic/automatic/pistol/m1911 = 2, - /obj/item/gun/ballistic/automatic/pistol/commander = 1, - /obj/item/gun/ballistic/automatic/pistol = 1, - /obj/item/gun/ballistic/revolver = 1, - /obj/item/gun/ballistic/revolver/pepperbox = 1, + r_pocket = /obj/item/tank/internals/emergency_oxygen + l_pocket = /obj/item/radio + id = /obj/item/card/id + for(var/count in 1 to 3) + backpack_contents += pickweight(list( + /obj/item/dice/d20 = 1, + /obj/item/lipstick = 1, + /obj/item/clothing/mask/vape = 1, + /obj/item/clothing/mask/vape/cigar = 1, + /obj/item/reagent_containers/food/drinks/flask = 1, + /obj/item/lighter = 1, + /obj/item/toy/cards/deck = 1, + /obj/item/toy/eightball = 1, + /obj/item/storage/wallet = 1, + /obj/item/paicard = 1, + /obj/item/pen/fourcolor = 1, + /obj/item/paper_bin = 1, + /obj/item/cane = 1, + /obj/item/radio = 1, + /obj/item/dyespray = 1, + /obj/item/table_bell/brass = 1, + /obj/item/flashlight = 1, + /obj/item/crowbar/red = 1 ) ) - back = pickweight(list( - /obj/item/storage/backpack = 1, - /obj/item/storage/backpack/satchel = 1, - /obj/item/storage/backpack/duffelbag = 1, - /obj/item/storage/backpack/messenger = 1, - /obj/item/storage/backpack/satchel/leather = 1 - ) - ) - backpack_contents += pick( - /obj/item/dice/d20, - /obj/item/lipstick, - /obj/item/clothing/mask/vape, - /obj/item/clothing/mask/vape/cigar, - /obj/item/reagent_containers/food/drinks/flask, - /obj/item/lighter, - /obj/item/toy/cards/deck, - /obj/item/toy/eightball, - /obj/item/storage/wallet, - /obj/item/paicard, - /obj/item/pen/fourcolor, - /obj/item/paper_bin, - /obj/item/cane, - /obj/item/radio, - pick( - /obj/item/toy/plush/lizardplushie, - /obj/item/toy/plush/snakeplushie, - /obj/item/toy/plush/moth, - /obj/item/toy/plush/hornet, - /obj/item/toy/plush/hornet/gay, - /obj/item/toy/plush/knight, - /obj/item/toy/plush/among, - ), - /obj/item/dyespray, - /obj/item/table_bell/brass, - /obj/item/flashlight, - /obj/item/crowbar/red, - ) + box = /obj/item/storage/box/survival /datum/outfit/generic name = "Generic (Legion)" @@ -484,6 +481,7 @@ name = "Infiltrator" /datum/outfit/generic/syndicate/operative/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() uniform = /obj/item/clothing/under/syndicate shoes = /obj/item/clothing/shoes/combat ears = /obj/item/radio/headset/syndicate From 945e93f7410fdc349aaede9ae26be3553db8512d Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Wed, 29 Nov 2023 18:42:25 -0600 Subject: [PATCH 39/70] some more stufg --- .../simple_animal/hostile/mining_mobs/hivelord_outfits.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 5dfdfcd6fbac..879c4c8a7200 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -121,6 +121,7 @@ /obj/item/clothing/neck/stripedbluescarf = 1 ) ) + ears = pick(/obj/item/radio/headset, /obj/item/radio/headset/alt) if(prob(50)) glasses = pickweight(list( /obj/item/clothing/glasses/regular = 1, @@ -138,6 +139,7 @@ r_pocket = /obj/item/tank/internals/emergency_oxygen l_pocket = /obj/item/radio id = /obj/item/card/id + backpack_contents = list() for(var/count in 1 to 3) backpack_contents += pickweight(list( /obj/item/dice/d20 = 1, From 2d9b84c739a7cc7087a124a36e2ba6c8094b43e9 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Wed, 29 Nov 2023 22:22:50 -0600 Subject: [PATCH 40/70] put yo shirt on... --- .../hostile/mining_mobs/hivelord_outfits.dm | 60 +++++++------------ 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 879c4c8a7200..40e21cf2ed7c 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -6,19 +6,6 @@ /obj/item/clothing/under/color/black = 1, /obj/item/clothing/under/color/white = 1, /obj/item/clothing/under/color/random = 1, - /obj/item/clothing/under/shorts/black = 1, - /obj/item/clothing/under/shorts/grey = 1, - /obj/item/clothing/under/shorts/blue = 1, - /obj/item/clothing/under/shorts/green = 1, - /obj/item/clothing/under/pants/jeans = 1, - /obj/item/clothing/under/pants/khaki = 1, - /obj/item/clothing/under/pants/tan = 1, - /obj/item/clothing/under/pants/white = 1, - /obj/item/clothing/under/pants/red = 1, - /obj/item/clothing/under/pants/track = 1, - /obj/item/clothing/under/pants/blackjeans = 1, - /obj/item/clothing/under/pants/black = 1, - /obj/item/clothing/under/pants/camo = 1, /obj/item/clothing/under/suit/white = 1, /obj/item/clothing/under/suit/tan = 1, /obj/item/clothing/under/suit/black_really = 1, @@ -46,8 +33,6 @@ /obj/item/clothing/suit/toggle/industrial = 1, /obj/item/clothing/suit/toggle/hazard = 1, /obj/item/clothing/suit/poncho/green = 1, - /obj/item/clothing/suit/apron/overalls = 1, - /obj/item/clothing/suit/ianshirt = 1 ) ) back = pickweight(list( @@ -140,32 +125,31 @@ l_pocket = /obj/item/radio id = /obj/item/card/id backpack_contents = list() - for(var/count in 1 to 3) - backpack_contents += pickweight(list( - /obj/item/dice/d20 = 1, - /obj/item/lipstick = 1, - /obj/item/clothing/mask/vape = 1, - /obj/item/clothing/mask/vape/cigar = 1, - /obj/item/reagent_containers/food/drinks/flask = 1, - /obj/item/lighter = 1, - /obj/item/toy/cards/deck = 1, - /obj/item/toy/eightball = 1, - /obj/item/storage/wallet = 1, - /obj/item/paicard = 1, - /obj/item/pen/fourcolor = 1, - /obj/item/paper_bin = 1, - /obj/item/cane = 1, - /obj/item/radio = 1, - /obj/item/dyespray = 1, - /obj/item/table_bell/brass = 1, - /obj/item/flashlight = 1, - /obj/item/crowbar/red = 1 - ) + backpack_contents += pickweight(list( + /obj/item/dice/d20 = 1, + /obj/item/lipstick = 1, + /obj/item/clothing/mask/vape = 1, + /obj/item/clothing/mask/vape/cigar = 1, + /obj/item/reagent_containers/food/drinks/flask = 1, + /obj/item/lighter = 1, + /obj/item/toy/cards/deck = 1, + /obj/item/toy/eightball = 1, + /obj/item/storage/wallet = 1, + /obj/item/paicard = 1, + /obj/item/pen/fourcolor = 1, + /obj/item/paper_bin = 1, + /obj/item/cane = 1, + /obj/item/radio = 1, + /obj/item/dyespray = 1, + /obj/item/table_bell/brass = 1, + /obj/item/flashlight = 1, + /obj/item/crowbar/red = 1 ) - box = /obj/item/storage/box/survival + ) /datum/outfit/generic name = "Generic (Legion)" + box = /obj/item/storage/box/survival /datum/outfit/generic/engineer/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -190,6 +174,7 @@ /datum/outfit/generic/engineer name = "Mechanic (Legion)" + box = /obj/item/storage/box/survival/engineer /datum/outfit/generic/engineer/inteq/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -532,7 +517,6 @@ head = /obj/item/clothing/head/cowboy/sec/roumain if(prob(75)) suit_store = pickweight(list(/obj/item/gun/ballistic/shotgun/winchester = 9, /obj/item/gun/ballistic/shotgun/winchester = 1)) - r_pocket = /obj/item/book/manual/trickwines_4_brewers backpack_contents = list() if(prob(75)) backpack_contents += list(/obj/item/ammo_box/c38_box = 1) From 81ce16b4aaea839ab5520e217538d549e6e0dbc6 Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 6 Dec 2023 09:30:22 -0600 Subject: [PATCH 41/70] doctor!! --- .../closets/secure/engineering.dm | 4 -- .../hostile/mining_mobs/hivelord_outfits.dm | 48 ++++++++++++++++++- 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index ddde4a25af5d..c7f5bcfeec28 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -5,12 +5,10 @@ /obj/structure/closet/secure_closet/engineering_chief/PopulateContents() ..() - //WS Begin new /obj/item/clothing/head/beret/ce(src) //Berets new /obj/item/clothing/under/rank/command(src) //Better command uniforms new /obj/item/card/id/departmental_budget/eng(src) //Budger Cards new /obj/item/stack/tape/industrial/pro(src) //Better tape - //WS End new /obj/item/clothing/neck/cloak/ce(src) new /obj/item/clothing/under/rank/engineering/chief_engineer(src) new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src) @@ -41,9 +39,7 @@ /obj/structure/closet/secure_closet/engineering_electrical/PopulateContents() ..() var/static/items_inside = list( - //WS Begin /obj/item/stack/tape/industrial/electrical = 1, // Better tape - //WS End /obj/item/clothing/gloves/color/yellow = 2, /obj/item/storage/toolbox/electrical = 3, /obj/item/electronics/apc = 3, diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 40e21cf2ed7c..7ea3ff454a3e 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -163,14 +163,28 @@ belt = pick(/obj/item/storage/belt/utility/full, /obj/item/storage/belt/utility) if(prob(50)) head = /obj/item/clothing/head/welding + if(prob(75)) + ears = /obj/item/radio/headset/headset_eng else if(prob(50)) glasses = /obj/item/clothing/glasses/welding - if(prob(75)) - accessory = /obj/item/clothing/accessory/armband/engine if(prob(75)) back = pick(/obj/item/storage/backpack/industrial, /obj/item/storage/backpack/satchel/eng, /obj/item/storage/backpack/duffelbag/engineering, /obj/item/storage/backpack/messenger/engi) if(prob(10)) back = /obj/item/fireaxe + for(var/i = 1 to 3) + if(prob(75)) + backpack_contents += pickweight(list( + /obj/item/stack/tape/industrial/electrical = 1, + /obj/item/electronics/apc = 1, + /obj/item/multitool = 1, + /obj/item/pipe_dispenser = 1, + /obj/item/tank/internals/emergency_oxygen/engi = 1, + /obj/item/holosign_creator/engineering = 1, + /obj/item/extinguisher/advanced = 1, + ) + ) + if(prob(75)) + accessory = /obj/item/clothing/accessory/armband/engine /datum/outfit/generic/engineer name = "Mechanic (Legion)" @@ -194,10 +208,40 @@ . = ..() if(prob(75)) uniform = pick(/obj/item/clothing/under/rank/medical/doctor, /obj/item/clothing/under/rank/medical/doctor/blue) + if(prob(75)) + suit = pick(/obj/item/clothing/suit/toggle/labcoat, /obj/item/clothing/suit/apron/surgical ,/obj/item/clothing/suit/hooded/wintercoat/medical) + if(prob(75)) + back = pick(/obj/item/storage/backpack/medic, /obj/item/storage/backpack/satchel/med, /obj/item/storage/backpack/duffelbag/med, /obj/item/storage/backpack/messenger/med) + if(prob(75)) + gloves = /obj/item/clothing/gloves/color/white + if(prob(75)) + mask = /obj/item/clothing/mask/surgical + if(prob(75)) + shoes = /obj/item/clothing/shoes/sneakers/white + if(prob(75)) + ears = /obj/item/radio/headset/headset_med + for(var/i = 1 to 3) + if(prob(75)) + backpack_contents += pickweight(list( + /obj/item/storage/firstaid/medical = 1, + /obj/item/flashlight/pen = 1, + /obj/item/reagent_containers/glass/beaker = 2, + /obj/item/reagent_containers/dropper = 2, + /obj/item/storage/belt/medical = 1, + /obj/item/storage/box/syringes = 1, + /obj/item/reagent_containers/glass/bottle/toxin = 1, + /obj/item/reagent_containers/glass/bottle/morphine = 2, + /obj/item/reagent_containers/glass/bottle/epinephrine= 3, + /obj/item/reagent_containers/glass/bottle/charcoal = 3, + /obj/item/storage/box/rxglasses = 1 + ) + ) if(prob(75)) accessory = /obj/item/clothing/accessory/armband/medblue + /datum/outfit/generic/doctor name = "Medical Doctor (Legion)" + box = /obj/item/storage/box/survival/medical /datum/outfit/generic/miner/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() From fdd0c772629652723d009467d9a36cf8a8f4b3ac Mon Sep 17 00:00:00 2001 From: fallcon Date: Wed, 6 Dec 2023 09:46:10 -0600 Subject: [PATCH 42/70] this pr is really starting to smell tbh --- .../crates_lockers/closets/secure/medical.dm | 2 - .../hostile/mining_mobs/hivelord_outfits.dm | 43 ++++++++++--------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index cfdcca348b14..6c01be326e7a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -79,13 +79,11 @@ /obj/structure/closet/secure_closet/CMO/PopulateContents() ..() - //WS Begin new /obj/item/storage/belt/medical(src) //Gives the CMO a belt new /obj/item/storage/bag/medical(src) //Medibags new /obj/item/clothing/head/beret/cmo(src) //Berets new /obj/item/clothing/under/rank/command(src) //Better command uniforms new /obj/item/storage/box/hypospray/CMO(src) //Hypo mk. 2s - //WS End new /obj/item/clothing/neck/cloak/cmo(src) new /obj/item/clothing/suit/bio_suit/cmo(src) new /obj/item/clothing/head/bio_hood/cmo(src) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 7ea3ff454a3e..ed1c490a55ad 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -211,15 +211,21 @@ if(prob(75)) suit = pick(/obj/item/clothing/suit/toggle/labcoat, /obj/item/clothing/suit/apron/surgical ,/obj/item/clothing/suit/hooded/wintercoat/medical) if(prob(75)) - back = pick(/obj/item/storage/backpack/medic, /obj/item/storage/backpack/satchel/med, /obj/item/storage/backpack/duffelbag/med, /obj/item/storage/backpack/messenger/med) + back = pick(/obj/item/storage/backpack/medic, /obj/item/storage/backpack/satchel/med, /obj/item/storage/backpack/duffelbag/med, /obj/item/storage/backpack/messenger/med, /obj/item/defibrillator/loaded) + if(prob(75)) + belt = pick(/obj/item/storage/belt/medical, /obj/item/defibrillator/compact/loaded) if(prob(75)) gloves = /obj/item/clothing/gloves/color/white if(prob(75)) mask = /obj/item/clothing/mask/surgical if(prob(75)) - shoes = /obj/item/clothing/shoes/sneakers/white + shoes = pick(/obj/item/clothing/shoes/sneakers/white, /obj/item/clothing/gloves/color/latex/nitrile) + if(prob(75)) + head = /obj/item/clothing/head/beret/med if(prob(75)) ears = /obj/item/radio/headset/headset_med + if(prob(75)) + glasses = pick(/obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health/prescription) for(var/i = 1 to 3) if(prob(75)) backpack_contents += pickweight(list( @@ -227,15 +233,11 @@ /obj/item/flashlight/pen = 1, /obj/item/reagent_containers/glass/beaker = 2, /obj/item/reagent_containers/dropper = 2, - /obj/item/storage/belt/medical = 1, - /obj/item/storage/box/syringes = 1, - /obj/item/reagent_containers/glass/bottle/toxin = 1, - /obj/item/reagent_containers/glass/bottle/morphine = 2, - /obj/item/reagent_containers/glass/bottle/epinephrine= 3, - /obj/item/reagent_containers/glass/bottle/charcoal = 3, - /obj/item/storage/box/rxglasses = 1 - ) + /obj/item/storage/box/hypospray = 1, + /obj/item/storage/bag/medical = 1, + /obj/item/healthanalyzer/advanced = 1, ) + ) if(prob(75)) accessory = /obj/item/clothing/accessory/armband/medblue @@ -245,14 +247,15 @@ /datum/outfit/generic/miner/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() - uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland - if (prob(4)) + if(prob(75)) + uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland + if(prob(50)) belt = pickweight(list( /obj/item/storage/belt/mining = 2, /obj/item/storage/belt/mining/alt = 2 ) ) - else if(prob(10)) + else if(prob(50)) belt = pickweight(list( /obj/item/pickaxe = 8, /obj/item/pickaxe/mini = 4, @@ -261,10 +264,10 @@ /obj/item/gun/energy/kinetic_accelerator = 1 ) ) - else - belt = /obj/item/tank/internals/emergency_oxygen/engi - gloves = /obj/item/clothing/gloves/color/black - mask = /obj/item/clothing/mask/gas/explorer + if(prob(75)) + gloves = /obj/item/clothing/gloves/color/black + if(prob(75)) + mask = /obj/item/clothing/mask/gas/explorer if(prob(45)) glasses = /obj/item/clothing/glasses/meson if(prob(20)) @@ -392,21 +395,19 @@ /datum/outfit/generic/solgov/soldier/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() + uniform = /obj/item/clothing/under/solgov if(prob(90)) - uniform = /obj/item/clothing/under/solgov suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov shoes = /obj/item/clothing/shoes/jackboots gloves = /obj/item/clothing/gloves/color/black mask = /obj/item/clothing/mask/gas/sechailer head = /obj/item/clothing/head/solgov/sonnensoldner - id = /obj/item/card/id/solgov else - uniform = /obj/item/clothing/under/solgov suit = /obj/item/clothing/suit/space/hardsuit/solgov shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/combat mask = /obj/item/clothing/mask/gas/sechailer/swat - id = /obj/item/card/id/solgov + id = /obj/item/card/id/solgov if(prob(85)) back = /obj/item/storage/backpack backpack_contents = list() From d30f63ba66a9b1115a4eb39ad445ab41361161e7 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sun, 17 Dec 2023 22:43:13 -0600 Subject: [PATCH 43/70] yea --- .../hostile/mining_mobs/hivelord.dm | 14 +- .../hostile/mining_mobs/hivelord_outfits.dm | 202 +++++++++--------- 2 files changed, 113 insertions(+), 103 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 2a55cffb8ae6..737b1b22228a 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -413,10 +413,12 @@ "Miner" = 40, "Assistant" = 10, "Engineer" = 5, - //"Doctor" = 5, + "Doctor" = 5, //"Scientist" = 5, //"Cargo" = 5, + //"Security" = 5, //I dont like this guy, + /* "Oldminer" = 10, pick( /*I think imma each faction have a minor and major outfit @@ -433,16 +435,21 @@ //srm// "SRM", ) = 10 + */\ ) ) switch(type) if("Miner") outfit = /datum/outfit/generic/miner - if("Engineer") - outfit = /datum/outfit/generic/engineer if("Assistant") outfit = /datum/outfit/generic + if("Engineer") + outfit = /datum/outfit/generic/engineer + if("Doctor") + outfit = /datum/outfit/generic/doctor + + /* if("Oldminer") outfit = /datum/outfit/generic/oldminer if("Soldier") @@ -455,4 +462,5 @@ outfit = /datum/outfit/generic/engineer/inteq if("SRM") outfit = /datum/outfit/generic/srm/hunter + */ . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index ed1c490a55ad..e402b0e2c396 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -151,111 +151,17 @@ name = "Generic (Legion)" box = /obj/item/storage/box/survival -/datum/outfit/generic/engineer/pre_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - if(prob(75)) - uniform = pick(/obj/item/clothing/under/rank/engineering/engineer, /obj/item/clothing/under/rank/engineering/engineer/hazard, /obj/item/clothing/under/rank/security/officer/military/eng) - if(prob(75)) - suit = pick(/obj/item/clothing/suit/toggle/hazard, /obj/item/clothing/suit/hazardvest, /obj/item/clothing/suit/hooded/wintercoat/engineering) - if(prob(75)) - gloves = pick(/obj/item/clothing/gloves/color/yellow, /obj/item/clothing/gloves/color/fyellow, /obj/item/clothing/gloves/color/fyellow/old) - if(prob(75)) - belt = pick(/obj/item/storage/belt/utility/full, /obj/item/storage/belt/utility) - if(prob(50)) - head = /obj/item/clothing/head/welding - if(prob(75)) - ears = /obj/item/radio/headset/headset_eng - else if(prob(50)) - glasses = /obj/item/clothing/glasses/welding - if(prob(75)) - back = pick(/obj/item/storage/backpack/industrial, /obj/item/storage/backpack/satchel/eng, /obj/item/storage/backpack/duffelbag/engineering, /obj/item/storage/backpack/messenger/engi) - if(prob(10)) - back = /obj/item/fireaxe - for(var/i = 1 to 3) - if(prob(75)) - backpack_contents += pickweight(list( - /obj/item/stack/tape/industrial/electrical = 1, - /obj/item/electronics/apc = 1, - /obj/item/multitool = 1, - /obj/item/pipe_dispenser = 1, - /obj/item/tank/internals/emergency_oxygen/engi = 1, - /obj/item/holosign_creator/engineering = 1, - /obj/item/extinguisher/advanced = 1, - ) - ) - if(prob(75)) - accessory = /obj/item/clothing/accessory/armband/engine - -/datum/outfit/generic/engineer - name = "Mechanic (Legion)" - box = /obj/item/storage/box/survival/engineer - -/datum/outfit/generic/engineer/inteq/pre_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - if(prob(75)) - uniform = pick(/obj/item/clothing/under/syndicate/inteq/artificer, /obj/item/clothing/under/syndicate/inteq) - if(prob(75)) - head = pick(/obj/item/clothing/head/hardhat/white, /obj/item/clothing/head/soft/inteq) - if(prob(75)) - shoes = /obj/item/clothing/shoes/combat - if(prob(75)) - back = /obj/item/storage/backpack/messenger/inteq - -/datum/outfit/generic/engineer/inteq - name = "Artificer (Legion)" - -/datum/outfit/generic/doctor/pre_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - if(prob(75)) - uniform = pick(/obj/item/clothing/under/rank/medical/doctor, /obj/item/clothing/under/rank/medical/doctor/blue) - if(prob(75)) - suit = pick(/obj/item/clothing/suit/toggle/labcoat, /obj/item/clothing/suit/apron/surgical ,/obj/item/clothing/suit/hooded/wintercoat/medical) - if(prob(75)) - back = pick(/obj/item/storage/backpack/medic, /obj/item/storage/backpack/satchel/med, /obj/item/storage/backpack/duffelbag/med, /obj/item/storage/backpack/messenger/med, /obj/item/defibrillator/loaded) - if(prob(75)) - belt = pick(/obj/item/storage/belt/medical, /obj/item/defibrillator/compact/loaded) - if(prob(75)) - gloves = /obj/item/clothing/gloves/color/white - if(prob(75)) - mask = /obj/item/clothing/mask/surgical - if(prob(75)) - shoes = pick(/obj/item/clothing/shoes/sneakers/white, /obj/item/clothing/gloves/color/latex/nitrile) - if(prob(75)) - head = /obj/item/clothing/head/beret/med - if(prob(75)) - ears = /obj/item/radio/headset/headset_med - if(prob(75)) - glasses = pick(/obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health/prescription) - for(var/i = 1 to 3) - if(prob(75)) - backpack_contents += pickweight(list( - /obj/item/storage/firstaid/medical = 1, - /obj/item/flashlight/pen = 1, - /obj/item/reagent_containers/glass/beaker = 2, - /obj/item/reagent_containers/dropper = 2, - /obj/item/storage/box/hypospray = 1, - /obj/item/storage/bag/medical = 1, - /obj/item/healthanalyzer/advanced = 1, - ) - ) - if(prob(75)) - accessory = /obj/item/clothing/accessory/armband/medblue - -/datum/outfit/generic/doctor - name = "Medical Doctor (Legion)" - box = /obj/item/storage/box/survival/medical - /datum/outfit/generic/miner/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() if(prob(75)) - uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland + uniform = pick(/obj/item/clothing/under/rank/cargo/miner/lavaland, /obj/item/clothing/under/rank/cargo/miner, /obj/item/clothing/under/rank/cargo/miner/lavaland/old) if(prob(50)) belt = pickweight(list( /obj/item/storage/belt/mining = 2, /obj/item/storage/belt/mining/alt = 2 ) ) - else if(prob(50)) + else if(prob(75)) belt = pickweight(list( /obj/item/pickaxe = 8, /obj/item/pickaxe/mini = 4, @@ -329,6 +235,86 @@ /datum/outfit/generic/miner name = "Miner (Legion)" +/datum/outfit/generic/engineer/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(prob(75)) + uniform = pick(/obj/item/clothing/under/rank/engineering/engineer, /obj/item/clothing/under/rank/engineering/engineer/hazard, /obj/item/clothing/under/rank/security/officer/military/eng) + if(prob(75)) + suit = pick(/obj/item/clothing/suit/toggle/hazard, /obj/item/clothing/suit/hazardvest, /obj/item/clothing/suit/hooded/wintercoat/engineering) + if(prob(75)) + gloves = pick(/obj/item/clothing/gloves/color/yellow, /obj/item/clothing/gloves/color/fyellow, /obj/item/clothing/gloves/color/fyellow/old) + if(prob(75)) + belt = pick(/obj/item/storage/belt/utility/full, /obj/item/storage/belt/utility) + if(prob(50)) + head = /obj/item/clothing/head/welding + if(prob(75)) + ears = /obj/item/radio/headset/headset_eng + else if(prob(50)) + glasses = /obj/item/clothing/glasses/welding + if(prob(75)) + back = pick(/obj/item/storage/backpack/industrial, /obj/item/storage/backpack/satchel/eng, /obj/item/storage/backpack/duffelbag/engineering, /obj/item/storage/backpack/messenger/engi) + if(prob(10)) + back = /obj/item/fireaxe + for(var/i = 1 to 3) + if(prob(75)) + backpack_contents += pickweight(list( + /obj/item/stack/tape/industrial/electrical = 1, + /obj/item/electronics/apc = 1, + /obj/item/multitool = 1, + /obj/item/pipe_dispenser = 1, + /obj/item/tank/internals/emergency_oxygen/engi = 1, + /obj/item/holosign_creator/engineering = 1, + /obj/item/extinguisher/advanced = 1, + ) + ) + if(prob(75)) + accessory = /obj/item/clothing/accessory/armband/engine + +/datum/outfit/generic/engineer + name = "Mechanic (Legion)" + box = /obj/item/storage/box/survival/engineer + +/datum/outfit/generic/doctor/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(prob(75)) + uniform = pick(/obj/item/clothing/under/rank/medical/doctor, /obj/item/clothing/under/rank/medical/doctor/blue) + if(prob(75)) + suit = pick(/obj/item/clothing/suit/toggle/labcoat, /obj/item/clothing/suit/apron/surgical ,/obj/item/clothing/suit/hooded/wintercoat/medical) + if(prob(75)) + back = pick(/obj/item/storage/backpack/medic, /obj/item/storage/backpack/satchel/med, /obj/item/storage/backpack/duffelbag/med, /obj/item/storage/backpack/messenger/med, /obj/item/defibrillator/loaded) + if(prob(75)) + belt = pick(/obj/item/storage/belt/medical, /obj/item/defibrillator/compact/loaded) + if(prob(75)) + gloves = /obj/item/clothing/gloves/color/white + if(prob(75)) + mask = /obj/item/clothing/mask/surgical + if(prob(75)) + shoes = pick(/obj/item/clothing/shoes/sneakers/white, /obj/item/clothing/gloves/color/latex/nitrile) + if(prob(75)) + head = /obj/item/clothing/head/beret/med + if(prob(75)) + ears = /obj/item/radio/headset/headset_med + if(prob(75)) + glasses = pick(/obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health/prescription) + for(var/i = 1 to 3) + if(prob(75)) + backpack_contents += pickweight(list( + /obj/item/storage/firstaid/medical = 1, + /obj/item/flashlight/pen = 1, + /obj/item/reagent_containers/glass/beaker = 2, + /obj/item/reagent_containers/dropper = 2, + /obj/item/storage/box/hypospray = 1, + /obj/item/storage/bag/medical = 1, + /obj/item/healthanalyzer/advanced = 1, + ) + ) + if(prob(75)) + accessory = /obj/item/clothing/accessory/armband/medblue + +/datum/outfit/generic/doctor + name = "Medical Doctor (Legion)" + box = /obj/item/storage/box/survival/medical + /datum/outfit/generic/oldminer/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() suit = /obj/item/clothing/suit/hooded/explorer/old @@ -393,6 +379,20 @@ /datum/outfit/generic/oldminer name = "Old Miner (Legion)" +/datum/outfit/generic/engineer/inteq/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(prob(75)) + uniform = pick(/obj/item/clothing/under/syndicate/inteq/artificer, /obj/item/clothing/under/syndicate/inteq) + if(prob(75)) + head = pick(/obj/item/clothing/head/hardhat/white, /obj/item/clothing/head/soft/inteq) + if(prob(75)) + shoes = /obj/item/clothing/shoes/combat + if(prob(75)) + back = /obj/item/storage/backpack/messenger/inteq + +/datum/outfit/generic/engineer/inteq + name = "Artificer (Legion)" + /datum/outfit/generic/solgov/soldier/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() uniform = /obj/item/clothing/under/solgov @@ -457,7 +457,7 @@ ) /datum/outfit/generic/solgov/soldier - name = "Soldier" + name = "Soldier (Legion)" /datum/outfit/generic/syndicate/infiltrator/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -510,7 +510,7 @@ ) /datum/outfit/generic/syndicate/infiltrator - name = "Infiltrator" + name = "Infiltrator (Legion)" /datum/outfit/generic/syndicate/operative/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -535,7 +535,7 @@ back = /obj/item/storage/backpack /datum/outfit/generic/syndicate/operative - name = "Operative" + name = "Operative (Legion)" /datum/outfit/generic/srm/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -547,6 +547,7 @@ belt = pick(list(/obj/item/kitchen/knife/hunting = 1, /obj/item/gun/ballistic/derringer = 1)) /datum/outfit/generic/srm + name = "SRM (Legion)" /datum/outfit/generic/srm/shadow/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -554,7 +555,7 @@ head = /obj/item/clothing/head/cowboy/sec/roumain/shadow /datum/outfit/generic/srm/shadow - name = "Shadow" + name = "Shadow (Legion)" /datum/outfit/generic/srm/hunter/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -575,3 +576,4 @@ /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine,) = 2) /datum/outfit/generic/srm/hunter + name = "Hunter (Legion)" From 0898a3cf35c3128d5c038b9850283cb06d5c9b04 Mon Sep 17 00:00:00 2001 From: fallcon Date: Mon, 18 Dec 2023 09:59:54 -0600 Subject: [PATCH 44/70] faction stuff is eh --- .../hostile/mining_mobs/hivelord_outfits.dm | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index e402b0e2c396..4c1c09412896 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -315,6 +315,35 @@ name = "Medical Doctor (Legion)" box = /obj/item/storage/box/survival/medical +/datum/outfit/generic/science/pre_equip(mob/living/carbon/human/H) + ..() + if(prob(75)) + uniform = pick(/obj/item/clothing/under/rank/rnd/scientist, /obj/item/clothing/under/rank/rnd/roboticist) + if(prob(75)) + suit = pick(/obj/item/clothing/suit/toggle/labcoat/science, /obj/item/clothing/suit/toggle/suspenders/blue, /obj/item/clothing/suit/hooded/wintercoat/science) + if(prob(75)) + back = pick(/obj/item/storage/backpack/science, /obj/item/storage/backpack/satchel/tox, /obj/item/storage/backpack/messenger/tox) + if(prob(75)) + shoes = /obj/item/clothing/shoes/sneakers/white + if(prob(75)) + gloves = /obj/item/clothing/gloves/color/white + if(prob(75)) + head = /obj/item/clothing/head/beret/sci + if(prob(75)) + ear = /obj/item/radio/headset/headset_sci + if(prob(1)) + neck = /obj/item/clothing/neck/tie/horrible + + +/datum/outfit/generic/science + name = "Scientist (Legion)" + +/datum/outfit/generic/cargo + name = "Cargo Technician (Legion)" + +/datum/outfit/generic/security + name = "Security Officer (Legion)" +/* /datum/outfit/generic/oldminer/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() suit = /obj/item/clothing/suit/hooded/explorer/old @@ -376,6 +405,7 @@ /obj/item/borg/upgrade/modkit/cooldown = 1 ) ) + /datum/outfit/generic/oldminer name = "Old Miner (Legion)" @@ -577,3 +607,5 @@ /datum/outfit/generic/srm/hunter name = "Hunter (Legion)" + +*/ From f027a0c6d8870addece7256302c31c0f048863f1 Mon Sep 17 00:00:00 2001 From: fallcon Date: Mon, 18 Dec 2023 10:23:41 -0600 Subject: [PATCH 45/70] shrug --- .../hostile/mining_mobs/hivelord_outfits.dm | 53 ++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 4c1c09412896..6f14975ef848 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -320,7 +320,7 @@ if(prob(75)) uniform = pick(/obj/item/clothing/under/rank/rnd/scientist, /obj/item/clothing/under/rank/rnd/roboticist) if(prob(75)) - suit = pick(/obj/item/clothing/suit/toggle/labcoat/science, /obj/item/clothing/suit/toggle/suspenders/blue, /obj/item/clothing/suit/hooded/wintercoat/science) + suit = pick(/obj/item/clothing/suit/toggle/labcoat/science, /obj/item/clothing/suit/hooded/wintercoat/science) if(prob(75)) back = pick(/obj/item/storage/backpack/science, /obj/item/storage/backpack/satchel/tox, /obj/item/storage/backpack/messenger/tox) if(prob(75)) @@ -333,16 +333,67 @@ ear = /obj/item/radio/headset/headset_sci if(prob(1)) neck = /obj/item/clothing/neck/tie/horrible + if(prob(75)) + accessory = /obj/item/clothing/accessory/armband/science /datum/outfit/generic/science name = "Scientist (Legion)" +/datum/outfit/generic/cargo/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(prob(75)) + uniform = pick(/obj/item/clothing/under/rank/cargo/tech, /obj/item/clothing/under/shorts/grey) + if(prob(75)) + suit = pick(/obj/item/clothing/suit/hazardvest, /obj/item/clothing/suit/hooded/wintercoat/cargo) + if(prob(75)) + gloves = /obj/item/clothing/gloves/fingerless + if(prob(75)) + shoes = /obj/item/clothing/shoes/sneakers/black + if(prob(75)) + head = /obj/item/clothing/head/soft + if(prob(75)) + ears = /obj/item/radio/headset/headset_cargo + if(prob(75)) + backpack_contents += pick(list(/obj/item/export_scanner, /obj/item/modular_computer/tablet/preset/cargo)) + if(prob(75)) + accessory = /obj/item/clothing/accessory/armband/cargo + /datum/outfit/generic/cargo name = "Cargo Technician (Legion)" +/datum/outfit/generic/security/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(prob(75)) + uniform = /obj/item/clothing/under/rank/security/officer + if(prob(75)) + suit = pick(/obj/item/clothing/suit/armor/vest, /obj/item/clothing/suit/armor/vest/security/officer) + if(prob(75)) + back = pick(/obj/item/storage/backpack/security, /obj/item/storage/backpack/satchel/sec, /obj/item/storage/backpack/duffelbag/sec, /obj/item/storage/backpack/messenger/sec) + if(prob(75)) + belt = pick(/obj/item/storage/belt/security, /obj/item/storage/belt/security/webbing) + if(prob(75)) + gloves = /obj/item/clothing/gloves/color/black + if(prob(75)) + shoes = /obj/item/clothing/shoes/jackboots + if(prob(75)) + head = /obj/item/clothing/head/helmet/sec + if(prob(75)) + mask = /obj/item/clothing/mask/gas/sechailer + if(prob(75)) + ears = /obj/item/radio/headset/headset_sec + if(prob(75)) + glasses = pick(/obj/item/clothing/glasses/hud/security) + if(prob(75)) + l_pocket = /obj/item/restraints/handcuffs + if(prob(75)) + r_pocket = /obj/item/assembly/flash/handheld + if(prob(75)) + accessory = /obj/item/clothing/accessory/armband/deputy + /datum/outfit/generic/security name = "Security Officer (Legion)" + box = /obj/item/storage/box/survival/security /* /datum/outfit/generic/oldminer/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() From 50cf704306d87bfeef42df0e8e2f21114e6a4419 Mon Sep 17 00:00:00 2001 From: fallcon Date: Mon, 18 Dec 2023 10:29:24 -0600 Subject: [PATCH 46/70] miner loot rate tweak --- .../hostile/mining_mobs/hivelord_outfits.dm | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 6f14975ef848..6683b0451d38 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -154,8 +154,16 @@ /datum/outfit/generic/miner/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() if(prob(75)) - uniform = pick(/obj/item/clothing/under/rank/cargo/miner/lavaland, /obj/item/clothing/under/rank/cargo/miner, /obj/item/clothing/under/rank/cargo/miner/lavaland/old) - if(prob(50)) + uniform = pick(/obj/item/clothing/under/rank/cargo/miner/lavaland, /obj/item/clothing/under/rank/cargo/miner) + if(prob(25)) + suit = pickweight(list( + /obj/item/clothing/suit/hooded/explorer = 18, + /obj/item/clothing/suit/hooded/cloak/goliath = 2 + ) + ) + if(prob(75)) + back = /obj/item/storage/backpack/explorer + if(prob(75)) belt = pickweight(list( /obj/item/storage/belt/mining = 2, /obj/item/storage/belt/mining/alt = 2 @@ -172,17 +180,13 @@ ) if(prob(75)) gloves = /obj/item/clothing/gloves/color/black + if(prob(75)) + shoes = /obj/item/clothing/shoes/workboots/mining if(prob(75)) mask = /obj/item/clothing/mask/gas/explorer - if(prob(45)) + if(prob(50)) glasses = /obj/item/clothing/glasses/meson - if(prob(20)) - suit = pickweight(list( - /obj/item/clothing/suit/hooded/explorer = 18, - /obj/item/clothing/suit/hooded/cloak/goliath = 2 - ) - ) - if(prob(30)) + if(prob(50)) r_pocket = pickweight(list( /obj/item/stack/marker_beacon = 20, /obj/item/spacecash/bundle/mediumrand = 7, @@ -190,15 +194,14 @@ /obj/item/borg/upgrade/modkit/damage = 1 ) ) - if(prob(10)) + if(prob(25)) l_pocket = pickweight(list( - /obj/item/spacecash/bundle/mediumrand = 7, + /obj/item/spacecash/bundle/mediumrand = 5, /obj/item/reagent_containers/hypospray/medipen/survival = 2, /obj/item/borg/upgrade/modkit/cooldown = 1 ) ) - if(prob(95)) - back = /obj/item/storage/backpack/explorer + if(prob(75)) for(var/count in 1 to 3) if(prob(70)) backpack_contents += pickweight(list( @@ -228,7 +231,7 @@ ) ) ) - else + else if (prob(75)) back = /obj/item/kinetic_crusher backpack_contents = list() From 35f8e35449a1bffdc922bfccbdad1bc63383ec92 Mon Sep 17 00:00:00 2001 From: fallcon Date: Mon, 18 Dec 2023 10:34:35 -0600 Subject: [PATCH 47/70] all look like jobs now, need to add real loot --- .../simple_animal/hostile/mining_mobs/hivelord.dm | 13 +++++++++---- .../mob/living/simple_animal/hostile/survivors.dm | 13 +++++++------ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 737b1b22228a..213e686957bd 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -414,9 +414,9 @@ "Assistant" = 10, "Engineer" = 5, "Doctor" = 5, - //"Scientist" = 5, - //"Cargo" = 5, - //"Security" = 5, + "Scientist" = 5, + "Cargo" = 5, + "Security" = 5, //I dont like this guy, /* "Oldminer" = 10, @@ -448,7 +448,12 @@ outfit = /datum/outfit/generic/engineer if("Doctor") outfit = /datum/outfit/generic/doctor - + if("Scientist") + outfit = /datum/outfit/generic/science + if("Cargo") + outfit = /datum/outfit/generic/cargo + if("Security") + outfit = /datum/outfit/generic/security /* if("Oldminer") outfit = /datum/outfit/generic/oldminer diff --git a/code/modules/mob/living/simple_animal/hostile/survivors.dm b/code/modules/mob/living/simple_animal/hostile/survivors.dm index c0601050c54c..009d627b4ab7 100644 --- a/code/modules/mob/living/simple_animal/hostile/survivors.dm +++ b/code/modules/mob/living/simple_animal/hostile/survivors.dm @@ -93,12 +93,13 @@ /obj/effect/mob_spawn/human/corpse/damaged/whitesands/Initialize() //everything here should equal out to 100 for the sake of my sanity. mob_species = pickweight(list( - /datum/species/human = 50, - /datum/species/lizard = 25, - /datum/species/ethereal = 10, - /datum/species/moth = 10, - /datum/species/spider = 3, - /datum/species/fly = 2 + /datum/species/human = 31, + /datum/species/lizard = 26, + /datum/species/ethereal = 24, + /datum/species/spider = 7, + /datum/species/ipc = 7, + /datum/species/jelly = 4, + /datum/species/fly = 1 ) ) //to-do: learn how to make mobsprites for other survivors From 42743b3ea24e7f2a4fba4cec146af5ee1f2fe252 Mon Sep 17 00:00:00 2001 From: fallcon Date: Mon, 18 Dec 2023 13:11:08 -0600 Subject: [PATCH 48/70] yea --- .../simple_animal/hostile/mining_mobs/hivelord_outfits.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 6683b0451d38..7ba974144fe3 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -358,9 +358,11 @@ if(prob(75)) ears = /obj/item/radio/headset/headset_cargo if(prob(75)) - backpack_contents += pick(list(/obj/item/export_scanner, /obj/item/modular_computer/tablet/preset/cargo)) + backpack_contents += pick(list(/obj/item/export_scanner, /obj/item/modular_computer/tablet/preset/cargo, /obj/item/spacecash/bundle/mediumrand )) if(prob(75)) accessory = /obj/item/clothing/accessory/armband/cargo + if(prob(25)) + back = /obj/item/gun/ballistic/rifle/boltaction //An attempt to refrence gun cargo /datum/outfit/generic/cargo name = "Cargo Technician (Legion)" @@ -370,7 +372,7 @@ if(prob(75)) uniform = /obj/item/clothing/under/rank/security/officer if(prob(75)) - suit = pick(/obj/item/clothing/suit/armor/vest, /obj/item/clothing/suit/armor/vest/security/officer) + suit = pick(/obj/item/clothing/suit/armor/vest, /obj/item/clothing/suit/armor/vest/security/officer, /obj/item/clothing/suit/armor/vest/bulletproof) if(prob(75)) back = pick(/obj/item/storage/backpack/security, /obj/item/storage/backpack/satchel/sec, /obj/item/storage/backpack/duffelbag/sec, /obj/item/storage/backpack/messenger/sec) if(prob(75)) From 6e42b041cc5b789f0ffc6d8ad5590f73c1bea352 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 14:25:41 -0600 Subject: [PATCH 49/70] agh --- .../hostile/mining_mobs/hivelord_outfits.dm | 93 ++++++++++++------- 1 file changed, 58 insertions(+), 35 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 7ba974144fe3..d3c6ed83286a 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -32,7 +32,6 @@ /obj/item/clothing/suit/gothcoat = 1, /obj/item/clothing/suit/toggle/industrial = 1, /obj/item/clothing/suit/toggle/hazard = 1, - /obj/item/clothing/suit/poncho/green = 1, ) ) back = pickweight(list( @@ -63,7 +62,6 @@ /obj/item/clothing/shoes/laceup = 1, /obj/item/clothing/shoes/sandal = 1, /obj/item/clothing/shoes/winterboots = 1, - /obj/item/clothing/shoes/jackboots = 1, /obj/item/clothing/shoes/workboots/mining = 1, /obj/item/clothing/shoes/workboots = 1, /obj/item/clothing/shoes/sneakers/black = 1, @@ -73,29 +71,28 @@ ) if(prob(50)) head = pickweight(list( - /obj/item/clothing/head/hardhat = 1, - /obj/item/clothing/head/hardhat/orange = 1, - /obj/item/clothing/head/hardhat/dblue = 1, - /obj/item/clothing/head/beret = 1, - /obj/item/clothing/head/beret/grey = 1, - /obj/item/clothing/head/beret/ce = 1, - /obj/item/clothing/head/flatcap = 1, - /obj/item/clothing/head/beanie = 1, - /obj/item/clothing/head/foilhat = 1, - /obj/item/clothing/head/cowboy = 1, + /obj/item/clothing/head/beret = 3, + /obj/item/clothing/head/beret/grey = 3, + /obj/item/clothing/head/flatcap = 3, + /obj/item/clothing/head/beanie = 3, + /obj/item/clothing/head/cowboy = 3, + /obj/item/clothing/head/trapper = 2, + /obj/item/clothing/head/hardhat = 2, + /obj/item/clothing/head/hardhat/orange = 2, + /obj/item/clothing/head/hardhat/dblue = 2, /obj/item/clothing/head/pirate = 1, - /obj/item/clothing/head/trapper = 1 + /obj/item/clothing/head/foilhat = 1 ) ) if(prob(50)) mask = pickweight(list( /obj/item/clothing/mask/balaclava = 1, /obj/item/clothing/mask/bandana/red = 1, - /obj/item/clothing/mask/gas = 1, - /obj/item/clothing/mask/breath = 1, + /obj/item/clothing/mask/gas = 3, + /obj/item/clothing/mask/breath = 3, ) ) - if(prob(50)) + if(prob(25)) neck = pickweight(list( /obj/item/clothing/neck/scarf/red = 1, /obj/item/clothing/neck/scarf/green = 1, @@ -118,11 +115,12 @@ /obj/item/clothing/glasses/cold = 1, /obj/item/clothing/glasses/heat = 1, /obj/item/clothing/glasses/orange = 1, - /obj/item/clothing/glasses/red = 1 ) ) - r_pocket = /obj/item/tank/internals/emergency_oxygen - l_pocket = /obj/item/radio + if(prob(75)) + r_pocket = /obj/item/tank/internals/emergency_oxygen + if(prob(75)) + l_pocket = pick(/obj/item/radio, /obj/item/flashlight) id = /obj/item/card/id backpack_contents = list() backpack_contents += pickweight(list( @@ -286,7 +284,7 @@ if(prob(75)) back = pick(/obj/item/storage/backpack/medic, /obj/item/storage/backpack/satchel/med, /obj/item/storage/backpack/duffelbag/med, /obj/item/storage/backpack/messenger/med, /obj/item/defibrillator/loaded) if(prob(75)) - belt = pick(/obj/item/storage/belt/medical, /obj/item/defibrillator/compact/loaded) + belt = pickweight(list(/obj/item/storage/belt/medical = 5, /obj/item/defibrillator/compact/loaded = 1)) if(prob(75)) gloves = /obj/item/clothing/gloves/color/white if(prob(75)) @@ -302,13 +300,13 @@ for(var/i = 1 to 3) if(prob(75)) backpack_contents += pickweight(list( - /obj/item/storage/firstaid/medical = 1, - /obj/item/flashlight/pen = 1, + /obj/item/storage/firstaid/medical = 3, /obj/item/reagent_containers/glass/beaker = 2, /obj/item/reagent_containers/dropper = 2, - /obj/item/storage/box/hypospray = 1, + /obj/item/flashlight/pen = 1, + /obj/item/hypospray/mkii = 1, /obj/item/storage/bag/medical = 1, - /obj/item/healthanalyzer/advanced = 1, + /obj/item/healthanalyzer = 1, ) ) if(prob(75)) @@ -333,7 +331,9 @@ if(prob(75)) head = /obj/item/clothing/head/beret/sci if(prob(75)) - ear = /obj/item/radio/headset/headset_sci + ears = /obj/item/radio/headset/headset_sci + if(prob(75)) + glasses = pick(/obj/item/clothing/glasses/hud/diagnostic, /obj/item/clothing/glasses/science) if(prob(1)) neck = /obj/item/clothing/neck/tie/horrible if(prob(75)) @@ -357,12 +357,21 @@ head = /obj/item/clothing/head/soft if(prob(75)) ears = /obj/item/radio/headset/headset_cargo - if(prob(75)) - backpack_contents += pick(list(/obj/item/export_scanner, /obj/item/modular_computer/tablet/preset/cargo, /obj/item/spacecash/bundle/mediumrand )) + for(var/i = 1 to 3) + if(prob(75)) + backpack_contents += pickweight(list( + /obj/item/export_scanner = 1, + /obj/item/modular_computer/tablet/preset/cargo = 1, + /obj/item/spacecash/bundle/mediumrand = 2, + /obj/item/ammo_box/a762 = 2, + /obj/item/grenade/frag = 1 + ) + ) if(prob(75)) accessory = /obj/item/clothing/accessory/armband/cargo if(prob(25)) - back = /obj/item/gun/ballistic/rifle/boltaction //An attempt to refrence gun cargo + suit = /obj/item/clothing/suit/armor/vest/scrap_armor + suit_store = /obj/item/gun/ballistic/rifle/boltaction //An attempt to refrence gun cargo /datum/outfit/generic/cargo name = "Cargo Technician (Legion)" @@ -372,27 +381,41 @@ if(prob(75)) uniform = /obj/item/clothing/under/rank/security/officer if(prob(75)) - suit = pick(/obj/item/clothing/suit/armor/vest, /obj/item/clothing/suit/armor/vest/security/officer, /obj/item/clothing/suit/armor/vest/bulletproof) + suit = pick(/obj/item/clothing/suit/armor/vest, /obj/item/clothing/suit/armor/vest/security/officer, /obj/item/clothing/suit/armor/vest/bulletproof, /obj/item/clothing/suit/armor/vest/blueshirt) if(prob(75)) back = pick(/obj/item/storage/backpack/security, /obj/item/storage/backpack/satchel/sec, /obj/item/storage/backpack/duffelbag/sec, /obj/item/storage/backpack/messenger/sec) if(prob(75)) belt = pick(/obj/item/storage/belt/security, /obj/item/storage/belt/security/webbing) if(prob(75)) - gloves = /obj/item/clothing/gloves/color/black + gloves = pick(/obj/item/clothing/gloves/color/black, /obj/item/clothing/gloves/tackler) if(prob(75)) shoes = /obj/item/clothing/shoes/jackboots if(prob(75)) - head = /obj/item/clothing/head/helmet/sec + head = pick(/obj/item/clothing/head/helmet/sec, /obj/item/clothing/head/helmet/blueshirt, /obj/item/clothing/head/helmet/bulletproof) if(prob(75)) mask = /obj/item/clothing/mask/gas/sechailer if(prob(75)) ears = /obj/item/radio/headset/headset_sec if(prob(75)) - glasses = pick(/obj/item/clothing/glasses/hud/security) - if(prob(75)) - l_pocket = /obj/item/restraints/handcuffs + glasses = pick(/obj/item/clothing/glasses/hud/security, /obj/item/clothing/glasses/sunglasses) if(prob(75)) - r_pocket = /obj/item/assembly/flash/handheld + r_pocket = pick(/obj/item/flashlight/seclite, /obj/item/assembly/flash/handheld, /obj/item/restraints/handcuffs) + if(prob(50)) + suit_store = pick(/obj/item/gun/energy/e_gun, /obj/item/gun/energy/e_gun/smg, /obj/item/gun/energy/e_gun/iot) + for(var/i = 1 to 3) + if(prob(75)) + backpack_contents += pickweight(list( + /obj/item/restraints/handcuffs = 8, + /obj/item/assembly/flash/handheld = 5, + /obj/item/storage/box/evidence = 6, + /obj/item/flashlight/seclite = 4, + /obj/item/ammo_box/c9mm/rubbershot = 3, + /obj/item/ammo_box/c9mm = 1, + /obj/item/stock_parts/cell/gun = 3, + /obj/item/coin/antagtoken = 1, + /obj/item/grenade/stingbang = 1 + ) + ) if(prob(75)) accessory = /obj/item/clothing/accessory/armband/deputy From 8f65870dcabc474f528418105009eb27040fc6a1 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 14:41:45 -0600 Subject: [PATCH 50/70] no more faction gear --- .../hostile/mining_mobs/hivelord.dm | 29 --- .../hostile/mining_mobs/hivelord_outfits.dm | 213 +----------------- 2 files changed, 8 insertions(+), 234 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 213e686957bd..32e861b7b3da 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -417,25 +417,6 @@ "Scientist" = 5, "Cargo" = 5, "Security" = 5, - //I dont like this guy, - /* - "Oldminer" = 10, - pick( - /*I think imma each faction have a minor and major outfit - 10% chance for the major - Both should reflect the factions strengths if convinent*/ - //solgov// - "Soldier", - //cmm// - //syndi// - pick("Infiltrator", "Operative"), - //nanotrasen// - //inteq// - "Artificer", - //srm// - "SRM", - ) = 10 - */\ ) ) @@ -457,15 +438,5 @@ /* if("Oldminer") outfit = /datum/outfit/generic/oldminer - if("Soldier") - outfit = /datum/outfit/generic/solgov/soldier - if("Infiltrator") - outfit = /datum/outfit/generic/syndicate/infiltrator - if("Operative") - outfit = /datum/outfit/generic/syndicate/operative - if("Artificer") - outfit = /datum/outfit/generic/engineer/inteq - if("SRM") - outfit = /datum/outfit/generic/srm/hunter */ . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index d3c6ed83286a..f037b48a1ebd 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -42,7 +42,7 @@ /obj/item/storage/backpack/satchel/leather = 1 ) ) - if (prob(25)) + if (prob(10)) belt = pickweight(list( /obj/item/gun/ballistic/automatic/pistol/m1911 = 2, /obj/item/gun/ballistic/automatic/pistol/commander = 1, @@ -360,10 +360,12 @@ for(var/i = 1 to 3) if(prob(75)) backpack_contents += pickweight(list( - /obj/item/export_scanner = 1, - /obj/item/modular_computer/tablet/preset/cargo = 1, - /obj/item/spacecash/bundle/mediumrand = 2, - /obj/item/ammo_box/a762 = 2, + /obj/item/spacecash/bundle/mediumrand = 5, + /obj/item/ammo_box/a762 = 5, + /obj/item/modular_computer/tablet/preset/cargo = 3, + /obj/item/stack/tape = 3, + /obj/item/stack/tape/industrial = 3, + /obj/item/stack/sheet/plastic/five = 3, /obj/item/grenade/frag = 1 ) ) @@ -422,6 +424,7 @@ /datum/outfit/generic/security name = "Security Officer (Legion)" box = /obj/item/storage/box/survival/security + /* /datum/outfit/generic/oldminer/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -487,204 +490,4 @@ /datum/outfit/generic/oldminer name = "Old Miner (Legion)" - -/datum/outfit/generic/engineer/inteq/pre_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - if(prob(75)) - uniform = pick(/obj/item/clothing/under/syndicate/inteq/artificer, /obj/item/clothing/under/syndicate/inteq) - if(prob(75)) - head = pick(/obj/item/clothing/head/hardhat/white, /obj/item/clothing/head/soft/inteq) - if(prob(75)) - shoes = /obj/item/clothing/shoes/combat - if(prob(75)) - back = /obj/item/storage/backpack/messenger/inteq - -/datum/outfit/generic/engineer/inteq - name = "Artificer (Legion)" - -/datum/outfit/generic/solgov/soldier/pre_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - uniform = /obj/item/clothing/under/solgov - if(prob(90)) - suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov - shoes = /obj/item/clothing/shoes/jackboots - gloves = /obj/item/clothing/gloves/color/black - mask = /obj/item/clothing/mask/gas/sechailer - head = /obj/item/clothing/head/solgov/sonnensoldner - else - suit = /obj/item/clothing/suit/space/hardsuit/solgov - shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat - mask = /obj/item/clothing/mask/gas/sechailer/swat - id = /obj/item/card/id/solgov - if(prob(85)) - back = /obj/item/storage/backpack - backpack_contents = list() - for(var/i = 1 to 3) - if(prob(75)) - backpack_contents += pickweight(list( - /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 1, - /obj/item/storage/firstaid/advanced = 1, - /obj/item/gun/ballistic/automatic/pistol/solgov = 1, - /obj/item/gps = 1, - /obj/item/stock_parts/cell/gun/upgraded = 2, - /obj/item/ammo_box/magazine/pistol556mm = 3, - /obj/item/desk_flag/solgov = 3, - /obj/item/stack/marker_beacon/ten = 3, - /obj/item/extinguisher/mini = 3, - /obj/item/kitchen/knife/combat = 3, - /obj/item/flashlight/seclite=3, - /obj/item/ammo_casing/shotgun = 3, - /obj/item/binoculars = 3, - /obj/item/clipboard = 3 - ) - ) - else - back = pickweight(list( - /obj/item/energyhalberd = 5, - /obj/item/gun/ballistic/rocketlauncher/unrestricted = 5 - ) - ) - if(prob(25)) - belt = /obj/item/storage/belt/military - if(prob(50)) - r_pocket = pickweight(list( - /obj/item/reagent_containers/hypospray/medipen/stimpack = 1, - /obj/item/kitchen/knife/letter_opener = 3, - /obj/item/radio/off = 3, - /obj/item/grenade/syndieminibomb/concussion = 1, - /obj/item/melee/transforming/energy/ctf/solgov = 1 - ) - ) - if(prob(70)) - glasses = pickweight(list( - /obj/item/clothing/glasses/sunglasses = 3, - /obj/item/clothing/glasses/hud/health = 3, - /obj/item/clothing/glasses/hud/health/night = 1, - /obj/item/clothing/glasses/night = 2 - ) - ) - -/datum/outfit/generic/solgov/soldier - name = "Soldier (Legion)" - -/datum/outfit/generic/syndicate/infiltrator/pre_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - uniform = /obj/item/clothing/under/syndicate/bloodred - gloves = /obj/item/clothing/gloves/color/latex/nitrile/infiltrator - suit = /obj/item/clothing/suit/armor/vest/infiltrator - head = /obj/item/clothing/head/helmet/infiltrator - shoes = /obj/item/clothing/shoes/combat/sneakboots - ears = /obj/item/radio/headset/syndicate - if(prob(70)) - glasses = pickweight(list( - /obj/item/clothing/glasses/regular/circle = 1, - /obj/item/clothing/glasses/night = 2, - /obj/item/clothing/glasses/sunglasses = 3 - ) - ) - mask = /obj/item/clothing/mask/infiltrator - id = /obj/item/card/id/syndicate - back = /obj/item/storage/backpack - backpack_contents = list() - for(var/i = 1 to 3) - if(prob(50)) - backpack_contents += pickweight(list( - /obj/item/pen/sleepy = 3, - /obj/item/pen/edagger = 3, - /obj/item/reagent_containers/syringe/mulligan = 3, - /obj/item/suppressor = 5, - /obj/item/storage/box/syndie_kit/chameleon = 5, - /obj/item/grenade/smokebomb = 5, - /obj/item/grenade/flashbang = 5 - ) - ) - if(prob(70)) - backpack_contents += (list( - /obj/item/gun/ballistic/automatic/pistol/APS, - /obj/item/ammo_box/magazine/pistolm9mm - ) - ) - if(prob(25)) - r_pocket = pickweight(list( - /obj/item/chameleon = 1, - /obj/item/dnainjector/chameleonmut = 1, - ) - ) - if(prob(25)) - l_pocket = pickweight(list( - /obj/item/chameleon = 1, - /obj/item/dnainjector/chameleonmut = 1, - ) - ) - -/datum/outfit/generic/syndicate/infiltrator - name = "Infiltrator (Legion)" - -/datum/outfit/generic/syndicate/operative/pre_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - uniform = /obj/item/clothing/under/syndicate - shoes = /obj/item/clothing/shoes/combat - ears = /obj/item/radio/headset/syndicate - id = /obj/item/card/id/syndicate - r_pocket = /obj/item/tank/internals/emergency_oxygen - gloves = /obj/item/clothing/gloves/tackler/combat/insulated - if(prob(25)) - suit = /obj/item/clothing/suit/space/hardsuit/syndi/scarlet - mask = /obj/item/clothing/mask/gas/syndicate - back = /obj/item/tank/jetpack/oxygen - else if(prob(25)) - suit = /obj/item/clothing/suit/space/hardsuit/syndi - mask = /obj/item/clothing/mask/gas/syndicate - back = /obj/item/tank/jetpack/oxygen - else - suit = /obj/item/clothing/suit/armor/vest - mask = /obj/item/clothing/mask/gas - head = /obj/item/clothing/head/helmet/swat - back = /obj/item/storage/backpack - -/datum/outfit/generic/syndicate/operative - name = "Operative (Legion)" - -/datum/outfit/generic/srm/pre_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - uniform = /obj/item/clothing/under/suit/roumain - shoes = /obj/item/clothing/shoes/workboots/mining - if(prob(75)) - back = /obj/item/storage/backpack/cultpack - if(prob(75)) - belt = pick(list(/obj/item/kitchen/knife/hunting = 1, /obj/item/gun/ballistic/derringer = 1)) - -/datum/outfit/generic/srm - name = "SRM (Legion)" - -/datum/outfit/generic/srm/shadow/pre_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - suit = /obj/item/clothing/suit/armor/roumain/shadow - head = /obj/item/clothing/head/cowboy/sec/roumain/shadow - -/datum/outfit/generic/srm/shadow - name = "Shadow (Legion)" - -/datum/outfit/generic/srm/hunter/pre_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - suit = /obj/item/clothing/suit/armor/roumain - head = /obj/item/clothing/head/cowboy/sec/roumain - if(prob(75)) - suit_store = pickweight(list(/obj/item/gun/ballistic/shotgun/winchester = 9, /obj/item/gun/ballistic/shotgun/winchester = 1)) - backpack_contents = list() - if(prob(75)) - backpack_contents += list(/obj/item/ammo_box/c38_box = 1) - if(prob(75)) - backpack_contents += list(pick( - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine, - /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine,) = 2) - -/datum/outfit/generic/srm/hunter - name = "Hunter (Legion)" - */ From 3b0e3f4b3796205c58e923fde9fe1477f2a655bc Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 14:58:26 -0600 Subject: [PATCH 51/70] Kills him --- .../hostile/mining_mobs/hivelord.dm | 4 - .../hostile/mining_mobs/hivelord_outfits.dm | 103 +++++------------- 2 files changed, 27 insertions(+), 80 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 32e861b7b3da..66879b95c451 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -435,8 +435,4 @@ outfit = /datum/outfit/generic/cargo if("Security") outfit = /datum/outfit/generic/security - /* - if("Oldminer") - outfit = /datum/outfit/generic/oldminer - */ . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index f037b48a1ebd..04ccfd06b466 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -152,11 +152,17 @@ /datum/outfit/generic/miner/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() if(prob(75)) - uniform = pick(/obj/item/clothing/under/rank/cargo/miner/lavaland, /obj/item/clothing/under/rank/cargo/miner) + uniform = pickweight(list( + /obj/item/clothing/under/rank/cargo/miner/lavaland = 5, + /obj/item/clothing/under/rank/cargo/miner = 4, + /obj/item/clothing/under/rank/cargo/miner/lavaland/old = 1, + ) + ) if(prob(25)) suit = pickweight(list( /obj/item/clothing/suit/hooded/explorer = 18, - /obj/item/clothing/suit/hooded/cloak/goliath = 2 + /obj/item/clothing/suit/hooded/explorer/old = 1, + /obj/item/clothing/suit/hooded/cloak/goliath = 1 ) ) if(prob(75)) @@ -169,19 +175,26 @@ ) else if(prob(75)) belt = pickweight(list( - /obj/item/pickaxe = 8, - /obj/item/pickaxe/mini = 4, - /obj/item/pickaxe/silver = 2, - /obj/item/pickaxe/diamond = 1, - /obj/item/gun/energy/kinetic_accelerator = 1 + /obj/item/pickaxe = 16, + /obj/item/pickaxe/mini = 8, + /obj/item/pickaxe/silver = 4, + /obj/item/pickaxe/diamond = 2, + /obj/item/gun/energy/kinetic_accelerator = 2, + /obj/item/kinetic_crusher/old = 1 ) ) if(prob(75)) - gloves = /obj/item/clothing/gloves/color/black + gloves = pickweight(list( + /obj/item/clothing/gloves/color/black = 9, + /obj/item/clothing/gloves/explorer/old = 1 if(prob(75)) shoes = /obj/item/clothing/shoes/workboots/mining if(prob(75)) - mask = /obj/item/clothing/mask/gas/explorer + mask = pickweight(list( + /obj/item/clothing/mask/gas/explorer = 9, + /obj/item/clothing/mask/gas/explorer/old = 1 + ) + ) if(prob(50)) glasses = /obj/item/clothing/glasses/meson if(prob(50)) @@ -230,8 +243,12 @@ ) ) else if (prob(75)) - back = /obj/item/kinetic_crusher backpack_contents = list() + back = pickweight(list( + /obj/item/kinetic_crusher = 9, + /obj/item/kinetic_crusher/old = 1 + ) + ) /datum/outfit/generic/miner name = "Miner (Legion)" @@ -425,69 +442,3 @@ name = "Security Officer (Legion)" box = /obj/item/storage/box/survival/security -/* -/datum/outfit/generic/oldminer/pre_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - suit = /obj/item/clothing/suit/hooded/explorer/old - mask = /obj/item/clothing/mask/gas/explorer/old - if(prob(95)) - glasses = /obj/item/clothing/glasses/meson - else - glasses = /obj/item/clothing/glasses/meson/night - suit_store = /obj/item/tank/internals/oxygen - gloves = /obj/item/clothing/gloves/explorer/old - uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland/old - if(prob(85)) - back = /obj/item/storage/backpack/explorer - for(var/count in 1 to 3) - if(prob(70)) - backpack_contents += pickweight(list( - /obj/item/borg/upgrade/modkit/damage = 1, - /obj/item/borg/upgrade/modkit/trigger_guard = 1, - /obj/item/soap/nanotrasen = 1, - /obj/item/wormhole_jaunter = 1, - /obj/item/fulton_core = 1, - /obj/item/extraction_pack = 2, - /obj/item/stack/sheet/animalhide/goliath_hide = 3, - /obj/item/hivelordstabilizer = 2, - /obj/item/stack/marker_beacon/ten = 2, - /obj/item/mining_scanner = 2, - /obj/item/extinguisher/mini = 2, - /obj/item/kitchen/knife/combat/survival = 3, - /obj/item/flashlight/seclite=3, - /obj/item/stack/sheet/sinew = 3, - /obj/item/stack/sheet/bone = 3 - ) - ) - if(prob(30)) - backpack_contents += list( - /obj/item/reagent_containers/hypospray/medipen/survival = pickweight(list( - 1 = 3, - 2 = 2, - 3 = 1 - ) - ) - ) - else - back = /obj/item/kinetic_crusher/old - if(prob(30)) - belt = /obj/item/gun/energy/kinetic_accelerator/old - if(prob(30)) - r_pocket = pickweight(list( - /obj/item/stack/marker_beacon = 20, - /obj/item/spacecash/bundle/mediumrand = 7, - /obj/item/reagent_containers/hypospray/medipen/survival = 2, - /obj/item/borg/upgrade/modkit/damage = 1 - ) - ) - if(prob(30)) - l_pocket = pickweight(list( - /obj/item/spacecash/bundle/mediumrand = 5, - /obj/item/reagent_containers/hypospray/medipen/survival = 2, - /obj/item/borg/upgrade/modkit/cooldown = 1 - ) - ) - -/datum/outfit/generic/oldminer - name = "Old Miner (Legion)" -*/ From 467e1c3c8cdffc90446e5005d9a9ded5b9a20750 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 15:05:50 -0600 Subject: [PATCH 52/70] first try? --- code/modules/unit_tests/outfit_sanity.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/unit_tests/outfit_sanity.dm b/code/modules/unit_tests/outfit_sanity.dm index fee653cd626f..f0258bed54dd 100644 --- a/code/modules/unit_tests/outfit_sanity.dm +++ b/code/modules/unit_tests/outfit_sanity.dm @@ -20,6 +20,7 @@ /datum/unit_test/outfit_sanity/Run() var/mob/living/carbon/human/H = allocate(/mob/living/carbon/human) + var/list created_items = list() for (var/outfit_type in subtypesof(/datum/outfit)) // Only make one human and keep undressing it because it's much faster @@ -58,5 +59,12 @@ for (var/_ in 1 to number) if (!H.equip_to_slot_or_del(new path(H), ITEM_SLOT_BACKPACK, TRUE)) TEST_FAIL("[outfit.name]'s backpack_contents are invalid! Couldn't add [path] to backpack.") + // Check if the created outfit is of subtype /datum/outfit/generic + if (isoutfit(outfit, /datum/outfit/generic)) + for (var/obj/item/I in H.get_equipped_items(include_pockets = TRUE)) + list/append(created_items, I.path) + for (var/item in created_items) + world.log << "Created Item: [item.name] ([item.path])" + #undef CHECK_OUTFIT_SLOT From 7a043df5417ebc853bfb697758a78e1e60762eff Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 15:08:34 -0600 Subject: [PATCH 53/70] minor mistake (dead) --- .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm | 2 +- .../simple_animal/hostile/mining_mobs/hivelord_outfits.dm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 66879b95c451..c44b1f53bb95 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -416,7 +416,7 @@ "Doctor" = 5, "Scientist" = 5, "Cargo" = 5, - "Security" = 5, + "Security" = 5 ) ) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 04ccfd06b466..b243c2a181c7 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -187,6 +187,8 @@ gloves = pickweight(list( /obj/item/clothing/gloves/color/black = 9, /obj/item/clothing/gloves/explorer/old = 1 + ) + ) if(prob(75)) shoes = /obj/item/clothing/shoes/workboots/mining if(prob(75)) From 8bf1fbb41f69930f2067659e1256ecf7d00ff2f5 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 15:12:48 -0600 Subject: [PATCH 54/70] revert --- code/modules/unit_tests/outfit_sanity.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/modules/unit_tests/outfit_sanity.dm b/code/modules/unit_tests/outfit_sanity.dm index f0258bed54dd..fee653cd626f 100644 --- a/code/modules/unit_tests/outfit_sanity.dm +++ b/code/modules/unit_tests/outfit_sanity.dm @@ -20,7 +20,6 @@ /datum/unit_test/outfit_sanity/Run() var/mob/living/carbon/human/H = allocate(/mob/living/carbon/human) - var/list created_items = list() for (var/outfit_type in subtypesof(/datum/outfit)) // Only make one human and keep undressing it because it's much faster @@ -59,12 +58,5 @@ for (var/_ in 1 to number) if (!H.equip_to_slot_or_del(new path(H), ITEM_SLOT_BACKPACK, TRUE)) TEST_FAIL("[outfit.name]'s backpack_contents are invalid! Couldn't add [path] to backpack.") - // Check if the created outfit is of subtype /datum/outfit/generic - if (isoutfit(outfit, /datum/outfit/generic)) - for (var/obj/item/I in H.get_equipped_items(include_pockets = TRUE)) - list/append(created_items, I.path) - for (var/item in created_items) - world.log << "Created Item: [item.name] ([item.path])" - #undef CHECK_OUTFIT_SLOT From 60ddaaf961613f35051c0c58501cbeaff840941c Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 15:15:13 -0600 Subject: [PATCH 55/70] basic enough? --- code/modules/unit_tests/hivelord_count.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 code/modules/unit_tests/hivelord_count.dm diff --git a/code/modules/unit_tests/hivelord_count.dm b/code/modules/unit_tests/hivelord_count.dm new file mode 100644 index 000000000000..02a869f5b9bc --- /dev/null +++ b/code/modules/unit_tests/hivelord_count.dm @@ -0,0 +1,11 @@ +/datum/unit_test/count_mob_spawn_items/Run() + var/int total_items_created = 0 + + for (var/i in 1 to 100) + var/obj/effect/mob_spawn/human/corpse/damaged/legioninfested/SpawnEffect = new /obj/effect/mob_spawn/human/corpse/damaged/legioninfested + SpawnEffect.Initialize() + + for (var/obj/item/I in SpawnEffect.loc.get_contents()) + total_items_created += 1 + + world.log << "Total items created from mob_spawn: [total_items_created]" From 772c47daa8a55fccf3edcc9d41ade04f7498abba Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 15:16:38 -0600 Subject: [PATCH 56/70] agh --- code/modules/unit_tests/hivelord_count.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/unit_tests/hivelord_count.dm b/code/modules/unit_tests/hivelord_count.dm index 02a869f5b9bc..2d7ef551063e 100644 --- a/code/modules/unit_tests/hivelord_count.dm +++ b/code/modules/unit_tests/hivelord_count.dm @@ -1,5 +1,5 @@ /datum/unit_test/count_mob_spawn_items/Run() - var/int total_items_created = 0 + var/total_items_created = 0 for (var/i in 1 to 100) var/obj/effect/mob_spawn/human/corpse/damaged/legioninfested/SpawnEffect = new /obj/effect/mob_spawn/human/corpse/damaged/legioninfested @@ -8,4 +8,4 @@ for (var/obj/item/I in SpawnEffect.loc.get_contents()) total_items_created += 1 - world.log << "Total items created from mob_spawn: [total_items_created]" + world.log << "Total items created from mob_spawn: [total_items_created]" From 5590e569434bc83df53a3724cdabee5ffe778384 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 15:17:45 -0600 Subject: [PATCH 57/70] include --- code/modules/unit_tests/_unit_tests.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index d4bfa21201be..9e1d93b8f577 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -73,6 +73,7 @@ #include "connect_loc.dm" #include "biome_lists.dm" #include "emoting.dm" +#include "hivelord_count.dm" #include "keybinding_init.dm" #include "machine_disassembly.dm" #include "open_air.dm" From abb7e168c29a545406925521ee61209dc5a768a8 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 15:24:51 -0600 Subject: [PATCH 58/70] test? --- code/modules/unit_tests/hivelord_count.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/unit_tests/hivelord_count.dm b/code/modules/unit_tests/hivelord_count.dm index 2d7ef551063e..5d3fc9c1b23c 100644 --- a/code/modules/unit_tests/hivelord_count.dm +++ b/code/modules/unit_tests/hivelord_count.dm @@ -8,4 +8,4 @@ for (var/obj/item/I in SpawnEffect.loc.get_contents()) total_items_created += 1 - world.log << "Total items created from mob_spawn: [total_items_created]" + TEST_FAIL("Total items created from mob_spawn: [total_items_created]") From 83f70dc91e8c86671b5c10389325f3252af794c4 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 15:45:09 -0600 Subject: [PATCH 59/70] dunno --- code/modules/unit_tests/hivelord_count.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/unit_tests/hivelord_count.dm b/code/modules/unit_tests/hivelord_count.dm index 5d3fc9c1b23c..78896262bdfa 100644 --- a/code/modules/unit_tests/hivelord_count.dm +++ b/code/modules/unit_tests/hivelord_count.dm @@ -4,8 +4,9 @@ for (var/i in 1 to 100) var/obj/effect/mob_spawn/human/corpse/damaged/legioninfested/SpawnEffect = new /obj/effect/mob_spawn/human/corpse/damaged/legioninfested SpawnEffect.Initialize() + var/mob/M = - for (var/obj/item/I in SpawnEffect.loc.get_contents()) + for (var/obj/item/I in M.get_contents()) total_items_created += 1 TEST_FAIL("Total items created from mob_spawn: [total_items_created]") From c84b0c0c3f4eb4d20164b78240af63da03615362 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 18:19:44 -0600 Subject: [PATCH 60/70] yea --- .../hostile/mining_mobs/hivelord_outfits.dm | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index b243c2a181c7..0f0f89d3769a 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -355,6 +355,27 @@ glasses = pick(/obj/item/clothing/glasses/hud/diagnostic, /obj/item/clothing/glasses/science) if(prob(1)) neck = /obj/item/clothing/neck/tie/horrible + for(var/i = 1 to 3) + if(prob(75)) + backpack_contents += pickweight(list( + /obj/item/research_notes/loot/tiny = 3, + /obj/item/research_notes/loot/small = 3, + /obj/item/reagent_scanner = 3, + /obj/item/assembly/flash/handheld = 3, + /obj/item/stock_parts/capacitor/adv = 2, + /obj/item/stock_parts/scanning_module/adv = 2, + /obj/item/stock_parts/manipulator/nano = 2, + /obj/item/stock_parts/micro_laser/high = 2, + /obj/item/stock_parts/matter_bin/adv = 2, + /obj/item/survey_handheld = 1, + /obj/item/weldingtool/experimental = 1, + /obj/item/fishing_rod/tech = 1, + /obj/item/mmi/posibrain = 1, + /obj/item/reagent_containers/glass/beaker/plastic = 1, + /obj/item/organ/eyes/robotic/shield = 1, + /obj/item/organ/eyes/robotic/glow = 1, + ) + ) if(prob(75)) accessory = /obj/item/clothing/accessory/armband/science @@ -368,6 +389,8 @@ uniform = pick(/obj/item/clothing/under/rank/cargo/tech, /obj/item/clothing/under/shorts/grey) if(prob(75)) suit = pick(/obj/item/clothing/suit/hazardvest, /obj/item/clothing/suit/hooded/wintercoat/cargo) + if(prob(25)) + belt = /obj/item/gun/ballistic/automatic/zip_pistol if(prob(75)) gloves = /obj/item/clothing/gloves/fingerless if(prob(75)) @@ -381,6 +404,7 @@ backpack_contents += pickweight(list( /obj/item/spacecash/bundle/mediumrand = 5, /obj/item/ammo_box/a762 = 5, + /obj/item/ammo_box/magazine/zip_ammo_9mm = 5, /obj/item/modular_computer/tablet/preset/cargo = 3, /obj/item/stack/tape = 3, /obj/item/stack/tape/industrial = 3, From 970e101d9d6a3009c0a2a2beb1456279fc59c439 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 18:24:09 -0600 Subject: [PATCH 61/70] doctor tweak --- .../simple_animal/hostile/mining_mobs/hivelord_outfits.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 0f0f89d3769a..460af0d98ad8 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -319,12 +319,18 @@ for(var/i = 1 to 3) if(prob(75)) backpack_contents += pickweight(list( + /obj/item/reagent_containers/pill/patch/styptic = 5, + /obj/item/reagent_containers/pill/patch/silver_sulf = 5, /obj/item/storage/firstaid/medical = 3, + /obj/item/reagent_containers/syringe = 3, /obj/item/reagent_containers/glass/beaker = 2, /obj/item/reagent_containers/dropper = 2, + /obj/item/reagent_containers/pill/charcoal = 2, + /obj/item/reagent_containers/medigel/styptic = 2, + /obj/item/reagent_containers/medigel/silver_sulf = 2, + /obj/item/reagent_containers/medigel/sterilizine = 1, /obj/item/flashlight/pen = 1, /obj/item/hypospray/mkii = 1, - /obj/item/storage/bag/medical = 1, /obj/item/healthanalyzer = 1, ) ) From c0ec5c06570ae2ac9c80ccd9f6f1043cd11ad63d Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Wed, 27 Dec 2023 19:33:28 -0600 Subject: [PATCH 62/70] shrug --- code/modules/unit_tests/_unit_tests.dm | 1 - code/modules/unit_tests/hivelord_count.dm | 12 ------------ 2 files changed, 13 deletions(-) delete mode 100644 code/modules/unit_tests/hivelord_count.dm diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 9e1d93b8f577..d4bfa21201be 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -73,7 +73,6 @@ #include "connect_loc.dm" #include "biome_lists.dm" #include "emoting.dm" -#include "hivelord_count.dm" #include "keybinding_init.dm" #include "machine_disassembly.dm" #include "open_air.dm" diff --git a/code/modules/unit_tests/hivelord_count.dm b/code/modules/unit_tests/hivelord_count.dm deleted file mode 100644 index 78896262bdfa..000000000000 --- a/code/modules/unit_tests/hivelord_count.dm +++ /dev/null @@ -1,12 +0,0 @@ -/datum/unit_test/count_mob_spawn_items/Run() - var/total_items_created = 0 - - for (var/i in 1 to 100) - var/obj/effect/mob_spawn/human/corpse/damaged/legioninfested/SpawnEffect = new /obj/effect/mob_spawn/human/corpse/damaged/legioninfested - SpawnEffect.Initialize() - var/mob/M = - - for (var/obj/item/I in M.get_contents()) - total_items_created += 1 - - TEST_FAIL("Total items created from mob_spawn: [total_items_created]") From 0b9eacbfbea3960b80c9ec76250cc04c55aec8f9 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Thu, 4 Jan 2024 13:56:18 -0600 Subject: [PATCH 63/70] yuh --- .../simple_animal/hostile/mining_mobs/hivelord_outfits.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 460af0d98ad8..fc17d193bdf3 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -285,6 +285,7 @@ /obj/item/tank/internals/emergency_oxygen/engi = 1, /obj/item/holosign_creator/engineering = 1, /obj/item/extinguisher/advanced = 1, + /obj/item/stack/sheet/metal/twenty = 1 ) ) if(prob(75)) @@ -305,11 +306,11 @@ if(prob(75)) belt = pickweight(list(/obj/item/storage/belt/medical = 5, /obj/item/defibrillator/compact/loaded = 1)) if(prob(75)) - gloves = /obj/item/clothing/gloves/color/white + gloves = pick(/obj/item/clothing/gloves/color/white, /obj/item/clothing/gloves/color/latex/nitrile) if(prob(75)) mask = /obj/item/clothing/mask/surgical if(prob(75)) - shoes = pick(/obj/item/clothing/shoes/sneakers/white, /obj/item/clothing/gloves/color/latex/nitrile) + shoes = /obj/item/clothing/shoes/sneakers/white if(prob(75)) head = /obj/item/clothing/head/beret/med if(prob(75)) From cdb77cde9606f1c2ed22e74c2c8fb0b866ce18f7 Mon Sep 17 00:00:00 2001 From: fallcon Date: Thu, 11 Jan 2024 07:53:08 -0600 Subject: [PATCH 64/70] i dunno what to do about the fails --- .../simple_animal/hostile/mining_mobs/hivelord_outfits.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index fc17d193bdf3..d961c04cbaac 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -302,7 +302,9 @@ if(prob(75)) suit = pick(/obj/item/clothing/suit/toggle/labcoat, /obj/item/clothing/suit/apron/surgical ,/obj/item/clothing/suit/hooded/wintercoat/medical) if(prob(75)) - back = pick(/obj/item/storage/backpack/medic, /obj/item/storage/backpack/satchel/med, /obj/item/storage/backpack/duffelbag/med, /obj/item/storage/backpack/messenger/med, /obj/item/defibrillator/loaded) + back = pick(/obj/item/storage/backpack/medic, /obj/item/storage/backpack/satchel/med, /obj/item/storage/backpack/duffelbag/med, /obj/item/storage/backpack/messenger/med) + else(prob(75)) + back = /obj/item/defibrillator/loaded if(prob(75)) belt = pickweight(list(/obj/item/storage/belt/medical = 5, /obj/item/defibrillator/compact/loaded = 1)) if(prob(75)) @@ -376,7 +378,6 @@ /obj/item/stock_parts/matter_bin/adv = 2, /obj/item/survey_handheld = 1, /obj/item/weldingtool/experimental = 1, - /obj/item/fishing_rod/tech = 1, /obj/item/mmi/posibrain = 1, /obj/item/reagent_containers/glass/beaker/plastic = 1, /obj/item/organ/eyes/robotic/shield = 1, From 98090ac199ca985f8819a4c7641d26b46b0bfec4 Mon Sep 17 00:00:00 2001 From: fallcon Date: Thu, 11 Jan 2024 08:07:44 -0600 Subject: [PATCH 65/70] if --- .../simple_animal/hostile/mining_mobs/hivelord_outfits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index d961c04cbaac..e276773bfeb6 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -303,7 +303,7 @@ suit = pick(/obj/item/clothing/suit/toggle/labcoat, /obj/item/clothing/suit/apron/surgical ,/obj/item/clothing/suit/hooded/wintercoat/medical) if(prob(75)) back = pick(/obj/item/storage/backpack/medic, /obj/item/storage/backpack/satchel/med, /obj/item/storage/backpack/duffelbag/med, /obj/item/storage/backpack/messenger/med) - else(prob(75)) + else if (prob(75)) back = /obj/item/defibrillator/loaded if(prob(75)) belt = pickweight(list(/obj/item/storage/belt/medical = 5, /obj/item/defibrillator/compact/loaded = 1)) From 3fa71828d1b3d6314a96bdc04fb8888c3f0da13f Mon Sep 17 00:00:00 2001 From: fallcon Date: Thu, 11 Jan 2024 08:15:44 -0600 Subject: [PATCH 66/70] evil tbh --- code/datums/outfit.dm | 3 +++ .../simple_animal/hostile/mining_mobs/hivelord_outfits.dm | 1 + code/modules/unit_tests/outfit_sanity.dm | 6 +++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index 964c269b5f43..34771af91ed2 100644 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -104,6 +104,9 @@ /// Set to FALSE if your outfit requires runtime parameters var/can_be_admin_equipped = TRUE + // Used to determine if it should be ignored in unit tests due to being to dynamic to always spawn backpack contents right + var/random = FALSE + /** * extra types for chameleon outfit changes, mostly guns * diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index e276773bfeb6..4ec84f115bd2 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -148,6 +148,7 @@ /datum/outfit/generic name = "Generic (Legion)" box = /obj/item/storage/box/survival + random = TRUE /datum/outfit/generic/miner/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() diff --git a/code/modules/unit_tests/outfit_sanity.dm b/code/modules/unit_tests/outfit_sanity.dm index fee653cd626f..dfb877dcd663 100644 --- a/code/modules/unit_tests/outfit_sanity.dm +++ b/code/modules/unit_tests/outfit_sanity.dm @@ -57,6 +57,10 @@ var/number = backpack_contents[path] || 1 for (var/_ in 1 to number) if (!H.equip_to_slot_or_del(new path(H), ITEM_SLOT_BACKPACK, TRUE)) - TEST_FAIL("[outfit.name]'s backpack_contents are invalid! Couldn't add [path] to backpack.") + if (outfit.random != TRUE) + TEST_FAIL("[outfit.name]'s backpack_contents are invalid! Couldn't add [path] to backpack.") + else + log_world("[outfit.name]'s backpack_contents are invalid! Couldn't add [path] to backpack.") + #undef CHECK_OUTFIT_SLOT From 10e1c4183ce6aef08390fd330aae8c36b0292122 Mon Sep 17 00:00:00 2001 From: fallcon Date: Thu, 11 Jan 2024 08:29:50 -0600 Subject: [PATCH 67/70] random sprite fixes --- code/game/objects/effects/decals/crayon.dm | 1 + .../temporary_visuals/projectiles/muzzle.dm | 2 +- code/modules/cargo/supplypod.dm | 2 +- code/modules/clothing/suits/jobs.dm | 18 ------------------ code/modules/station_goals/bsa.dm | 2 +- 5 files changed, 4 insertions(+), 21 deletions(-) diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index 173764fdf198..c14086ff0f3b 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -37,6 +37,7 @@ GLOBAL_LIST(gang_tags) name = "Leet Like Jeff K gang tag" desc = "Looks like someone's claimed this area for Leet Like Jeff K." icon = 'icons/obj/gang/tags.dmi' + icon_state = "B_tag" layer = BELOW_MOB_LAYER var/datum/team/gang/my_gang diff --git a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm index e684c2826bca..d4b0df5ab5ef 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm @@ -6,7 +6,7 @@ icon_state = "muzzle_laser" /obj/effect/projectile/muzzle/laser/blue - icon_state = "muzzle_laser_blue" + icon_state = "muzzle_blue" /obj/effect/projectile/muzzle/laser/emitter name = "emitter flash" diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 16b43704df58..aa40a22cd096 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -471,7 +471,7 @@ /obj/effect/engineglow //Falling pod smoke name = "" icon = 'icons/obj/supplypods.dmi' - icon_state = "pod_engineglow" + icon_state = "pod_glow_yellow" desc = "" layer = GASFIRE_LAYER mouse_opacity = MOUSE_OPACITY_TRANSPARENT diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index c9c0edd2def8..0fb415c57655 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -216,24 +216,6 @@ icon_state = "surgical" allowed = list(/obj/item/scalpel, /obj/item/cautery, /obj/item/hemostat, /obj/item/retractor) -//Robotocist - -/obj/item/clothing/suit/hooded/techpriest - name = "techpriest robes" - desc = "For those who REALLY love their toasters." - icon_state = "techpriest" - item_state = "techpriest" - body_parts_covered = CHEST|GROIN|LEGS|ARMS - hoodtype = /obj/item/clothing/head/hooded/techpriest - -/obj/item/clothing/head/hooded/techpriest - name = "techpriest's hood" - desc = "A hood for those who REALLY love their toasters." - icon_state = "techpriesthood" - item_state = "techpriesthood" - body_parts_covered = HEAD - flags_inv = HIDEHAIR|HIDEEARS - //Lieutenant /obj/item/clothing/suit/armor/lieutenant_trenchcoat name = "lieutenant's trenchcoat" diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index 7de9e83581fe..b030899d04c2 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -120,7 +120,7 @@ name = "Bluespace Artillery" desc = "Long range bluespace artillery." icon = 'icons/obj/lavaland/cannon.dmi' - icon_state = "orbital_cannon1" + icon_state = "cannon_west" var/static/mutable_appearance/top_layer var/ex_power = 3 var/power_used_per_shot = 2000000 //enough to kil standard apc - todo : make this use wires instead and scale explosion power with it From 139821160716cc8ef73a049975854f473aa0e463 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 4 Mar 2024 19:15:38 -0600 Subject: [PATCH 68/70] path fixes --- .../simple_animal/hostile/mining_mobs/hivelord_outfits.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 4ec84f115bd2..0dca4c21dade 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -44,11 +44,11 @@ ) if (prob(10)) belt = pickweight(list( - /obj/item/gun/ballistic/automatic/pistol/m1911 = 2, + /obj/item/gun/ballistic/automatic/pistol/candor = 2, /obj/item/gun/ballistic/automatic/pistol/commander = 1, /obj/item/gun/ballistic/automatic/pistol = 1, /obj/item/gun/ballistic/revolver = 1, - /obj/item/gun/ballistic/revolver/pepperbox = 1, + /obj/item/gun/ballistic/revolver/firebrand = 1, ) ) if(prob(50)) @@ -412,7 +412,7 @@ if(prob(75)) backpack_contents += pickweight(list( /obj/item/spacecash/bundle/mediumrand = 5, - /obj/item/ammo_box/a762 = 5, + /obj/item/ammo_box/magazine/illestren_a850r = 5, /obj/item/ammo_box/magazine/zip_ammo_9mm = 5, /obj/item/modular_computer/tablet/preset/cargo = 3, /obj/item/stack/tape = 3, @@ -425,7 +425,7 @@ accessory = /obj/item/clothing/accessory/armband/cargo if(prob(25)) suit = /obj/item/clothing/suit/armor/vest/scrap_armor - suit_store = /obj/item/gun/ballistic/rifle/boltaction //An attempt to refrence gun cargo + suit_store = /obj/item/gun/ballistic/rifle/illestren /datum/outfit/generic/cargo name = "Cargo Technician (Legion)" From 92921b56002596eee67cd6faa2fc5866d1cac107 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Mar 2024 17:32:09 -0500 Subject: [PATCH 69/70] species --- .../hostile/mining_mobs/hivelord.dm | 13 ++++++------- .../living/simple_animal/hostile/survivors.dm | 16 +++++++--------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 94871786b6a6..faa0cda9a068 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -403,13 +403,12 @@ /obj/effect/mob_spawn/human/corpse/damaged/legioninfested/Initialize() //in an ideal world, these would generate, the legion would overlay over the corpse, and we'd get cool sprites mob_species = pickweight(list( - /datum/species/human = 31, - /datum/species/lizard = 26, - /datum/species/ethereal = 24, - /datum/species/spider = 7, - /datum/species/ipc = 7, - /datum/species/jelly = 4, - /datum/species/fly = 1 + /datum/species/human = 50, + /datum/species/lizard = 20, + /datum/species/ipc = 10, + /datum/species/ethereal = 10, + /datum/species/moth = 5, + /datum/species/spider = 5 ) ) var/type = pickweight(list( diff --git a/code/modules/mob/living/simple_animal/hostile/survivors.dm b/code/modules/mob/living/simple_animal/hostile/survivors.dm index 554c13620b57..6963a634b378 100644 --- a/code/modules/mob/living/simple_animal/hostile/survivors.dm +++ b/code/modules/mob/living/simple_animal/hostile/survivors.dm @@ -91,17 +91,15 @@ var/survivor_type //room for alternatives inside the fuckoff grade init. /obj/effect/mob_spawn/human/corpse/damaged/whitesands/Initialize() //everything here should equal out to 100 for the sake of my sanity. - mob_species = pickweight(list( - /datum/species/human = 31, - /datum/species/lizard = 26, - /datum/species/ethereal = 24, - /datum/species/spider = 7, - /datum/species/ipc = 7, - /datum/species/jelly = 4, - /datum/species/fly = 1 - ) + /datum/species/human = 50, + /datum/species/lizard = 20, + /datum/species/ipc = 10, + /datum/species/ethereal = 10, + /datum/species/moth = 5, + /datum/species/spider = 5 ) + ) //to-do: learn how to make mobsprites for other survivors //uniforms are random to show varied backgrounds, but similar goal if(survivor_type == "survivor") From 2ff161014827729019a4139fe9b505b707c7727f Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Thu, 21 Mar 2024 01:48:50 -0500 Subject: [PATCH 70/70] log any random outfit fail instead of failing --- code/modules/unit_tests/outfit_sanity.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/unit_tests/outfit_sanity.dm b/code/modules/unit_tests/outfit_sanity.dm index dfb877dcd663..0f2059134ae2 100644 --- a/code/modules/unit_tests/outfit_sanity.dm +++ b/code/modules/unit_tests/outfit_sanity.dm @@ -3,7 +3,10 @@ /* We don't check the result of equip_to_slot_or_del because it returns false for random jumpsuits, as they delete themselves on init */ \ var/obj/item/outfit_item = H.get_item_by_slot(##slot_name); \ if (!outfit_item) { \ - TEST_FAIL("[outfit.name]'s [#outfit_key] is invalid! Could not equip a [outfit.##outfit_key] into that slot."); \ + if (outfit.random != TRUE) \ + TEST_FAIL("[outfit.name]'s [#outfit_key] is invalid! Could not equip a [outfit.##outfit_key] into that slot."); \ + else \ + log_world("[outfit.name]'s [#outfit_key] is invalid! Could not equip a [outfit.##outfit_key] into that slot."); \ } \ }