Skip to content

Commit

Permalink
jap navy boots
Browse files Browse the repository at this point in the history
  • Loading branch information
@KanohaShinobi
KanohaShinobi committed Jan 11, 2024
1 parent 77b0dd7 commit f65ecd0
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 44 deletions.
66 changes: 41 additions & 25 deletions code/modules/1713/apparel_worldwars.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1030,6 +1030,7 @@
icon_state = "japboots_ww2"
item_state = "japboots_ww2"
worn_state = "japboots_ww2"
var/baseicon = "japboots_ww2"
var/puttees = FALSE
/obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2/update_icon()
if (puttees)
Expand All @@ -1045,23 +1046,23 @@
/obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2/verb/strip_off_puttees(mob/user as mob)
set category = null
set src in usr
if (type != /obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2 && type != /obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2/puttees)
if (type != /obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2 && type != /obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2/puttees && type != /obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2/navy)
return
else
if (puttees)
item_state = "japboots_ww2"
icon_state = "japboots_ww2"
worn_state = "japboots_ww2"
item_state_slots["slot_w_uniform"] = "japboots_ww2"
item_state = "[baseicon]"
icon_state = "[baseicon]"
worn_state = "[baseicon]"
item_state_slots["slot_w_uniform"] = "[baseicon]"
usr << "<span class = 'danger'>You unwrap your puttees.</span>"
puttees = FALSE
new/obj/item/puttees(user.loc)
update_clothing_icon()
else if (!puttees)
item_state = "japboots_ww2"
icon_state = "japboots_ww2"
worn_state = "japboots_ww2"
item_state_slots["slot_w_uniform"] = "japboots_ww2"
item_state = "[baseicon]"
icon_state = "[baseicon]"
worn_state = "[baseicon]"
item_state_slots["slot_w_uniform"] = "[baseicon]"
usr << "<span class = 'danger'>You haven't any puttees on the boots!</span>"
puttees = FALSE
update_clothing_icon()
Expand All @@ -1073,42 +1074,57 @@
user << "<span class='notice'>You wrap the puttees around your legs.</span>"
src.puttees = TRUE
qdel(W)
src.item_state = "japboots_ww2_puttees"
src.icon_state = "japboots_ww2_puttees"
src.worn_state = "japboots_ww2_puttees"
item_state_slots["shoes"] = "japboots_ww2_puttees"
src.item_state = "[baseicon]_puttees"
src.icon_state = "[baseicon]_puttees"
src.worn_state = "[baseicon]_puttees"
item_state_slots["shoes"] = "[baseicon]_puttees"
update_clothing_icon()
return

/obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2/puttees
puttees = TRUE
/obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2/puttees/update_icon()
if (puttees)
item_state = "japboots_ww2_puttees"
icon_state = "japboots_ww2_puttees"
worn_state = "japboots_ww2_puttees"
item_state_slots["shoes"] = "japboots_ww2_puttees"
item_state = "[baseicon]_puttees"
icon_state = "[baseicon]_puttees"
worn_state = "[baseicon]_puttees"
item_state_slots["shoes"] = "[baseicon]_puttees"
else
item_state = "japboots_ww2"
icon_state = "japboots_ww2"
worn_state = "japboots_ww2"
item_state_slots["slot_w_uniform"] = "japboots_ww2"
item_state = "[baseicon]"
icon_state = "[baseicon]"
worn_state = "[baseicon]"
item_state_slots["slot_w_uniform"] = "[baseicon]"
/obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2/puttees/attackby(obj/item/W as obj, mob/user as mob)
if (!istype(W)) return//I really don't understand why this check is needed
if (istype(W, /obj/item/puttees) && !puttees)
playsound(loc, 'sound/machines/click.ogg', 75, TRUE)
user << "<span class='notice'>You wrap the puttees around your legs.</span>"
src.puttees = TRUE
qdel(W)
src.item_state = "japboots_ww2_puttees"
src.icon_state = "japboots_ww2_puttees"
src.worn_state = "japboots_ww2_puttees"
item_state_slots["shoes"] = "japboots_ww2_puttees"
src.item_state = "[baseicon]_puttees"
src.icon_state = "[baseicon]_puttees"
src.worn_state = "[baseicon]_puttees"
item_state_slots["shoes"] = "[baseicon]_puttees"
update_clothing_icon()
return
/obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2/puttees/New()
..()
update_icon()

/obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2/navy
name = "black leather boots"
desc = "A pair of hobnailed leather boots"
icon_state = "japboots_ww2_navy"
item_state = "japboots_ww2_navy"
worn_state = "japboots_ww2_navy"
puttees = FALSE
baseicon = "japboots_ww2_navy"

/obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2/navy/puttees
puttees = TRUE
/obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2/navy/puttees/New()
..()
update_icon()
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////BRITISH////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
32 changes: 16 additions & 16 deletions code/modules/1713/jobs/japanese.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
/datum/job/japanese/ija_captain/equip(var/mob/living/human/H)
if (!H) return FALSE
//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/jap_ww2(H), slot_shoes)
//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japoffuni(H), slot_w_uniform)
//head
Expand Down Expand Up @@ -510,7 +510,7 @@
/datum/job/japanese/ija_lieutenant/equip(var/mob/living/human/H)
if (!H) return FALSE
//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/jap_ww2(H), slot_shoes)
//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japoffuni(H), slot_w_uniform)
//head
Expand Down Expand Up @@ -567,7 +567,7 @@
/datum/job/japanese/ija_lieutenant2/equip(var/mob/living/human/H)
if (!H) return FALSE
//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/jap_ww2(H), slot_shoes)
//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japoffuni(H), slot_w_uniform)
//head
Expand Down Expand Up @@ -1466,12 +1466,12 @@
/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/shoes/heavyboots/wrappedboots/jap_ww2/navy(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/jap_ww2/navy(H), slot_shoes)
//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
//head
Expand Down Expand Up @@ -1523,12 +1523,12 @@
/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/shoes/heavyboots/wrappedboots/jap_ww2/navy(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/jap_ww2/navy(H), slot_shoes)
//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
//head
Expand Down Expand Up @@ -1580,12 +1580,12 @@
/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/shoes/heavyboots/wrappedboots/jap_ww2/navy(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/jap_ww2/navy(H), slot_shoes)
//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
//head
Expand Down Expand Up @@ -1639,7 +1639,7 @@
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/jap_ww2/navy/puttees(H), slot_shoes)
//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
//head
Expand Down Expand Up @@ -1693,7 +1693,7 @@
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/jap_ww2/navy/puttees(H), slot_shoes)
//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform) // for now
//head
Expand Down Expand Up @@ -1742,7 +1742,7 @@
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/jap_ww2/navy/puttees(H), slot_shoes)
//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform) // for now
//head
Expand Down Expand Up @@ -1794,7 +1794,7 @@
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/jap_ww2/navy/puttees(H), slot_shoes)

//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
Expand Down Expand Up @@ -1842,7 +1842,7 @@
/datum/job/japanese/ijn_machinegunner/equip(var/mob/living/human/H)
if (!H) return FALSE
//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/jap_ww2/navy/puttees(H), slot_shoes)

//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
Expand Down Expand Up @@ -1894,7 +1894,7 @@
/datum/job/japanese/ijn_machinegunner_assistant/equip(var/mob/living/human/H)
if (!H) return FALSE
//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/jap_ww2/navy/puttees(H), slot_shoes)

//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
Expand Down Expand Up @@ -1948,7 +1948,7 @@
/datum/job/japanese/ijn_sniper/equip(var/mob/living/human/H)
if (!H) return FALSE
//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/jap_ww2/navy/puttees(H), slot_shoes)

//clothes
H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/japuni_snlf(H), slot_w_uniform)
Expand Down
8 changes: 5 additions & 3 deletions code/modules/1713/vending.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@
desc = "Basic wear for soldiers of the Imperial Japanese Army."
icon_state = "apparel_japan_ww2"
products = list(
/obj/item/clothing/shoes/heavyboots/wrappedboots = 15,
/obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2 = 15,
/obj/item/clothing/under/ww2/japuni = 15,
/obj/item/clothing/suit/storage/coat/ww2/japcoat = 15,
/obj/item/clothing/head/ww2/japcap = 15,
Expand All @@ -446,7 +446,7 @@
desc = "Basic wear for soldiers of the Imperial Japanese Special Navy Landing Force."
icon_state = "apparel_japan_ww2"
products = list(
/obj/item/clothing/shoes/heavyboots/wrappedboots = 15,
/obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2/navy = 15,
/obj/item/clothing/under/ww2/japuni_snlf = 15,
/obj/item/clothing/head/ww2/japcap_snlf = 15,
/obj/item/clothing/head/helmet/ww2/japhelm_snlf = 15,
Expand All @@ -464,9 +464,11 @@
desc = "Basic wear for soldiers of the Imperial Japanese Navy."
icon_state = "apparel_japan_ww2"
products = list(
/obj/item/clothing/shoes/heavyboots/wrappedboots = 15,
/obj/item/clothing/shoes/heavyboots/wrappedboots/jap_ww2/navy = 15,
/obj/item/clothing/under/ww2/japuni_snlf = 15,
/obj/item/clothing/head/ww2/japcap_snlf = 15,
/obj/item/clothing/under/ww2/japuni_navy = 15,
/obj/item/clothing/head/ww2/japcap_navy_cap = 15,
/obj/item/clothing/head/helmet/ww2/japhelm_snlf = 15,
/obj/item/clothing/head/ww2/jap_headband = 10,
/obj/item/stack/medical/bruise_pack/bint = 10,
Expand Down
Binary file modified icons/mob/feet.dmi
View file
Binary file not shown.
Binary file modified icons/obj/clothing/shoes.dmi
View file
Binary file not shown.

0 comments on commit f65ecd0

Please sign in to comment.