mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 21:18:37 +01:00
[MIRROR] That's it. *GAGS'ifies your berets* (#7097)
* That's it. *GAGS'ifies your berets* * a * Update head.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
co-authored by
GoldenAlpharex
Gandalf
GoldenAlpharex
Gandalf
parent
56a3f20824
commit
8a9ab67aad
@@ -3535,7 +3535,7 @@
|
||||
/obj/item/clothing/head/beanie/red,
|
||||
/obj/item/clothing/head/beanie/waldo,
|
||||
/obj/item/clothing/head/bearpelt,
|
||||
/obj/item/clothing/head/beret/vintage,
|
||||
/obj/item/clothing/head/beret,
|
||||
/obj/item/clothing/head/bomb_hood,
|
||||
/obj/item/clothing/head/bunnyhead,
|
||||
/obj/item/clothing/head/cardborg,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -58,6 +58,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
|
||||
#define CAN_BE_DIRTY_1 (1<<19)
|
||||
/// Should we use the initial icon for display? Mostly used by overlay only objects
|
||||
#define HTML_USE_INITAL_ICON_1 (1<<20)
|
||||
/// Can players recolor this in-game via vendors (and maybe more if support is added)?
|
||||
#define IS_PLAYER_COLORABLE_1 (1<<21)
|
||||
|
||||
// Update flags for [/atom/proc/update_appearance]
|
||||
/// Update the atom's name
|
||||
|
||||
@@ -125,6 +125,7 @@ DEFINE_BITFIELD(flags_1, list(
|
||||
"SHOCKED_1" = SHOCKED_1,
|
||||
"SUPERMATTER_IGNORES_1" = SUPERMATTER_IGNORES_1,
|
||||
"UNPAINTABLE_1" = UNPAINTABLE_1,
|
||||
"IS_PLAYER_COLORABLE_1" = IS_PLAYER_COLORABLE_1,
|
||||
))
|
||||
|
||||
DEFINE_BITFIELD(flags_ricochet, list(
|
||||
|
||||
@@ -92,6 +92,21 @@ And that's all you need to make it usable by other code:
|
||||
|
||||
More configurations can be found in [code/datums/greyscale/greyscale_configs.dm](./greyscale_configs.dm)
|
||||
|
||||
If you want your item to be colorable in a vending machine (or other places if there's ever any support added for that), you should do it like this:
|
||||
|
||||
```c
|
||||
/obj/item/clothing/head/beret
|
||||
...
|
||||
flags_1 = IS_PLAYER_COLORABLE_1
|
||||
```
|
||||
However, **be extremely careful**, as this *requires* that you put *all* of the object's `flags_1` flags in that statement all over again. It's ugly, I know, but there's no
|
||||
better way to do this with BYOND just yet. You can put multiple flags like this (not real flags):
|
||||
```c
|
||||
/obj/item/clothing/head/beret
|
||||
...
|
||||
flags_1 = IS_PLAYER_COLORABLE_1 | THIS_IS_A_FAKE_FLAG | THIS_IS_ANOTHER_FAKE_FLAG
|
||||
```
|
||||
|
||||
## Debugging
|
||||
|
||||
If you're making a new greyscale sprite you sometimes want to be able to see how layers got generated or maybe you're just tweaking some colors. Rather than rebooting the server with every change there is a greyscale modification menu that can be found in the vv dropdown menu for the greyscale object. Here you can change colors, preview the results, and reload everything from their files.
|
||||
|
||||
@@ -303,6 +303,24 @@
|
||||
icon_file = 'icons/obj/items/cleric_mace.dmi'
|
||||
json_config = 'code/datums/greyscale/json_configs/items/cleric_mace_worn_gold.json'
|
||||
|
||||
/datum/greyscale_config/beret
|
||||
name = "Beret"
|
||||
icon_file = 'icons/obj/clothing/head/beret.dmi'
|
||||
json_config = 'code/datums/greyscale/json_configs/beret.json'
|
||||
|
||||
/datum/greyscale_config/beret/worn
|
||||
name = "Beret Worn"
|
||||
json_config = 'code/datums/greyscale/json_configs/beret_worn.json'
|
||||
|
||||
/datum/greyscale_config/beret_badge
|
||||
name = "Beret With Badge"
|
||||
icon_file = 'icons/obj/clothing/head/beret.dmi'
|
||||
json_config = 'code/datums/greyscale/json_configs/beret_badge.json'
|
||||
|
||||
/datum/greyscale_config/beret_badge/worn
|
||||
name = "Beret With Badge Worn"
|
||||
json_config = 'code/datums/greyscale/json_configs/beret_badge_worn.json'
|
||||
|
||||
/datum/greyscale_config/suspenders
|
||||
name = "Suspenders"
|
||||
icon_file = 'icons/obj/clothing/belts.dmi'
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"beret": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "beret",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 1 ]
|
||||
}
|
||||
],
|
||||
"beret_flat": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "beret_flat",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 1 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"beret_badge": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "beret",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 1 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "badge",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 2 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"beret_badge": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "beret_worn",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 1 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "badge_worn",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 2 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"beret": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "beret_worn",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 1 ]
|
||||
}
|
||||
],
|
||||
"beret_flat": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "beret_worn",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 1 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -8,7 +8,7 @@
|
||||
belt_icon_state = "screwdriver"
|
||||
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
|
||||
flags_1 = CONDUCT_1
|
||||
flags_1 = CONDUCT_1 | IS_PLAYER_COLORABLE_1
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
force = 5
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
|
||||
@@ -370,7 +370,7 @@
|
||||
/obj/item/clothing/head/beret/sec/navywarden,
|
||||
/obj/item/clothing/under/rank/security/head_of_security/formal,
|
||||
/obj/item/clothing/suit/security/hos,
|
||||
/obj/item/clothing/head/beret/sec/navyhos)
|
||||
/obj/item/clothing/head/hos/beret/navyhos)
|
||||
crate_name = "security clothing crate"
|
||||
*/
|
||||
|
||||
|
||||
@@ -63,6 +63,9 @@
|
||||
name = "collectable beret"
|
||||
desc = "A collectable red beret. It smells faintly of garlic."
|
||||
icon_state = "beret"
|
||||
greyscale_config = /datum/greyscale_config/beret
|
||||
greyscale_config_worn = /datum/greyscale_config/beret/worn
|
||||
greyscale_colors = "#972A2A"
|
||||
|
||||
dog_fashion = /datum/dog_fashion/head/beret
|
||||
|
||||
@@ -84,7 +87,10 @@
|
||||
/obj/item/clothing/head/collectable/flatcap
|
||||
name = "collectable flat cap"
|
||||
desc = "A collectible farmer's flat cap!"
|
||||
icon_state = "flat_cap"
|
||||
icon_state = "beret_flat"
|
||||
greyscale_config = /datum/greyscale_config/beret
|
||||
greyscale_config_worn = /datum/greyscale_config/beret/worn
|
||||
greyscale_colors = "#8F7654"
|
||||
inhand_icon_state = "detective"
|
||||
|
||||
/obj/item/clothing/head/collectable/pirate
|
||||
|
||||
@@ -58,6 +58,13 @@
|
||||
|
||||
dog_fashion = null
|
||||
|
||||
/obj/item/clothing/head/caphat/beret
|
||||
name = "captain's beret"
|
||||
desc = "For the Captains known for their sense of fashion."
|
||||
icon_state = "beret_badge"
|
||||
greyscale_config = /datum/greyscale_config/beret_badge
|
||||
greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
|
||||
greyscale_colors = "#0070B7#FFCE5B"
|
||||
|
||||
//Head of Personnel
|
||||
/obj/item/clothing/head/hopcap
|
||||
@@ -112,43 +119,18 @@
|
||||
|
||||
|
||||
//Mime
|
||||
|
||||
/obj/item/clothing/head/beret
|
||||
name = "beret"
|
||||
desc = "A beret, a mime's favorite headwear."
|
||||
icon_state = "beret"
|
||||
dog_fashion = /datum/dog_fashion/head/beret
|
||||
dynamic_hair_suffix = ""
|
||||
greyscale_config = /datum/greyscale_config/beret
|
||||
greyscale_config_worn = /datum/greyscale_config/beret/worn
|
||||
greyscale_colors = "#972A2A"
|
||||
flags_1 = IS_PLAYER_COLORABLE_1
|
||||
|
||||
/obj/item/clothing/head/beret/vintage
|
||||
name = "vintage beret"
|
||||
desc = "A well-worn beret."
|
||||
icon_state = "vintageberet"
|
||||
dog_fashion = null
|
||||
|
||||
/obj/item/clothing/head/beret/archaic
|
||||
name = "archaic beret"
|
||||
desc = "An absolutely ancient beret, allegedly worn by the first mime to ever step foot on a Nanotrasen station."
|
||||
icon_state = "archaicberet"
|
||||
dog_fashion = null
|
||||
|
||||
/obj/item/clothing/head/beret/black
|
||||
name = "black beret"
|
||||
desc = "A black beret, perfect for war veterans and dark, brooding, anti-hero mimes."
|
||||
icon_state = "beretblack"
|
||||
|
||||
/obj/item/clothing/head/beret/highlander
|
||||
desc = "That was white fabric. <i>Was.</i>"
|
||||
dog_fashion = null //THIS IS FOR SLAUGHTER, NOT PUPPIES
|
||||
|
||||
/obj/item/clothing/head/beret/highlander/Initialize()
|
||||
. = ..()
|
||||
ADD_TRAIT(src, TRAIT_NODROP, HIGHLANDER)
|
||||
|
||||
/obj/item/clothing/head/beret/durathread
|
||||
name = "durathread beret"
|
||||
desc = "A beret made from durathread, its resilient fibres provide some protection to the wearer."
|
||||
icon_state = "beretdurathread"
|
||||
armor = list(MELEE = 15, BULLET = 5, LASER = 15, ENERGY = 25, BOMB = 10, BIO = 0, RAD = 0, FIRE = 30, ACID = 5, WOUND = 4)
|
||||
|
||||
//Security
|
||||
|
||||
@@ -167,7 +149,15 @@
|
||||
/obj/item/clothing/head/hos/beret
|
||||
name = "head of security beret"
|
||||
desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection."
|
||||
icon_state = "hosberetblack"
|
||||
icon_state = "beret_badge"
|
||||
greyscale_config = /datum/greyscale_config/beret_badge
|
||||
greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
|
||||
greyscale_colors = "#3F3C40#FFCE5B"
|
||||
|
||||
/obj/item/clothing/head/hos/beret/navyhos
|
||||
name = "head of security's beret"
|
||||
desc = "A special beret with the Head of Security's insignia emblazoned on it. A symbol of excellence, a badge of courage, a mark of distinction."
|
||||
greyscale_colors = "#3C485A#FFCE5B"
|
||||
|
||||
/obj/item/clothing/head/hos/beret/syndicate
|
||||
name = "syndicate beret"
|
||||
@@ -254,39 +244,130 @@
|
||||
name = "security beret"
|
||||
desc = "A robust beret with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
|
||||
icon_state = "beret_badge"
|
||||
greyscale_config = /datum/greyscale_config/beret_badge
|
||||
greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
|
||||
greyscale_colors = "#972A2A#F2F2F2"
|
||||
armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, RAD = 0, FIRE = 20, ACID = 50, WOUND = 4)
|
||||
strip_delay = 60
|
||||
dog_fashion = null
|
||||
flags_1 = NONE
|
||||
|
||||
/obj/item/clothing/head/beret/sec/navyhos
|
||||
name = "head of security's beret"
|
||||
desc = "A special beret with the Head of Security's insignia emblazoned on it. A symbol of excellence, a badge of courage, a mark of distinction."
|
||||
icon_state = "hosberet"
|
||||
|
||||
/obj/item/clothing/head/beret/sec/navywarden
|
||||
name = "warden's beret"
|
||||
desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
|
||||
icon_state = "wardenberet"
|
||||
greyscale_colors = "#3C485A#00AEEF"
|
||||
armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, RAD = 0, FIRE = 30, ACID = 50, WOUND = 6)
|
||||
strip_delay = 60
|
||||
|
||||
/obj/item/clothing/head/beret/sec/navyofficer
|
||||
desc = "A special beret with the security insignia emblazoned on it. For officers with class."
|
||||
icon_state = "officerberet"
|
||||
greyscale_colors = "#3C485A#FF0000"
|
||||
|
||||
|
||||
//Science
|
||||
|
||||
/obj/item/clothing/head/beret/science
|
||||
name = "science beret"
|
||||
desc = "A science-themed beret for our hardworking scientists."
|
||||
icon_state = "sciberet"
|
||||
greyscale_colors = "#8D008F"
|
||||
flags_1 = NONE
|
||||
|
||||
/obj/item/clothing/head/beret/science/fancy
|
||||
desc = "A science-themed beret for our hardworking scientists. This one comes with a fancy badge!"
|
||||
icon_state = "beret_badge"
|
||||
greyscale_config = /datum/greyscale_config/beret_badge
|
||||
greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
|
||||
greyscale_colors = "#8D008F#FFFFFF"
|
||||
|
||||
|
||||
//Medical
|
||||
|
||||
/obj/item/clothing/head/beret/medical
|
||||
name = "medical beret"
|
||||
desc = "A medical-flavored beret for the doctor in you!"
|
||||
greyscale_colors = "#FFFFFF"
|
||||
flags_1 = NONE
|
||||
|
||||
/obj/item/clothing/head/beret/medical/paramedic
|
||||
name = "paramedic beret"
|
||||
desc = "For finding corpses in style!"
|
||||
greyscale_colors = "#16313D"
|
||||
|
||||
|
||||
//Engineering
|
||||
|
||||
/obj/item/clothing/head/beret/engi
|
||||
name = "engineering beret"
|
||||
desc = "Might not protect you from radiation, but definitely will protect you from looking unfashionable!"
|
||||
greyscale_colors = "#FFBC30"
|
||||
flags_1 = NONE
|
||||
|
||||
/obj/item/clothing/head/beret/atmos
|
||||
name = "atmospheric beret"
|
||||
desc = "While \"pipes\" and \"style\" might not rhyme, this beret sure makes you feel like they should!"
|
||||
greyscale_colors = "#FFDE15"
|
||||
flags_1 = NONE
|
||||
|
||||
|
||||
//Cargo
|
||||
|
||||
/obj/item/clothing/head/beret/cargo
|
||||
name = "cargo beret"
|
||||
desc = "No need to compensate when you can wear this beret!"
|
||||
greyscale_colors = "#ECCA30"
|
||||
flags_1 = NONE
|
||||
|
||||
|
||||
//Curator
|
||||
|
||||
/obj/item/clothing/head/fedora/curator
|
||||
name = "treasure hunter's fedora"
|
||||
desc = "You got red text today kid, but it doesn't mean you have to like it."
|
||||
icon_state = "curator"
|
||||
|
||||
|
||||
//Miscellaneous
|
||||
|
||||
/obj/item/clothing/head/beret/black
|
||||
name = "black beret"
|
||||
desc = "A black beret, perfect for war veterans and dark, brooding, anti-hero mimes."
|
||||
icon_state = "beret"
|
||||
greyscale_config = /datum/greyscale_config/beret
|
||||
greyscale_config_worn = /datum/greyscale_config/beret/worn
|
||||
greyscale_colors = "#3f3c40"
|
||||
|
||||
/obj/item/clothing/head/beret/durathread
|
||||
name = "durathread beret"
|
||||
desc = "A beret made from durathread, its resilient fibres provide some protection to the wearer."
|
||||
icon_state = "beret_badge"
|
||||
greyscale_config = /datum/greyscale_config/beret_badge
|
||||
greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
|
||||
greyscale_colors = "#C5D4F3#ECF1F8"
|
||||
armor = list(MELEE = 15, BULLET = 5, LASER = 15, ENERGY = 25, BOMB = 10, BIO = 0, RAD = 0, FIRE = 30, ACID = 5, WOUND = 4)
|
||||
|
||||
/obj/item/clothing/head/beret/highlander
|
||||
desc = "That was white fabric. <i>Was.</i>"
|
||||
dog_fashion = null //THIS IS FOR SLAUGHTER, NOT PUPPIES
|
||||
|
||||
/obj/item/clothing/head/beret/highlander/Initialize()
|
||||
. = ..()
|
||||
ADD_TRAIT(src, TRAIT_NODROP, HIGHLANDER)
|
||||
|
||||
|
||||
//CentCom
|
||||
|
||||
/obj/item/clothing/head/beret/centcom_formal
|
||||
name = "\improper CentCom Formal Beret"
|
||||
desc = "Sometimes, a compromise between fashion and defense needs to be made. Thanks to Central Command's most recent nano-fabric durability enhancements, this time, it's not the case."
|
||||
icon_state = "beret_badge"
|
||||
greyscale_config = /datum/greyscale_config/beret_badge
|
||||
greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
|
||||
greyscale_colors = "#397F3F#FFCE5B"
|
||||
armor = list(MELEE = 80, BULLET = 80, LASER = 50, ENERGY = 50, BOMB = 100, BIO = 100, RAD = 90, FIRE = 100, ACID = 90, WOUND = 10)
|
||||
strip_delay = 10 SECONDS
|
||||
|
||||
|
||||
#undef DRILL_DEFAULT
|
||||
#undef DRILL_SHOUTING
|
||||
#undef DRILL_YELLING
|
||||
|
||||
@@ -300,6 +300,7 @@
|
||||
flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
|
||||
dog_fashion = null
|
||||
greyscale_colors = "#13d968#ffffff"
|
||||
flags_1 = IS_PLAYER_COLORABLE_1
|
||||
|
||||
/obj/item/clothing/head/sombrero/shamebrero
|
||||
name = "shamebrero"
|
||||
@@ -308,6 +309,7 @@
|
||||
desc = "Once it's on, it never comes off."
|
||||
dog_fashion = null
|
||||
greyscale_colors = "#d565d3#f8db18"
|
||||
flags_1 = IS_PLAYER_COLORABLE_1
|
||||
|
||||
/obj/item/clothing/head/sombrero/shamebrero/Initialize()
|
||||
. = ..()
|
||||
@@ -316,7 +318,10 @@
|
||||
/obj/item/clothing/head/flatcap
|
||||
name = "flat cap"
|
||||
desc = "A working man's cap."
|
||||
icon_state = "flat_cap"
|
||||
icon_state = "beret_flat"
|
||||
greyscale_config = /datum/greyscale_config/beret
|
||||
greyscale_config_worn = /datum/greyscale_config/beret/worn
|
||||
greyscale_colors = "#8F7654"
|
||||
inhand_icon_state = "detective"
|
||||
|
||||
/obj/item/clothing/head/hunter
|
||||
@@ -435,6 +440,9 @@
|
||||
name = "french beret"
|
||||
desc = "A quality beret, infused with the aroma of chain-smoking, wine-swilling Parisians. You feel less inclined to engage in military conflict, for some reason."
|
||||
icon_state = "beret"
|
||||
greyscale_config = /datum/greyscale_config/beret
|
||||
greyscale_config_worn = /datum/greyscale_config/beret/worn
|
||||
greyscale_colors = "#972A2A"
|
||||
dynamic_hair_suffix = ""
|
||||
|
||||
/obj/item/clothing/head/frenchberet/equipped(mob/M, slot)
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
greyscale_colors = "#545454#ffffff"
|
||||
greyscale_config = /datum/greyscale_config/sneakers
|
||||
greyscale_config_worn = /datum/greyscale_config/sneakers_worn
|
||||
greyscale_config_worn_digi = /datum/greyscale_config/sneakers_worn_digi
|
||||
greyscale_config_worn_digi = /datum/greyscale_config/sneakers_worn_digi //SKYRAT EDIT ADDITION
|
||||
flags_1 = IS_PLAYER_COLORABLE_1
|
||||
|
||||
/obj/item/clothing/shoes/sneakers/black
|
||||
name = "black shoes"
|
||||
@@ -59,13 +60,15 @@
|
||||
greyscale_config_inhand_left = null
|
||||
greyscale_config_inhand_right = null
|
||||
greyscale_config_worn = null
|
||||
flags_1 = NONE
|
||||
|
||||
/obj/item/clothing/shoes/sneakers/orange
|
||||
name = "orange shoes"
|
||||
greyscale_colors = "#eb7016#ffffff"
|
||||
greyscale_config = /datum/greyscale_config/sneakers_orange
|
||||
greyscale_config_worn = /datum/greyscale_config/sneakers_orange_worn
|
||||
greyscale_config_worn_digi = /datum/greyscale_config/sneakers_orange_worn_digi
|
||||
greyscale_config_worn_digi = /datum/greyscale_config/sneakers_orange_worn_digi //SKYRAT EDIT ADDITION
|
||||
flags_1 = NONE
|
||||
|
||||
/obj/item/clothing/shoes/sneakers/orange/attack_self(mob/user)
|
||||
if (chained)
|
||||
|
||||
@@ -60,6 +60,7 @@ Contains:
|
||||
name = "officer's beret"
|
||||
desc = "An armored beret commonly used by special operations officers. Uses advanced force field technology to protect the head from space."
|
||||
icon_state = "beret_badge"
|
||||
greyscale_colors = "#972A2A#F2F2F2"
|
||||
dynamic_hair_suffix = "+generic"
|
||||
dynamic_fhair_suffix = "+generic"
|
||||
flags_inv = 0
|
||||
|
||||
@@ -130,6 +130,7 @@
|
||||
greyscale_config = /datum/greyscale_config/suspenders
|
||||
greyscale_config_worn = /datum/greyscale_config/suspenders/worn
|
||||
greyscale_colors = "#ff0000"
|
||||
flags_1 = IS_PLAYER_COLORABLE_1
|
||||
|
||||
//Security
|
||||
/obj/item/clothing/suit/security/officer
|
||||
|
||||
@@ -427,6 +427,7 @@
|
||||
greyscale_config = /datum/greyscale_config/winter_coats
|
||||
greyscale_config_worn = /datum/greyscale_config/winter_coats/worn
|
||||
hoodtype = /obj/item/clothing/head/hooded/winterhood/custom
|
||||
flags_1 = IS_PLAYER_COLORABLE_1
|
||||
|
||||
/obj/item/clothing/suit/hooded/wintercoat/custom/MakeHood()
|
||||
. = ..()
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
inhand_icon_state = "jumpsuit"
|
||||
worn_icon_state = "jumpsuit"
|
||||
worn_icon = 'icons/mob/clothing/under/color.dmi'
|
||||
flags_1 = IS_PLAYER_COLORABLE_1
|
||||
|
||||
/obj/item/clothing/under/color/jumpskirt
|
||||
body_parts_covered = CHEST|GROIN|ARMS
|
||||
@@ -205,6 +206,7 @@
|
||||
greyscale_config_inhand_right = null
|
||||
greyscale_config_worn = null
|
||||
can_adjust = FALSE
|
||||
flags_1 = NONE
|
||||
|
||||
/obj/item/clothing/under/color/jumpskirt/rainbow
|
||||
name = "rainbow jumpskirt"
|
||||
@@ -216,3 +218,4 @@
|
||||
greyscale_config_inhand_right = null
|
||||
greyscale_config_worn = null
|
||||
can_adjust = FALSE
|
||||
flags_1 = NONE
|
||||
|
||||
@@ -323,7 +323,7 @@ GLOBAL_LIST_EMPTY(vending_products)
|
||||
R.custom_price = round(initial(temp.custom_price) * SSeconomy.inflation_value())
|
||||
R.custom_premium_price = round(initial(temp.custom_premium_price) * SSeconomy.inflation_value())
|
||||
R.age_restricted = initial(temp.age_restricted)
|
||||
R.colorable = !!(initial(temp.greyscale_config) && initial(temp.greyscale_colors))
|
||||
R.colorable = !!(initial(temp.greyscale_config) && initial(temp.greyscale_colors) && (initial(temp.flags_1) & IS_PLAYER_COLORABLE_1))
|
||||
recordlist += R
|
||||
|
||||
/**
|
||||
|
||||
@@ -31,9 +31,7 @@
|
||||
/obj/item/clothing/under/suit/black = 1,
|
||||
/obj/item/clothing/head/that = 1,
|
||||
/obj/item/clothing/under/costume/kilt = 1,
|
||||
/obj/item/clothing/head/beret = 1,
|
||||
/obj/item/clothing/head/beret/vintage = 1,
|
||||
/obj/item/clothing/head/beret/archaic = 1,
|
||||
/obj/item/clothing/head/beret = 3,
|
||||
/obj/item/clothing/accessory/waistcoat = 1,
|
||||
/obj/item/clothing/glasses/monocle =1,
|
||||
/obj/item/clothing/head/bowler = 1,
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
/obj/item/clothing/head/beanie/stripedblue = 3,
|
||||
/obj/item/clothing/head/beanie/stripedgreen = 3,
|
||||
/obj/item/clothing/head/beanie/rasta = 3,
|
||||
/obj/item/clothing/head/beret/black = 3,
|
||||
/obj/item/clothing/head/kippah = 3,
|
||||
/obj/item/clothing/head/taqiyahred = 3,
|
||||
/obj/item/clothing/gloves/fingerless = 2,
|
||||
|
||||
@@ -59,6 +59,7 @@
|
||||
/obj/item/clothing/under/rank/medical/paramedic/skirt = 4,
|
||||
/obj/item/clothing/under/rank/medical/doctor/nurse = 4,
|
||||
/obj/item/clothing/head/nursehat = 4,
|
||||
/obj/item/clothing/head/beret/medical = 4,
|
||||
/obj/item/clothing/under/rank/medical/doctor/skirt= 4,
|
||||
/obj/item/clothing/under/rank/medical/doctor/blue = 4,
|
||||
/obj/item/clothing/under/rank/medical/doctor/green = 4,
|
||||
@@ -74,6 +75,7 @@
|
||||
/obj/item/clothing/suit/toggle/labcoat = 4,
|
||||
/obj/item/clothing/suit/toggle/labcoat/paramedic = 4,
|
||||
/obj/item/clothing/shoes/sneakers/white = 4,
|
||||
/obj/item/clothing/head/beret/medical/paramedic = 4,
|
||||
/obj/item/clothing/head/soft/paramedic = 4,
|
||||
/obj/item/clothing/head/beret/job/med = 4, //SKYRAT EDIT ADDITION
|
||||
/obj/item/clothing/suit/apron/surgical = 4,
|
||||
@@ -109,7 +111,7 @@
|
||||
/obj/item/clothing/under/utility/haz_green = 3, //SKYRAT EDIT ADDITION
|
||||
/obj/item/clothing/suit/hazardvest = 3,
|
||||
/obj/item/clothing/shoes/workboots = 3,
|
||||
/obj/item/clothing/head/beret/job/engi = 3, //SKYRAT EDIT ADDITION
|
||||
/obj/item/clothing/head/beret/engi = 3,
|
||||
/obj/item/clothing/head/hardhat = 3,
|
||||
/obj/item/clothing/head/hardhat/weldhat = 3,
|
||||
/obj/item/clothing/head/hardhat/orange = 3, //SKYRAT EDIT ADDITION START
|
||||
@@ -138,9 +140,7 @@
|
||||
/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3,
|
||||
/obj/item/clothing/under/rank/engineering/atmospheric_technician = 3,
|
||||
/obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 3,
|
||||
/obj/item/clothing/under/utility/eng = 3, //SKYRAT EDIT ADDITION
|
||||
/obj/item/clothing/shoes/sneakers/black = 3,
|
||||
/obj/item/clothing/head/beret/job/atmos = 3, //SKYRAT EDIT ADDITION
|
||||
/obj/item/clothing/head/beret/atmos = 3,
|
||||
/obj/item/clothing/shoes/sneakers/black = 3)
|
||||
refill_canister = /obj/item/vending_refill/wardrobe/atmos_wardrobe
|
||||
payment_department = ACCOUNT_ENG
|
||||
@@ -169,6 +169,7 @@
|
||||
/obj/item/clothing/suit/toggle/jacket/supply = 3, //SKYRAT EDIT ADDITION END
|
||||
/obj/item/clothing/shoes/sneakers/black = 3,
|
||||
/obj/item/clothing/gloves/fingerless = 3,
|
||||
/obj/item/clothing/head/beret/cargo = 3,
|
||||
/obj/item/clothing/head/soft = 3,
|
||||
/obj/item/radio/headset/headset_cargo = 3)
|
||||
contraband = list(/obj/item/clothing/under/suit/white/scarface = 2, //SKYRAT EDIT
|
||||
@@ -221,7 +222,7 @@
|
||||
/obj/item/storage/backpack/satchel/tox = 3,
|
||||
/obj/item/storage/backpack/duffelbag/toxins = 3,
|
||||
/obj/item/clothing/head/beret/science = 3,
|
||||
/obj/item/clothing/head/beret/job/sci = 3, //SKYRAT EDIT ADDITION (alt-sprite)
|
||||
/obj/item/clothing/head/beret/science/fancy = 3,
|
||||
/obj/item/clothing/suit/hooded/wintercoat/science = 3,
|
||||
/obj/item/clothing/under/rank/rnd/scientist = 3,
|
||||
/obj/item/clothing/under/rank/rnd/scientist/skirt = 3,
|
||||
@@ -469,6 +470,7 @@
|
||||
vend_reply = "Thank you for using the ChemDrobe!"
|
||||
products = list(/obj/item/clothing/under/rank/medical/chemist = 2,
|
||||
/obj/item/clothing/under/rank/medical/chemist/skirt = 2,
|
||||
/obj/item/clothing/head/beret/medical = 2,
|
||||
/obj/item/clothing/shoes/sneakers/white = 2,
|
||||
/obj/item/clothing/suit/toggle/labcoat/chemist = 2,
|
||||
/obj/item/clothing/head/beret/job/med/chem = 2, //SKYRAT EDIT ADDITION
|
||||
@@ -513,6 +515,7 @@
|
||||
vend_reply = "Thank you for using the ViroDrobe"
|
||||
products = list(/obj/item/clothing/under/rank/medical/virologist = 2,
|
||||
/obj/item/clothing/under/rank/medical/virologist/skirt = 2,
|
||||
/obj/item/clothing/head/beret/medical = 2,
|
||||
/obj/item/clothing/shoes/sneakers/white = 2,
|
||||
/obj/item/clothing/suit/toggle/labcoat/virologist = 2,
|
||||
/obj/item/clothing/head/beret/job/med/viro = 2, //SKYRAT EDIT ADDITION
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 200 KiB After Width: | Height: | Size: 199 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 98 KiB After Width: | Height: | Size: 97 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 485 B |
Regular → Executable
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
@@ -255,7 +255,7 @@
|
||||
|
||||
/datum/loadout_item/head/job/hos/imperial
|
||||
name = "Head of security's navyblue beret"
|
||||
path = /obj/item/clothing/head/beret/sec/navyhos
|
||||
path = /obj/item/clothing/head/hos/beret/navyhos
|
||||
restricted_roles = list("Head of Security")
|
||||
|
||||
/datum/loadout_item/head/job/navybluehosberet
|
||||
|
||||
Reference in New Issue
Block a user