Skip to content

Commit

Permalink
Dripping out the station: Episode 1, Captain's closet (MrMelbert#204)
Browse files Browse the repository at this point in the history
  • Loading branch information
Draggeru authored Dec 26, 2022
1 parent 82009cd commit a3d2359
Show file tree
Hide file tree
Showing 9 changed files with 143 additions and 0 deletions.
1 change: 1 addition & 0 deletions code/modules/unit_tests/inhands.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

// NON-MODULE CHANGE: point to new icons
generate_possible_icon_states_list("maplestation_modules/icons/mob/inhands")
generate_possible_icon_states_list("maplestation_modules/story_content/captain_equipment")
generate_possible_icon_states_list("maplestation_modules/story_content/prince_equipment/icons")
// NON-MODULE CHANGE END

Expand Down
1 change: 1 addition & 0 deletions maplestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -5128,6 +5128,7 @@
#include "maplestation_modules\code\modules\uplink\uplink_infiltrator.dm"
#include "maplestation_modules\code\modules\uplink\uplink_items.dm"
#include "maplestation_modules\code\modules\vending\_vending.dm"
#include "maplestation_modules\story_content\captain_equipment\code\captainclothing.dm"
#include "maplestation_modules\story_content\noble_equipment\code\nobleclothing.dm"
#include "maplestation_modules\story_content\noname_equipment\code\nonameclothing.dm"
#include "maplestation_modules\story_content\post_overlay\code\post_overlay.dm"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
icon = 'maplestation_modules/icons/mob/human_face.dmi'
icon_state = "hair_unkempt"

/datum/sprite_accessory/hair/styled
name = "Styled"
icon = 'maplestation_modules/icons/mob/human_face.dmi'
icon_state = "hair_styled"

/datum/sprite_accessory/ears/cat/cyber
name = "Cybernetic Cat"
icon_state = "catcyber"
Expand Down
Binary file modified maplestation_modules/icons/mob/human_face.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
/obj/item/clothing/under/rank/captain/formal
name = "captain's turtleneck"
desc = "Clothing designed for the commander of the station, the turtleneck is soft to the touch."
icon = 'maplestation_modules/story_content/captain_equipment/captain_icon.dmi'
worn_icon = 'maplestation_modules/story_content/captain_equipment/captain_worn.dmi'
lefthand_file = 'maplestation_modules/story_content/captain_equipment/captain_lhand.dmi'
righthand_file = 'maplestation_modules/story_content/captain_equipment/captain_rhand.dmi'
// Item: "capturtleneck"
// Sleeves adjusted: "capturtleneck_r"
// Adjusted: "capturtleneck_r"
// Inhand: "uni"
// Worn: "capturtleneck"
icon_state = "capturtleneck"
inhand_icon_state = "capturtleneck"
supports_variations_flags = CLOTHING_NO_VARIATION
can_adjust = TRUE
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 0, WOUND = 15)

/obj/item/clothing/under/rank/captain/formal/skirt
name = "captain's skirtleneck"
desc = "A uniform designed for the commander of the station, the skirt is just long enough to clear the length standard."
icon = 'maplestation_modules/story_content/captain_equipment/captain_icon.dmi'
worn_icon = 'maplestation_modules/story_content/captain_equipment/captain_worn.dmi'
lefthand_file = 'maplestation_modules/story_content/captain_equipment/captain_lhand.dmi'
righthand_file = 'maplestation_modules/story_content/captain_equipment/captain_rhand.dmi'
// Item: "capskirtleneck"
// Sleeves adjusted: "capskirtleneck_r"
// Adjusted: "capskirtleneck_d"
// Inhand: "uni"
// Worn: "capskirtleneck"
icon_state = "capskirtleneck"
inhand_icon_state = "capturtleneck"
supports_variations_flags = CLOTHING_NO_VARIATION
can_adjust = TRUE
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 0, WOUND = 15)

/obj/item/clothing/shoes/jackboots/captain
name = "captain's boots"
desc = "Hard leather boots meant for the commander of the station, these boots look combat ready."
icon = 'maplestation_modules/story_content/captain_equipment/captain_icon.dmi'
worn_icon = 'maplestation_modules/story_content/captain_equipment/captain_worn.dmi'
lefthand_file = 'maplestation_modules/story_content/captain_equipment/captain_lhand.dmi'
righthand_file = 'maplestation_modules/story_content/captain_equipment/captain_rhand.dmi'
// Item: "capboots"
// Inhand: "capboots"
// Worn: "capboots"
icon_state = "capboots"
inhand_icon_state = "capboots"
strip_delay = 30
equip_delay_other = 50
resistance_flags = NONE
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 90, FIRE = 0, ACID = 0)
can_be_tied = FALSE

