mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-10 15:36:56 +01:00
Merge pull request #383 from Kabramen/more-stuff-+-clown-masks
New items+ loadout changes + new clown mask types
This commit is contained in:
@@ -73,6 +73,8 @@
|
||||
clownmask_designs = list(
|
||||
"True Form" = image(icon = src.icon, icon_state = "clown"),
|
||||
"The Feminist" = image(icon = src.icon, icon_state = "sexyclown"),
|
||||
"Clean True Form" = image(icon = src.icon, icon_state = "clown_clean"),
|
||||
"The Feminist Clean" = image(icon = src.icon, icon_state = "sexyclown_clean"),
|
||||
"The Madman" = image(icon = src.icon, icon_state = "joker"),
|
||||
"The Rainbow Color" = image(icon = src.icon, icon_state = "rainbow")
|
||||
)
|
||||
@@ -81,8 +83,7 @@
|
||||
if(!istype(user) || user.incapacitated())
|
||||
return
|
||||
|
||||
var/static/list/options = list("True Form" = "clown", "The Feminist" = "sexyclown",
|
||||
"The Rainbow Color" = "rainbow", "The Madman" = "joker")
|
||||
var/static/list/options = list("True Form" = "clown", "The Feminist" = "sexyclown", "Clean True Form" = "clown_clean", "The Feminist Clean" = "sexyclown_clean", "The Rainbow Color" = "rainbow", "The Madman" = "joker")
|
||||
|
||||
var/choice = show_radial_menu(user,src, clownmask_designs, custom_check = FALSE, radius = 36, require_near = TRUE)
|
||||
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
icon_state = "centcom"
|
||||
item_state = "dg_suit"
|
||||
item_color = "centcom"
|
||||
/obj/item/clothing/under/rank/centcom_officer/skirt
|
||||
/obj/item/clothing/under/rank/centcom_officer/skirt
|
||||
name = "\improper CentCom Officer's jumpskirt"
|
||||
desc = "It's a jumpskirt worn by CentCom's officials, adorned with a golden K and a star, signifying work under Kinaris."
|
||||
icon_state = "official_skirt"
|
||||
@@ -133,7 +133,7 @@
|
||||
item_color = "official_skirt"
|
||||
body_parts_covered = CHEST|GROIN|ARMS
|
||||
fitted = FEMALE_UNIFORM_TOP
|
||||
can_adjust = FALSE
|
||||
can_adjust = FALSE
|
||||
/obj/item/clothing/under/space
|
||||
name = "\improper NASA jumpsuit"
|
||||
desc = "It has a NASA logo on it and is made of space-proofed materials."
|
||||
@@ -765,7 +765,7 @@
|
||||
item_state = "christmasfemaleg"
|
||||
body_parts_covered = CHEST|GROIN
|
||||
can_adjust = FALSE
|
||||
|
||||
|
||||
/obj/item/clothing/under/zone/monolith
|
||||
name = "Urban BDU"
|
||||
desc = "A splinter urban camouflage Battle-Dress uniform."
|
||||
@@ -775,3 +775,12 @@
|
||||
fitted = NO_FEMALE_UNIFORM
|
||||
can_adjust = FALSE
|
||||
resistance_flags = NONE
|
||||
|
||||
/obj/item/clothing/under/corset
|
||||
name = "black corset"
|
||||
desc = "We are not resposible for any organ damage."
|
||||
icon_state = "corset"
|
||||
item_state = "corset"
|
||||
body_parts_covered = CHEST|GROIN
|
||||
can_adjust = FALSE
|
||||
fitted = FEMALE_UNIFORM_TOP
|
||||
Reference in New Issue
Block a user