Skip to content

Commit

Permalink
Add cyberpunk jacket (#8240)
Browse files Browse the repository at this point in the history
* add cyberpunk jacket by INFRARED_BARON

* Update code/modules/clothing/accessories/logo.dm
  • Loading branch information
SirRichardFrancis committed Jul 28, 2023
1 parent 0f11a0c commit 3d77d2b
Show file tree
Hide file tree
Showing 10 changed files with 90 additions and 2 deletions.
2 changes: 2 additions & 0 deletions cev_eris.dme
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,7 @@
#include "code\game\objects\items\musictapes.dm"
#include "code\game\objects\items\oddities.dm"
#include "code\game\objects\items\paintkit.dm"
#include "code\game\objects\items\punk_lootbox.dm"
#include "code\game\objects\items\shooting_range.dm"
#include "code\game\objects\items\slimeflashlight.dm"
#include "code\game\objects\items\spraypaint.dm"
Expand Down Expand Up @@ -1555,6 +1556,7 @@
#include "code\modules\clothing\accessories\badges.dm"
#include "code\modules\clothing\accessories\lenses.dm"
#include "code\modules\clothing\accessories\lockets.dm"
#include "code\modules\clothing\accessories\logo.dm"
#include "code\modules\clothing\glasses\glasses.dm"
#include "code\modules\clothing\glasses\hud.dm"
#include "code\modules\clothing\glasses\meson.dm"
Expand Down
6 changes: 4 additions & 2 deletions code/game/machinery/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1818,7 +1818,8 @@
/obj/item/clothing/suit/storage/aerostatic = 2,
/obj/item/clothing/suit/storage/jamrock = 2,
/obj/item/clothing/suit/storage/dante = 2,
/obj/item/clothing/suit/storage/akira = 2
/obj/item/clothing/suit/storage/akira = 2,
/obj/item/punk_lootbox = 8
)
prices = list(
/obj/item/clothing/mask/scarf/style = 250,
Expand Down Expand Up @@ -1913,7 +1914,8 @@
/obj/item/clothing/suit/storage/dante = 900,
/obj/item/clothing/suit/storage/triad = 1200,
/obj/item/clothing/suit/storage/akira = 600,
/obj/item/clothing/head/skull/drip = 100000
/obj/item/clothing/head/skull/drip = 100000,
/obj/item/punk_lootbox = 500
)

contraband = list(
Expand Down
38 changes: 38 additions & 0 deletions code/game/objects/items/punk_lootbox.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/obj/item/punk_lootbox
name = "jacket box"
desc = "Brown cardboard box."
icon_state = "jacket_box"
matter = list(MATERIAL_CARDBOARD = 2)
rarity_value = 65

/obj/item/punk_lootbox/attack_self(mob/user)
. = ..()
if(icon_state == "jacket_box_open")
to_chat(user, SPAN_NOTICE("You fold \the [name] flat."))
new /obj/item/stack/material/cardboard(get_turf(src))
qdel(src)
return

var/jacket_list = list(
"Bright" = "punk_bright",
"Dark" = "punk_dark",
"Dark with highlights" = "punk_highlight")

var/jacket_type = input(user, "Choose jacket type", "What kind of punk are you?") as null|anything in jacket_list
if(!jacket_type)
to_chat(user, SPAN_NOTICE("You're an indecisive punk today."))
return

var/logo_list = list(
"Valentinos" = "punk_over_valentinos",
"Samurai" = "punk_over_samurai",
"Jager Roaches" = "punk_over_jager_roach",
"Tunnel Snakes" = "punk_over_tunnel_snakes",
"No logo" = "")

var/logo_type = input(user, "Choose logo type", "Gang affiliation much?") as null|anything in logo_list

new /obj/item/clothing/suit/storage/greatcoat/punk(loc = get_turf(loc), jacket_type = jacket_list[jacket_type], logo_type = logo_list[logo_type], is_natural_spawn = FALSE)
to_chat(user, SPAN_NOTICE("You take out the jacket."))
icon_state = "jacket_box_open"
update_icon()
7 changes: 7 additions & 0 deletions code/modules/clothing/accessories/logo.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/obj/item/clothing/accessory/logo
name = "gang logo"
desc = ""
icon = 'icons/inventory/accessory/icon.dmi'
icon_state = "punk_over_samurai"
isRemovable = FALSE
spawn_blacklisted = TRUE
39 changes: 39 additions & 0 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,45 @@
slowdown = LIGHT_SLOWDOWN
valid_accessory_slots = list("armband","decor")
restricted_accessory_slots = list("armband")
/obj/item/clothing/suit/storage/greatcoat/punk
name = "punk jacket"
desc = "Authentic leather for an authentic punk."
icon_state = "punk_highlight"

/obj/item/clothing/suit/storage/greatcoat/punk/New(loc, jacket_type = "punk_highlight", logo_type, is_natural_spawn = TRUE)
..()
if(is_natural_spawn) // From junk pile or some such
logo_type = pick(list(
null, null, null, null, // 50% chance of not having any logo
"punk_over_valentinos",
"punk_over_samurai",
"punk_over_jager_roach",
"punk_over_tunnel_snakes"
))
jacket_type = pick(list(
"punk_bright",
"punk_dark",
"punk_highlight"
))

if(logo_type)
var/obj/item/clothing/accessory/logo/logo = new
logo.icon_state = logo_type
accessories += logo
logo.has_suit = src
loc = src
switch(logo_type) // All of the following names associated with some group of people, thus capitalized
if("punk_over_valentinos")
name = "Valentinos jacket"
if("punk_over_samurai")
name = "Samurai jacket"
if("punk_over_jager_roach")
name = "Jager Roaches jacket"
if("punk_over_tunnel_snakes")
name = "Tunnel Snakes jacket"

icon_state = jacket_type
update_icon()

/obj/item/clothing/suit/storage/greatcoat/ironhammer
icon_state = "greatcoat_ironhammer"
Expand Down
Binary file modified icons/inventory/accessory/mob.dmi
Binary file not shown.
Binary file modified icons/inventory/suit/icon.dmi
Binary file not shown.
Binary file modified icons/inventory/suit/mob.dmi
Binary file not shown.
Binary file modified icons/inventory/suit/mob_fem.dmi
Binary file not shown.
Binary file modified icons/obj/items.dmi
Binary file not shown.

0 comments on commit 3d77d2b

Please sign in to comment.