Skip to content

Commit

Permalink
fixes some IJN role stuff, adds kurama as an option for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
@KanohaShinobi
KanohaShinobi committed Jan 11, 2024
1 parent 54264ef commit 8fe12a5
Show file tree
Hide file tree
Showing 4 changed files with 554 additions and 79 deletions.
3 changes: 2 additions & 1 deletion code/datums/vote.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,8 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo
default = "Indomitable"
var/list/options = list()
options = list(
"Indomitable")
"Indomitable",
"Kurama")
choices.Add(options)

else
Expand Down
91 changes: 63 additions & 28 deletions code/modules/1713/jobs/japanese.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1465,12 +1465,17 @@

/datum/job/japanese/ijn_captain/equip(var/mob/living/human/H)
if (!H) return FALSE
if (map.ID == MAP_BATTLE_SHIPS)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sailorboots1(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_navy_officer(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_navy_officer(H), slot_head)
else
//shoes
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/heavyboots/wrappedboots(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/heavyboots/wrappedboots(H), slot_shoes)
//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
//head
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_snlf(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_snlf(H), slot_head)
//weapons
H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/pistol/ww2/nambu(H), slot_l_hand)
H.equip_to_slot_or_del(new /obj/item/weapon/key/japanese_officer(H), slot_r_store)
Expand All @@ -1486,7 +1491,7 @@
if (H.f_style != "Shaved" && H.f_style != "Short Facial Hair" && H.f_style != "Goatee")
H.f_style = pick("Shaved","Short Facial Hair","Goatee")
world << "<b><big>[H.real_name] is the Lieutenant of the Japanese Forces!</big></b>"
H.add_note("Role", "You are a <b>[title]</b>, the highest ranking officer present. Your job is to command the company.")
H.add_note("Role", "You are a <b>[title]</b>, the highest ranking officer present. Your job is to command the ship or company.")
H.setStat("strength", STAT_MEDIUM_HIGH)
H.setStat("crafting", STAT_NORMAL)
H.setStat("rifle", STAT_NORMAL)
Expand Down Expand Up @@ -1517,12 +1522,17 @@

/datum/job/japanese/ijn_lieutenant/equip(var/mob/living/human/H)
if (!H) return FALSE
if (map.ID == MAP_BATTLE_SHIPS)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sailorboots1(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_navy_officer(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_navy_officer(H), slot_head)
else
//shoes
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/heavyboots/wrappedboots(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/heavyboots/wrappedboots(H), slot_shoes)
//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
//head
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_snlf(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_snlf(H), slot_head)
//weapons
H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/pistol/ww2/nambu(H), slot_l_hand)
H.equip_to_slot_or_del(new /obj/item/weapon/key/japanese_officer(H), slot_r_store)
Expand Down Expand Up @@ -1569,12 +1579,17 @@

/datum/job/japanese/ijn_lieutenant2/equip(var/mob/living/human/H)
if (!H) return FALSE
if (map.ID == MAP_BATTLE_SHIPS)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sailorboots1(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_navy_officer(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_navy_officer(H), slot_head)
else
//shoes
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/heavyboots/wrappedboots(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/heavyboots/wrappedboots(H), slot_shoes)
//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
//head
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_snlf(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_snlf(H), slot_head)
//weapons
H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/pistol/ww2/nambu(H), slot_l_hand)
H.equip_to_slot_or_del(new /obj/item/weapon/key/japanese_officer(H), slot_r_store)
Expand Down Expand Up @@ -1618,12 +1633,17 @@

/datum/job/japanese/ijn_sergeant/equip(var/mob/living/human/H)
if (!H) return FALSE
if (map.ID == MAP_BATTLE_SHIPS)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sailorboots1(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_navy_po(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_navy_po(H), slot_head)
else
//shoes
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/heavyboots/wrappedboots(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/heavyboots/wrappedboots(H), slot_shoes)
//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
//head
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_snlf(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_snlf(H), slot_head)
//weapons
H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/pistol/ww2/nambu(H), slot_l_store)
H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/boltaction/arisaka99(H), slot_shoulder)
Expand Down Expand Up @@ -1667,12 +1687,17 @@

/datum/job/japanese/ijn_doctor/equip(var/mob/living/human/H)
if (!H) return FALSE
if (map.ID == MAP_BATTLE_SHIPS)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sailorboots1(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_navy_po(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_navy_po(H), slot_head)
else
//shoes
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/heavyboots/wrappedboots(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/heavyboots/wrappedboots(H), slot_shoes)
//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform) // for now
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform) // for now
//head
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_snlf(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_snlf(H), slot_head)
//jacket
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/doctor(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/surgery(H), slot_l_hand)
Expand Down Expand Up @@ -1711,12 +1736,17 @@

/datum/job/japanese/ijn_medic/equip(var/mob/living/human/H)
if (!H) return FALSE
if (map.ID == MAP_BATTLE_SHIPS)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sailorboots1(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_navy(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_navy_cap(H), slot_head)
else
//shoes
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/heavyboots/wrappedboots(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/heavyboots/wrappedboots(H), slot_shoes)
//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform) // for now
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform) // for now
//head
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_snlf(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_snlf(H), slot_head)
//back
H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/boltaction/arisaka99(H), slot_shoulder)
H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/jap/ww2soldier(H), slot_belt)
Expand Down Expand Up @@ -1758,20 +1788,25 @@

/datum/job/japanese/ijn_ww2infantry/equip(var/mob/living/human/H)
if (!H) return FALSE
if (map.ID == MAP_BATTLE_SHIPS)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sailorboots1(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_navy(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_navy_cap(H), slot_head)
else
//shoes
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/heavyboots/wrappedboots(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/heavyboots/wrappedboots(H), slot_shoes)

//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
//head
var/randhead = rand(1,2)
if (randhead == 1)
H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/ww2/japhelm_snlf(H), slot_head)
else if (randhead == 2)
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_snlf(H), slot_head)
var/randhead = rand(1,2)
if (randhead == 1)
H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/ww2/japhelm_snlf(H), slot_head)
else if (randhead == 2)
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/japcap_snlf(H), slot_head)
//back
H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/boltaction/arisaka99(H), slot_shoulder)
H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/jap/ww2soldier(H), slot_belt)
H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/boltaction/arisaka99(H), slot_shoulder)
H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/jap/ww2soldier(H), slot_belt)
if (time_of_day == "Night" || time_of_day == "Evening" || time_of_day == "Early Morning")
if (prob(50))
H.equip_to_slot_or_del(new /obj/item/flashlight/japflashlight(H), slot_wear_id)
Expand Down
Loading

0 comments on commit 8fe12a5

Please sign in to comment.