Skip to content

Commit

Permalink
Arm warmers.
Browse files Browse the repository at this point in the history
  • Loading branch information
ariaworld committed Dec 2, 2023
1 parent 6c69fcd commit c8c7669
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 1 deletion.
20 changes: 20 additions & 0 deletions modular_splurt/code/modules/client/loadout/wrists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,23 @@
/datum/gear/wrists/syntech/band
name = "Normalizer Band"
path = /obj/item/clothing/wrists/syntech

/datum/gear/wrists/armwarmer
name = "Arm Warmers"
path = /obj/item/clothing/wrists/armwarmer

/datum/gear/wrists/armwarmer/long
name = "Long Arm Warmers"
path = /obj/item/clothing/wrists/armwarmer/long

/datum/gear/wrists/armwarmer_striped
name = "Striped Arm Warmers"
path = /obj/item/clothing/wrists/armwarmer_striped
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#FFFFFF", "#FFFFFF")

/datum/gear/wrists/armwarmer_striped/long
name = "Long Striped Arm Warmers"
path = /obj/item/clothing/wrists/armwarmer_striped/long
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#FFFFFF", "#FFFFFF")
2 changes: 2 additions & 0 deletions modular_splurt/code/modules/clothing/wrists/_wrists.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
//(SPLURT VERSION - To add special behaviours)
/obj/item/clothing/wrists
40 changes: 40 additions & 0 deletions modular_splurt/code/modules/clothing/wrists/miscellaneous.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/obj/item/clothing/wrists/armwarmer
name = "Arm Warmers"
desc = "A pair of arm warmers."
icon = 'modular_splurt/icons/obj/clothing/wrists.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/wrists.dmi'
icon_state = "armwarmer"
item_state = "armwarmer"
body_parts_covered = ARMS

/obj/item/clothing/wrists/armwarmer/long
name = "Long Arm Warmers"
desc = "A pair of long arm warmers."
icon = 'modular_splurt/icons/obj/clothing/wrists.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/wrists.dmi'
icon_state = "armwarmer_long"
item_state = "armwarmer_long"
body_parts_covered = ARMS

/obj/item/clothing/wrists/armwarmer_striped
name = "Striped Arm Warmers"
desc = "A pair of striped arm warmers."
icon = 'modular_splurt/icons/obj/clothing/wrists.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/wrists.dmi'
icon_state = "armwarmer_striped"
item_state = "armwarmer_striped"
body_parts_covered = ARMS
var/list/poly_colors = list("#FFFFFF", "#FFFFFF")

/obj/item/clothing/wrists/armwarmer_striped/long
name = "Long Striped Arm Warmers"
desc = "A pair of long striped arm warmers."
icon = 'modular_splurt/icons/obj/clothing/wrists.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/wrists.dmi'
icon_state = "armwarmer_striped_long"
item_state = "armwarmer_striped_long"
body_parts_covered = ARMS

/obj/item/clothing/wrists/armwarmer_striped/ComponentInitialize()
. = ..()
AddElement(/datum/element/polychromic, poly_colors, 2)
6 changes: 5 additions & 1 deletion modular_splurt/code/modules/vending/clothesmate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@
/obj/item/clothing/under/suit/helltaker = 3,
/obj/item/clothing/under/suit/helltaker/skirt = 3,
/obj/item/clothing/suit/invisijacket = 3,
/obj/item/clothing/head/invisihat = 3
/obj/item/clothing/head/invisihat = 3,
/obj/item/clothing/wrists/armwarmer = 3,
/obj/item/clothing/wrists/armwarmer/long = 3,
/obj/item/clothing/wrists/armwarmer_striped = 3,
/obj/item/clothing/wrists/armwarmer_striped/long = 3
)
var/list/extra_contraband = list(
/obj/item/clothing/under/rank/civilian/lawyer/galaxy_red = 3,
Expand Down
Binary file added modular_splurt/icons/mob/clothing/wrists.dmi
Binary file not shown.
Binary file added modular_splurt/icons/obj/clothing/wrists.dmi
Binary file not shown.
2 changes: 2 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4730,6 +4730,8 @@
#include "modular_splurt\code\modules\clothing\underwear\boxers.dm"
#include "modular_splurt\code\modules\clothing\underwear\shirts.dm"
#include "modular_splurt\code\modules\clothing\underwear\socks.dm"
#include "modular_splurt\code\modules\clothing\wrists\_wrists.dm"
#include "modular_splurt\code\modules\clothing\wrists\miscellaneous.dm"
#include "modular_splurt\code\modules\crafting\eyepatchhud.dm"
#include "modular_splurt\code\modules\custom_loadout\first_tier.dm"
#include "modular_splurt\code\modules\discord\accountlink.dm"
Expand Down

0 comments on commit c8c7669

Please sign in to comment.