/obj/item/clothing/gloves/captain/formal
name = "captain's black gloves"
desc = "Black gloves commanding officer gloves with a sleek appearance to them."
icon = 'maplestation_modules/story_content/captain_equipment/captain_icon.dmi'
worn_icon = 'maplestation_modules/story_content/captain_equipment/captain_worn.dmi'
lefthand_file = 'maplestation_modules/story_content/captain_equipment/captain_lhand.dmi'
righthand_file = 'maplestation_modules/story_content/captain_equipment/captain_rhand.dmi'
// Item: "capgloves"
// Inhand: "capgloves"
// Worn: "capgloves"
icon_state = "capgloves"
inhand_icon_state = "capgloves"
siemens_coefficient = 0
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
strip_delay = 60
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 90, FIRE = 70, ACID = 50)
resistance_flags = NONE

/obj/item/clothing/suit/armor/vest/capformalcarapace
name = "captain's quality carapace"
desc = "A high quality carapace fitted with sturdy painted metal plating. This one is meant for the stations commander."
icon = 'maplestation_modules/story_content/captain_equipment/captain_icon.dmi'
worn_icon = 'maplestation_modules/story_content/captain_equipment/captain_worn.dmi'
lefthand_file = 'maplestation_modules/story_content/captain_equipment/captain_lhand.dmi'
righthand_file = 'maplestation_modules/story_content/captain_equipment/captain_rhand.dmi'
// Item: "caparmorvest"
// Inhand: "caparmorvest"
// Worn: "noblejacket"
icon_state = "caparmorvest"
inhand_icon_state = "caparmorvest"
body_parts_covered = CHEST|GROIN
armor = list(MELEE = 50, BULLET = 40, LASER = 50, ENERGY = 50, BOMB = 25, BIO = 0, FIRE = 100, ACID = 90, WOUND = 10)
dog_fashion = null
resistance_flags = FIRE_PROOF

/obj/item/clothing/suit/armor/vest/capvestformal
name = "captain's vest"
desc = "An elegant heavy duty vest. It appears that this vest was modified from a bullet proof vest."
icon = 'maplestation_modules/story_content/captain_equipment/captain_icon.dmi'
worn_icon = 'maplestation_modules/story_content/captain_equipment/captain_worn.dmi'
lefthand_file = 'maplestation_modules/story_content/captain_equipment/captain_lhand.dmi'
righthand_file = 'maplestation_modules/story_content/captain_equipment/captain_rhand.dmi'
// Item: "capvest"
// Inhand: "capvest"
// Worn: "capvest"
icon_state = "capvest"
inhand_icon_state = "capvest"
body_parts_covered = CHEST|GROIN
armor = list(MELEE = 50, BULLET = 40, LASER = 50, ENERGY = 50, BOMB = 25, BIO = 0, FIRE = 100, ACID = 90, WOUND = 10)
dog_fashion = null
resistance_flags = FIRE_PROOF

/obj/item/clothing/neck/cloak/capformal
name = "captain's half cape"
desc = "Worn by the commander of the station, this cape only covers half of the body."
icon = 'maplestation_modules/story_content/captain_equipment/captain_icon.dmi'
worn_icon = 'maplestation_modules/story_content/captain_equipment/captain_worn.dmi'
lefthand_file = 'maplestation_modules/story_content/captain_equipment/captain_lhand.dmi'
righthand_file = 'maplestation_modules/story_content/captain_equipment/captain_rhand.dmi'
icon_state = "caphalfcape"
inhand_icon_state = "caphalfcape"
w_class = WEIGHT_CLASS_SMALL
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDESUITSTORAGE

// Clothes to the bag
/obj/item/storage/bag/garment/captain/PopulateContents()
. = ..()
new /obj/item/clothing/under/rank/captain/formal(src)
new /obj/item/clothing/under/rank/captain/formal/skirt(src)
new /obj/item/clothing/shoes/jackboots/captain(src)
new /obj/item/clothing/gloves/captain/formal(src)
new /obj/item/clothing/suit/armor/vest/capformalcarapace(src)
new /obj/item/clothing/suit/armor/vest/capvestformal(src)
new /obj/item/clothing/neck/cloak/capformal(src)

0 comments on commit a3d2359

Please sign in to comment.