Skip to content

Commit

Permalink
hm plans in the works
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Nov 29, 2023
1 parent 9503b98 commit 52ceb1a
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -410,31 +410,40 @@
)
)
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(

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

View workflow job for this annotation

GitHub Actions / Run Linters

got 'pick', expected one of: operator, field access, ')', ','
//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
)
)
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
)

/datum/outfit/generic
name = "Generic"
name = "Generic (Legion)"

/datum/outfit/generic/engineer/pre_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
Expand All @@ -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)
. = ..()
Expand All @@ -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)
. = ..()
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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)
. = ..()
Expand All @@ -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(
Expand Down Expand Up @@ -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)
. = ..()
Expand Down

0 comments on commit 52ceb1a

Please sign in to comment.