Skip to content

Commit

Permalink
Removes the Female Exclusive Power of Bikini Armor (#100)
Browse files Browse the repository at this point in the history
* Update armor.dm

Added males to the list of allowed sexes to wear bikini armor, and added the mob overlay sprites directory to each of the bikini armor pieces so they have their male counterparts to point to.

* Create armor.dm

Adds armor.dm file containing code for the egyptian robe under the name 'foreign dress' as well as code for barrel armor (only admin spawnable for now)

* Create weaving.dm

Adds weaving.dm for crafting the egyptian robes and headdresses

* Create armor.dmi

Placeholder armor.dmi that will hold the inventory icon for the barrel armor

* Create armor.dmi

Placeholder armor.dmi that will hold the onmob sprites for the new barrel armor, egyptian robe, and male bikini sprites.

* Add files via upload

Uploaded the barrel armor inventory icon .dmi and the onmob sprites .dmi

* Update armor.dm

Fixed Indentation error that I'm not even sure how it occurred when I copied and pasted the code.

* Reuploading file

Reuploading file because it didn't look like it took it the first time I tried to upload it for whatever reason.

* I SAID UPLOAD
  • Loading branch information
SgtRyder authored Dec 10, 2024
1 parent cd02eaa commit 5a74581
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 6 deletions.
18 changes: 12 additions & 6 deletions code/modules/clothing/rogueclothes/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@
desc = "Not very comfortable against the skin."
icon_state = "chainkini"
item_state = "chainkini"
allowed_sex = list(FEMALE)
mob_overlay_icon = 'modular_causticcove/icons/roguetown/clothing/onmob/armor.dmi'
allowed_sex = list(MALE, FEMALE)
allowed_race = CLOTHED_RACES_TYPES
body_parts_covered = CHEST|GROIN
armor_class = ARMOR_CLASS_LIGHT
Expand Down Expand Up @@ -113,7 +114,8 @@
body_parts_covered = CHEST|GROIN
icon_state = "halfplatekini"
item_state = "halfplatekini"
allowed_sex = list(FEMALE)
mob_overlay_icon = 'modular_causticcove/icons/roguetown/clothing/onmob/armor.dmi'
allowed_sex = list(MALE, FEMALE)
armor_class = ARMOR_CLASS_MEDIUM
smelt_bar_num = 2

Expand Down Expand Up @@ -150,7 +152,8 @@
name = "fullplate bikini"
desc = "Full plate in bikini form, full package and full exposure."
icon_state = "platekini"
allowed_sex = list(FEMALE)
mob_overlay_icon = 'modular_causticcove/icons/roguetown/clothing/onmob/armor.dmi'
allowed_sex = list(MALE, FEMALE)
body_parts_covered = CHEST|GROIN|LEGS|ARMS
equip_delay_self = 8 SECONDS
unequip_delay_self = 8 SECONDS
Expand Down Expand Up @@ -427,7 +430,8 @@
body_parts_covered = CHEST|GROIN
icon_state = "leatherkini"
item_state = "leatherkini"
allowed_sex = list(FEMALE)
mob_overlay_icon = 'modular_causticcove/icons/roguetown/clothing/onmob/armor.dmi'
allowed_sex = list(MALE, FEMALE)
allowed_race = CLOTHED_RACES_TYPES

/obj/item/clothing/suit/roguetown/armor/leather/studded/bikini
Expand All @@ -436,7 +440,8 @@
body_parts_covered = CHEST|GROIN
icon_state = "studleatherkini"
item_state = "studleatherkini"
allowed_sex = list(FEMALE)
mob_overlay_icon = 'modular_causticcove/icons/roguetown/clothing/onmob/armor.dmi'
allowed_sex = list(MALE, FEMALE)
allowed_race = CLOTHED_RACES_TYPES

/obj/item/clothing/suit/roguetown/armor/leather/hide/bikini
Expand All @@ -445,7 +450,8 @@
body_parts_covered = CHEST|GROIN
icon_state = "hidearmorkini"
item_state = "hidearmorkini"
allowed_sex = list(FEMALE)
mob_overlay_icon = 'modular_causticcove/icons/roguetown/clothing/onmob/armor.dmi'
allowed_sex = list(MALE, FEMALE)
allowed_race = CLOTHED_RACES_TYPES

/obj/item/clothing/suit/roguetown/armor/leather/vest
Expand Down
26 changes: 26 additions & 0 deletions modular_causticcove/code/modules/clothing/rogueclothes/armor.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/obj/item/clothing/suit/roguetown/armor/egypt
name = "foreign dress"
desc = "Exotic foreign dress from a faraway land. Barely covers anything."
body_parts_covered = CHEST|GROIN
mob_overlay_icon = 'modular_causticcove/icons/roguetown/clothing/onmob/armor.dmi'
icon_state = "egypt"
item_state = "egypt"
allowed_sex = list(MALE, FEMALE)
allowed_race = CLOTHED_RACES_TYPES
slot_flags = ITEM_SLOT_CLOAK|ITEM_SLOT_ARMOR|ITEM_SLOT_SHIRT
sewrepair = TRUE

/obj/item/clothing/suit/roguetown/armor/barrelarmor
name = "barrel armor"
desc = "It's a barrel. Being used as armor. I'm not sure what more needs to be said."
icon = 'modular_causticcove/icons/roguetown/clothing/armor.dmi'
mob_overlay_icon = 'modular_causticcove/icons/roguetown/clothing/onmob/armor.dmi'
icon_state = "barrelarmor"
item_state = "barrelarmor"
allowed_sex = list(MALE, FEMALE)
blocksound = SOFTHIT
armor = list("blunt" = 50, "slash" = 70, "stab" = 30, "bullet" = 15, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
prevent_crits = list(BCLASS_CUT, BCLASS_STAB, BCLASS_BLUNT, BCLASS_CHOP)
body_parts_covered = CHEST|GROIN|VITALS|LEGS|ARMS
max_integrity = 300
slot_flags = ITEM_SLOT_CLOAK
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/datum/crafting_recipe/roguetown/sewing/foreigndress
name = "foreign dress"
result = list(/obj/item/clothing/suit/roguetown/armor/egypt)
reqs = list(/obj/item/natural/silk = 5)
craftdiff = 3
sellprice = 35

/datum/crafting_recipe/roguetown/sewing/headdress
name = "foreign headdress (blue)"
result = list(/obj/item/clothing/head/roguetown/headdress)
reqs = list(/obj/item/natural/silk = 2)
craftdiff = 3

/datum/crafting_recipe/roguetown/sewing/headdressalt
name = "foreign headdress (red)"
result = list(/obj/item/clothing/head/roguetown/headdress/alt)
reqs = list(/obj/item/natural/silk = 2)
craftdiff = 3
Binary file not shown.
Binary file not shown.

0 comments on commit 5a74581

Please sign in to comment.