Skip to content

Commit

Permalink
starting to think i can shrink the hivelord code
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Nov 29, 2023
1 parent 161c968 commit 9d809d5
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,9 @@
)
var/type = pickweight(list(
//independent
"Plain" = 40,
"Miner" = 40,
"Engi" = 20
"Generic" = 20,

Check failure on line 416 in code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm

View workflow job for this annotation

GitHub Actions / Run Linters

got '"Generic"', expected one of: operator, field access, ')', ','
"Oldminer" = 10,
pick(
//solgov
Expand All @@ -422,6 +423,7 @@
pick("Infiltrator", "Operative"),
//nanotrasen
//inteq
"Inteq Engi",
//srm
"SRM",
) = 10
Expand All @@ -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
Expand All @@ -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
. = ..()
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9d809d5

Please sign in to comment.