Beret + softcap .dmi split (#25314)

* beret softcap dmi split

* icon rename

* dme crlf to lf

* tsf cap fixes

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>

* vox cap icon name

* remove beret subtype on fluff

* Update code/modules/clothing/head/soft_caps.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>

---------

Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
Christasmurf
2024-05-02 11:37:44 +00:00
committed by GitHub
co-authored by Henri215
parent 15e7fcdb3f
commit d587effe2c
37 changed files with 250 additions and 225 deletions
+3 -3
View File
@@ -23086,7 +23086,7 @@
/area/station/maintenance/port)
"bsg" = (
/obj/structure/table,
/obj/item/clothing/head/soft/grey{
/obj/item/clothing/head/soft{
pixel_x = -2;
pixel_y = 3
},
@@ -71294,9 +71294,9 @@
"mIA" = (
/obj/structure/table,
/obj/item/stamp/granted,
/obj/item/clothing/head/soft,
/obj/item/clothing/head/soft/cargo,
/obj/item/hand_labeler,
/obj/item/clothing/head/soft,
/obj/item/clothing/head/soft/cargo,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
+1 -1
View File
@@ -23132,7 +23132,7 @@
"cvm" = (
/obj/structure/table,
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/head/soft,
/obj/item/clothing/head/soft/cargo,
/turf/simulated/floor/plasteel{
icon_state = "darkbrown"
},
+1 -1
View File
@@ -10924,7 +10924,7 @@
/area/station/public/locker)
"aVT" = (
/obj/structure/table,
/obj/item/clothing/head/soft/grey{
/obj/item/clothing/head/soft{
pixel_x = -2;
pixel_y = 3
},
+1 -1
View File
@@ -863,7 +863,7 @@
/datum/outfit/admin/trader/sol
name = "Trans-Solar Federation Trader"
suit = /obj/item/clothing/suit/jacket/cargobomber
head = /obj/item/clothing/head/soft
head = /obj/item/clothing/head/soft/cargo
/datum/outfit/admin/trader/cyber
name = "Cybersun Industries Trader"
+4 -4
View File
@@ -554,7 +554,7 @@
/obj/item/clothing/suit/hooded/wintercoat/cargo = 3,
/obj/item/clothing/suit/jacket/cargobomber = 3,
/obj/item/clothing/suit/storage/hazardvest = 3,
/obj/item/clothing/head/soft = 3,
/obj/item/clothing/head/soft/cargo = 3,
/obj/item/clothing/head/hardhat/orange = 2,
/obj/item/clothing/gloves/fingerless = 6,
/obj/item/clothing/accessory/armband/cargo = 6,
@@ -571,7 +571,7 @@
/obj/item/clothing/suit/hooded/wintercoat/cargo = 75,
/obj/item/clothing/suit/jacket/cargobomber = 75,
/obj/item/clothing/suit/storage/hazardvest = 50,
/obj/item/clothing/head/soft = 20,
/obj/item/clothing/head/soft/cargo = 20,
/obj/item/clothing/head/hardhat/orange = 30,
/obj/item/clothing/gloves/fingerless = 20,
/obj/item/clothing/accessory/armband/cargo = 20,
@@ -597,7 +597,7 @@
/obj/item/clothing/suit/chef = 2,
/obj/item/clothing/suit/chef/classic = 2,
/obj/item/clothing/head/chefhat = 2,
/obj/item/clothing/head/soft/mime = 2,
/obj/item/clothing/head/soft/white = 2,
/obj/item/clothing/head/beret/white = 2,
/obj/item/clothing/shoes/laceup = 2,
/obj/item/clothing/shoes/white = 2,
@@ -614,7 +614,7 @@
/obj/item/clothing/suit/chef = 50,
/obj/item/clothing/suit/chef/classic = 50,
/obj/item/clothing/head/chefhat = 50,
/obj/item/clothing/head/soft/mime = 30,
/obj/item/clothing/head/soft/white = 30,
/obj/item/clothing/head/beret/white = 20,
/obj/item/clothing/shoes/laceup = 30,
/obj/item/clothing/shoes/white = 20,
@@ -320,7 +320,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list (
new /datum/stack_recipe("cloth handwraps", /obj/item/clothing/gloves/handwraps, 2),
new /datum/stack_recipe("fingerless gloves", /obj/item/clothing/gloves/fingerless, 1),
new /datum/stack_recipe("white gloves", /obj/item/clothing/gloves/color/white, 3),
new /datum/stack_recipe("white softcap", /obj/item/clothing/head/soft/mime, 2),
new /datum/stack_recipe("white softcap", /obj/item/clothing/head/soft/white, 2),
new /datum/stack_recipe("white beanie", /obj/item/clothing/head/beanie, 2),
)),
null,
@@ -30,8 +30,8 @@
/obj/item/storage/bag/garment/captain/populate_contents()
new /obj/item/clothing/head/caphat(src)
new /obj/item/clothing/head/caphat/parade(src)
new /obj/item/clothing/head/caphat/beret(src)
new /obj/item/clothing/head/caphat/beret/white(src)
new /obj/item/clothing/head/beret/captain(src)
new /obj/item/clothing/head/beret/captain/white(src)
new /obj/item/clothing/head/crown/fancy(src)
new /obj/item/clothing/suit/armor/vest/capcarapace(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/jacket(src)
@@ -53,7 +53,7 @@
/obj/item/storage/bag/garment/head_of_personnel/populate_contents()
new /obj/item/clothing/head/hop(src)
new /obj/item/clothing/head/hop/beret(src)
new /obj/item/clothing/head/beret/hop(src)
new /obj/item/clothing/suit/mantle/armor/hop(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/suit/hopcoat(src)
@@ -76,7 +76,7 @@
/obj/item/storage/bag/garment/head_of_security/populate_contents()
new /obj/item/clothing/head/HoS(src)
new /obj/item/clothing/head/HoS/beret(src)
new /obj/item/clothing/head/beret/hos(src)
new /obj/item/clothing/suit/armor/hos(src)
new /obj/item/clothing/suit/armor/hos/alt(src)
new /obj/item/clothing/suit/mantle/armor(src)
@@ -204,7 +204,7 @@
new /obj/item/clothing/under/rank/cargo/qm/whimsy(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/head/qm(src)
new /obj/item/clothing/head/qm/beret(src)
new /obj/item/clothing/head/beret/qm(src)
new /obj/item/clothing/head/hardhat/orange(src)
new /obj/item/clothing/suit/qmcoat(src)
new /obj/item/clothing/suit/mantle/qm(src)
@@ -53,8 +53,8 @@
new /obj/item/clothing/suit/chef/classic(src)
new /obj/item/clothing/suit/chef/classic(src)
new /obj/item/clothing/suit/chef/classic(src)
new /obj/item/clothing/head/soft/mime(src)
new /obj/item/clothing/head/soft/mime(src)
new /obj/item/clothing/head/soft/white(src)
new /obj/item/clothing/head/soft/white(src)
new /obj/item/storage/box/mousetraps(src)
new /obj/item/storage/box/mousetraps(src)
new /obj/item/clothing/under/rank/civilian/chef(src)
@@ -10,7 +10,7 @@
new /obj/item/clothing/shoes/black(src)
new /obj/item/radio/headset/headset_cargo(src)
new /obj/item/clothing/gloves/fingerless(src)
new /obj/item/clothing/head/soft(src)
new /obj/item/clothing/head/soft/cargo(src)
new /obj/item/storage/bag/mail(src)
/obj/structure/closet/secure_closet/quartermaster
@@ -402,9 +402,9 @@
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/head/soft/grey(src)
new /obj/item/clothing/head/soft/grey(src)
new /obj/item/clothing/head/soft/grey(src)
new /obj/item/clothing/head/soft(src)
new /obj/item/clothing/head/soft(src)
new /obj/item/clothing/head/soft(src)
if(prob(50))
new /obj/item/storage/backpack/duffel(src)
if(prob(40))
+4 -4
View File
@@ -1175,7 +1175,7 @@
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "lgloves"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "mime"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "beret"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/head/beret.dmi', "beret"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "suspenders"), ICON_OVERLAY)
has_gloves = TRUE
switch(backbag)
@@ -1324,7 +1324,7 @@
clothes_s = new /icon('icons/mob/clothing/under/medical.dmi', "paramedic_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "cigoff"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "bluesoft"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/head/softcap.dmi', "bluesoft"), ICON_OVERLAY)
switch(backbag)
if(2)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY)
@@ -1368,7 +1368,7 @@
clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_OVERLAY)
has_gloves = TRUE
if(prob(1))
clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "beret_hos"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/head/beret.dmi', "beret_hos"), ICON_OVERLAY)
switch(backbag)
if(2)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY)
@@ -1411,7 +1411,7 @@
clothes_s = new /icon('icons/mob/clothing/under/security.dmi', "security_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
if(prob(1))
clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "beret_officer"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/head/beret.dmi', "beret_officer"), ICON_OVERLAY)
switch(backbag)
if(2)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY)
@@ -114,7 +114,7 @@
/datum/gear/hat/capwhite
display_name = "Cap, white"
path = /obj/item/clothing/head/soft/mime
path = /obj/item/clothing/head/soft/white
/datum/gear/hat/caporange
display_name = "Cap, orange"
@@ -122,7 +122,7 @@
/datum/gear/hat/capgrey
display_name = "Cap, grey"
path = /obj/item/clothing/head/soft/grey
path = /obj/item/clothing/head/soft
/datum/gear/hat/capyellow
display_name = "Cap, yellow"
@@ -179,12 +179,12 @@
/datum/gear/hat/beret_job/captain
display_name = "Beret, captain's"
path = /obj/item/clothing/head/caphat/beret
path = /obj/item/clothing/head/beret/captain
allowed_roles = list("Captain")
/datum/gear/hat/beret_job/captain_white
display_name = "Beret, captain's white"
path = /obj/item/clothing/head/caphat/beret/white
path = /obj/item/clothing/head/beret/captain/white
allowed_roles = list("Captain")
/datum/gear/hat/beret_job/sec
@@ -199,12 +199,12 @@
/datum/gear/hat/beret_job/hop
display_name = "Beret, head of personnel"
path = /obj/item/clothing/head/hop/beret
path = /obj/item/clothing/head/beret/hop
allowed_roles = list("Head of Personnel")
/datum/gear/hat/beret_job/qm
display_name = "Beret, quartermaster"
path = /obj/item/clothing/head/qm/beret
path = /obj/item/clothing/head/beret/qm
allowed_roles = list("Quartermaster")
/datum/gear/hat/beret_job/sci
+175
View File
@@ -0,0 +1,175 @@
//Base items
/obj/item/clothing/head/beret
name = "beret"
desc = "A beret, an artist's favorite headwear."
icon = 'icons/obj/clothing/head/beret.dmi'
icon_state = "beret"
item_state = 'icons/mob/clothing/head/beret.dmi'
icon_override = 'icons/mob/clothing/head/beret.dmi'
dog_fashion = /datum/dog_fashion/head/beret
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi'
)
/obj/item/clothing/head/beret/blue
icon_state = "beret_blue"
/obj/item/clothing/head/beret/black
icon_state = "beret_black"
/obj/item/clothing/head/beret/white
icon_state = "beret_white"
/obj/item/clothing/head/beret/purple_normal
icon_state = "beret_purple_normal"
/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_durathread"
item_color = null
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 5, RAD = 0, FIRE = 20, ACID = 5)
//Central Command
/obj/item/clothing/head/beret/centcom/officer
name = "officer beret"
desc = "A black beret adorned with the shield—a silver kite shield with an engraved sword—of the Nanotrasen security forces, announcing to the world that the wearer is a defender of Nanotrasen."
icon_state = "beret_centcom_officer"
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 10, ACID = 50)
strip_delay = 60
/obj/item/clothing/head/beret/centcom/officer/navy
name = "navy blue officer beret"
desc = "A navy blue beret adorned with the shield—a silver kite shield with an engraved sword—of the Nanotrasen security forces, announcing to the world that the wearer is a defender of Nanotrasen."
icon_state = "beret_centcom_officer_navy"
/obj/item/clothing/head/beret/centcom/captain
name = "naval captain's beret"
desc = "A white beret adorned with the shield—a cobalt kite shield with an engraved sword—of the Nanotrasen security forces, worn only by those captaining a vessel of the Nanotrasen Navy."
icon_state = "beret_centcom_captain"
//Captain
/obj/item/clothing/head/beret/captain
name = "captain's beret"
desc = "For Captains that are more inclined towards style."
icon_state = "beret_captain"
armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50)
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/captain
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
)
/obj/item/clothing/head/beret/captain/white
name = "captain's white beret"
desc = "For Captains that are more inclined towards style, and for the color white."
icon_state = "beret_captain_white"
//Security
/obj/item/clothing/head/beret/hos
name = "head of security's beret"
desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection."
icon_state = "beret_hos_black"
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 75)
strip_delay = 80
dog_fashion = /datum/dog_fashion/head/HoS
/obj/item/clothing/head/beret/sec
name = "security beret"
desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety."
icon_state = "beret_officer"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50)
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/beret/sec
/obj/item/clothing/head/beret/sec/warden
name = "warden's beret"
desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
icon_state = "beret_warden"
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 20, ACID = 50)
//Engineering
/obj/item/clothing/head/beret/ce
name = "chief engineer's beret"
desc = "A white beret with the engineering insignia emblazoned on it. Its owner knows what they're doing. Probably."
icon_state = "beret_ce"
/obj/item/clothing/head/beret/eng
name = "engineering beret"
desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety."
icon_state = "beret_engineering"
/obj/item/clothing/head/beret/atmos
name = "atmospherics beret"
desc = "A beret for those who have shown immaculate proficienty in piping. Or plumbing."
icon_state = "beret_atmospherics"
//Science
/obj/item/clothing/head/beret/sci
name = "science beret"
desc = "A white beret with a purple science insignia emblazoned on it. It has that authentic smell of burning plasma."
icon_state = "beret_science"
/obj/item/clothing/head/beret/robowhite
name = "robotics beret"
desc = "A white beret with a brown robotics insignia emblazoned on it. It smells distinctly like oil."
icon_state = "beret_roboticswhite"
/obj/item/clothing/head/beret/roboblack
name = "bioengineer beret"
desc = "A black beret with a brown robotics insignia emblazoned on it. It smells distinctly like oil."
icon_state = "beret_roboticsblack"
//Service
/obj/item/clothing/head/beret/hop
name = "head of personnel's beret"
desc = "For doing paperwork with style."
icon_state = "beret_hop"
armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50)
dog_fashion = /datum/dog_fashion/head/hop
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
)
/obj/item/clothing/head/beret/janitor
name = "janitorial beret"
desc = "A purple beret with a mint service insignia emblazoned on it. It smells squeaky clean."
icon_state = "beret_janitor"
//Medical
/obj/item/clothing/head/beret/med
name = "medical beret"
desc = "A white beret with a green cross finely threaded into it. It has that sterile smell about it."
icon_state = "beret_med"
//Cargo
/obj/item/clothing/head/beret/qm
name = "quartermaster's beret"
desc = "A brown beret with a golden cargo insignia emblazoned on it. Rule over Cargonia in style."
icon_state = "beret_qm"
dog_fashion = /datum/dog_fashion/head/qm
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi'
)
//Special Roles
/obj/item/clothing/head/beret/solgov/command
name = "\improper Trans-Solar Federation Lieutenant's beret"
desc = "A beret worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant."
icon_state = "beret_solgovc"
item_color = "solgovc"
dog_fashion = null
armor = list(MELEE = 10, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 75)
strip_delay = 80
/obj/item/clothing/head/beret/solgov/command/elite
name = "\improper Trans-Solar Federation Specops Lieutenant's beret"
desc = "A beret worn by marines of the Trans-Solar Federation Specops division. The insignia signifies the wearer bears the rank of a Lieutenant."
armor = list(MELEE = 25, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200)
icon_state = "beret_solgovcelite"
item_color = "solgovcelite"
resistance_flags = FIRE_PROOF
@@ -63,9 +63,16 @@
/obj/item/clothing/head/collectable/beret
name = "collectable beret"
desc = "A Collectable red Beret. It smells faintly of Garlic."
icon = 'icons/obj/clothing/head/beret.dmi'
icon_state = "beret"
item_state = 'icons/mob/clothing/head/beret.dmi'
icon_override = 'icons/mob/clothing/head/beret.dmi'
dog_fashion = /datum/dog_fashion/head/beret
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi'
)
/obj/item/clothing/head/collectable/welding
name = "collectable welding helmet"
desc = "A Collectable Welding Helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this Helmet is done so at the owner's own risk!"
-132
View File
@@ -35,20 +35,6 @@
desc = "Worn only by Captains with an abundance of class."
icon_state = "captain_cap"
/obj/item/clothing/head/caphat/beret
name = "captain's beret"
desc = "For Captains that are more inclined towards style."
icon_state = "captain_beret"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
)
/obj/item/clothing/head/caphat/beret/white
name = "captain's white beret"
desc = "For Captains that are more inclined towards style, and for the color white."
icon_state = "captain_beret_white"
//Head of Personnel
/obj/item/clothing/head/hop
name = "head of personnel's cap"
@@ -62,16 +48,6 @@
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/hop/beret
name = "head of personnel's beret"
desc = "For doing paperwork with style."
icon_state = "beret_hop"
dog_fashion = /datum/dog_fashion/head/hop
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
)
//Quartermaster
/obj/item/clothing/head/qm
name = "quartermaster's cap"
@@ -84,16 +60,6 @@
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/qm/beret
name = "quartermaster's beret"
desc = "A brown beret with a golden cargo insignia emblazoned on it. Rule over Cargonia in style."
icon_state = "beret_qm"
dog_fashion = /datum/dog_fashion/head/qm
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head.dmi'
)
//Nanotrasen Representative
/obj/item/clothing/head/ntrep
name = "Nanotrasen Representative's hat"
@@ -151,24 +117,6 @@
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
//Mime
/obj/item/clothing/head/beret
name = "beret"
desc = "A beret, an artist's favorite headwear."
icon_state = "beret"
dog_fashion = /datum/dog_fashion/head/beret
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/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"
item_color = null
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 5, RAD = 0, FIRE = 20, ACID = 5)
//Security
/obj/item/clothing/head/HoS
name = "head of security's cap"
@@ -178,16 +126,6 @@
strip_delay = 80
dog_fashion = /datum/dog_fashion/head/HoS
/obj/item/clothing/head/HoS/beret
name = "head of security's beret"
desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection."
icon_state = "beret_hos_black"
dog_fashion = /datum/dog_fashion/head/HoS
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/obj/item/clothing/head/warden
name = "warden's police hat"
desc = "It's a special armored hat issued to the Warden of a security force. Protects the head from impacts."
@@ -221,61 +159,8 @@
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/obj/item/clothing/head/beret/sec
name = "security beret"
desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety."
icon_state = "beret_officer"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50)
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/beret/sec
/obj/item/clothing/head/beret/sec/warden
name = "warden's beret"
desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
icon_state = "beret_warden"
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 20, ACID = 50)
/obj/item/clothing/head/beret/eng
name = "engineering beret"
desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety."
icon_state = "beret_engineering"
/obj/item/clothing/head/beret/atmos
name = "atmospherics beret"
desc = "A beret for those who have shown immaculate proficienty in piping. Or plumbing."
icon_state = "beret_atmospherics"
/obj/item/clothing/head/beret/ce
name = "chief engineer's beret"
desc = "A white beret with the engineering insignia emblazoned on it. Its owner knows what they're doing. Probably."
icon_state = "beret_ce"
/obj/item/clothing/head/beret/sci
name = "science beret"
desc = "A white beret with a purple science insignia emblazoned on it. It has that authentic smell of burning plasma."
icon_state = "beret_science"
/obj/item/clothing/head/beret/robowhite
name = "robotics beret"
desc = "A white beret with a brown robotics insignia emblazoned on it. It smells distinctly like oil."
icon_state = "beret_roboticswhite"
/obj/item/clothing/head/beret/roboblack
name = "bioengineer beret"
desc = "A black beret with a brown robotics insignia emblazoned on it. It smells distinctly like oil."
icon_state = "beret_roboticsblack"
/obj/item/clothing/head/beret/janitor
name = "janitorial beret"
desc = "A purple beret with a mint service insignia emblazoned on it. It smells squeaky clean."
icon_state = "beret_janitor"
//Medical
/obj/item/clothing/head/beret/med
name = "medical beret"
desc = "A white beret with a green cross finely threaded into it. It has that sterile smell about it."
icon_state = "beret_med"
/obj/item/clothing/head/surgery
name = "blue surgical cap"
desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs."
@@ -310,20 +195,3 @@
icon_state = "surgcap_black"
dog_fashion = /datum/dog_fashion/head/surgery
//Special Roles
/obj/item/clothing/head/beret/solgov/command
name = "\improper Trans-Solar Federation Lieutenant's beret"
desc = "A beret worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant."
icon_state = "solgovcberet"
item_color = "solgovc"
dog_fashion = null
armor = list(MELEE = 10, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 75)
strip_delay = 80
/obj/item/clothing/head/beret/solgov/command/elite
name = "\improper Trans-Solar Federation Specops Lieutenant's beret"
desc = "A beret worn by marines of the Trans-Solar Federation Specops division. The insignia signifies the wearer bears the rank of a Lieutenant."
armor = list(MELEE = 25, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200)
icon_state = "solgovceliteberet"
item_color = "solgovcelite"
resistance_flags = FIRE_PROOF
-29
View File
@@ -27,18 +27,6 @@
item_state = "jwig"
dog_fashion = /datum/dog_fashion/head/justice_wig
/obj/item/clothing/head/beret/blue
icon_state = "beret_blue"
/obj/item/clothing/head/beret/black
icon_state = "beret_black"
/obj/item/clothing/head/beret/white
icon_state = "beret_white"
/obj/item/clothing/head/beret/purple_normal
icon_state = "beret_purple_normal"
/obj/item/clothing/head/that
name = "top-hat"
desc = "It's an amish looking hat."
@@ -424,23 +412,6 @@
icon_state = "beret_purple"
item_state = "purpleberet"
/obj/item/clothing/head/beret/centcom/officer
name = "officer beret"
desc = "A black beret adorned with the shield—a silver kite shield with an engraved sword—of the Nanotrasen security forces, announcing to the world that the wearer is a defender of Nanotrasen."
icon_state = "beret_centcom_officer"
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 10, ACID = 50)
strip_delay = 60
/obj/item/clothing/head/beret/centcom/officer/navy
name = "navy blue officer beret"
desc = "A navy blue beret adorned with the shield—a silver kite shield with an engraved sword—of the Nanotrasen security forces, announcing to the world that the wearer is a defender of Nanotrasen."
icon_state = "beret_centcom_officer_navy"
/obj/item/clothing/head/beret/centcom/captain
name = "captain's beret"
desc = "A white beret adorned with the shield—a cobalt kite shield with an engraved sword—of the Nanotrasen security forces, worn only by those captaining a vessel of the Nanotrasen Navy."
icon_state = "beret_centcom_captain"
/obj/item/clothing/head/sombrero
name = "sombrero"
icon_state = "sombrero"
+24 -23
View File
@@ -1,14 +1,16 @@
/obj/item/clothing/head/soft
name = "cargo cap"
desc = "It's a baseball hat in a tasteless yellow colour."
icon_state = "cargosoft"
item_state = "helmet"
item_color = "cargo"
name = "grey cap"
desc = "It's a baseball hat in a tasteless grey colour."
icon = 'icons/obj/clothing/head/softcap.dmi'
icon_state = "greysoft"
item_state = 'icons/mob/clothing/head/softcap.dmi'
icon_override = 'icons/mob/clothing/head/softcap.dmi'
item_color = "grey"
var/flipped = FALSE
actions_types = list(/datum/action/item_action/flip_cap)
dog_fashion = /datum/dog_fashion/head/cargo_tech
dog_fashion = /datum/dog_fashion/head/softcap
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head/softcap.dmi'
)
dyeable = TRUE
@@ -62,24 +64,17 @@
item_color = "yellow"
dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/grey
name = "grey cap"
desc = "It's a baseball hat in a tasteful grey colour."
icon_state = "greysoft"
item_color = "grey"
dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/orange
name = "orange cap"
desc = "It's a baseball hat in a tasteless orange colour."
icon_state = "orangesoft"
item_color = "orange"
/obj/item/clothing/head/soft/mime
/obj/item/clothing/head/soft/white
name = "white cap"
desc = "It's a baseball hat in a tasteless white colour."
icon_state = "mimesoft"
item_color = "mime"
icon_state = "whitesoft"
item_color = "white"
dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/purple
@@ -103,6 +98,13 @@
item_color = "rainbow"
dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/cargo
name = "cargo cap"
desc = "It's a baseball hat in a tasteless yellow colour."
icon_state = "cargosoft"
item_color = "cargo"
dog_fashion = /datum/dog_fashion/head/cargo_tech
/obj/item/clothing/head/soft/deliverysoft
name = "delivery boy cap"
desc = "It's a baseball hat that is part of the delivery boy uniform."
@@ -110,10 +112,9 @@
item_color = "delivery"
dog_fashion = /datum/dog_fashion/head/softcap
sprite_sheets = list(
"Human" = 'icons/mob/clothing/head.dmi',
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head/softcap.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/softcap.dmi',
"Grey" = 'icons/mob/clothing/species/grey/head/softcap.dmi'
)
/obj/item/clothing/head/soft/janitorgrey
@@ -177,7 +178,7 @@
/obj/item/clothing/head/soft/solgov/marines/command/elite
name = "\improper Trans-Solar Federation Specops Lieutenant's cap"
desc = "A cap worn by marines of the Trans-Solar Federation Specops division. You aren't quite sure how they made this bulletproof, but you are glad it is! The insignia signifies the wearer bears the rank of a Lieutenant."
armor= list(MELEE = 25, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200)
icon_state = "solgovcelitesoft"
armor = list(MELEE = 25, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200)
icon_state = "solgovcelitesoft_flipped"
item_color = "solgovcelite"
resistance_flags = FIRE_PROOF
@@ -70,19 +70,21 @@
/obj/item/clothing/head/helmet/space/deathsquad/beret
name = "officer beret"
desc = "An armored beret commonly used by special operations officers."
icon = 'icons/obj/clothing/head/beret.dmi'
icon_state = "beret_officer"
item_state = 'icons/mob/clothing/head/beret.dmi'
icon_override = 'icons/mob/clothing/head/beret.dmi'
flags = STOPSPRESSUREDMAGE | THICKMATERIAL
flags_inv = null
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi'
)
/obj/item/clothing/head/helmet/space/deathsquad/beret/solgov
name = "\improper Trans-Solar Federation commander's beret"
desc = "A camouflaged beret adorned with the star of the Trans-Solar Federation, worn by generals of the Trans-Solar Federation."
icon_state = "solgovceliteberet"
icon_state = "beret_solgovcelite"
/obj/item/clothing/suit/space/deathsquad/officer
name = "officer jacket"
+3 -3
View File
@@ -652,7 +652,7 @@
icon_state = "sparkyninja_beret"
/// sigholtstarsong: Sigholt Starsong
/obj/item/clothing/head/beret/fluff/sigholt
/obj/item/clothing/head/fluff/sigholt
name = "Lieutenant Starsong's beret"
desc = "This beret bears insignia of the SOLGOV Marine Corps 417th Regiment, 2nd Battalion, Bravo Company. It looks meticulously maintained."
icon_state = "beret_hos"
@@ -680,7 +680,7 @@
H.Slur(6 SECONDS) //always slur
/// Epic_Charger: Linda Clark
/obj/item/clothing/head/beret/fluff/linda
/obj/item/clothing/head/fluff/linda
name = "Green beret"
desc = "A beret, an artist's favorite headwear. This one has two holes cut on the edges."
icon = 'icons/obj/custom_items.dmi'
@@ -743,7 +743,7 @@
return 1
/// V-Force_Bomber: E.L.O.
/obj/item/clothing/head/beret/fluff/elo
/obj/item/clothing/head/fluff/elo
name = "E.L.O.'s medical beret"
desc = "E.L.O.s personal medical beret, issued by Nanotrassen and awarded along with her medal."
icon = 'icons/obj/custom_items.dmi'
+2 -2
View File
@@ -15,8 +15,8 @@
/obj/item/mimejutsu_scroll
name = "Mimejutsu 'scroll'"
desc = "Its a beret with a note stapled to it..."
icon = 'icons/obj/clothing/hats.dmi'
desc = "Its a beret with a note stapled to it..."
icon = 'icons/obj/clothing/head/beret.dmi'
icon_state = "beret"
var/used = FALSE
@@ -329,7 +329,7 @@
/obj/item/clothing/under/rank/security/warden/corporate,
/obj/item/clothing/head/beret/sec/warden,
/obj/item/clothing/under/rank/security/head_of_security/corporate,
/obj/item/clothing/head/HoS/beret)
/obj/item/clothing/head/beret/hos)
cost = 200
containername = "security clothing crate"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 KiB

After

Width:  |  Height:  |  Size: 260 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 386 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 382 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

+1
View File
@@ -1665,6 +1665,7 @@
#include "code\modules\clothing\gloves\misc_gloves.dm"
#include "code\modules\clothing\gloves\rings.dm"
#include "code\modules\clothing\head\beanie.dm"
#include "code\modules\clothing\head\beret.dm"
#include "code\modules\clothing\head\collectable.dm"
#include "code\modules\clothing\head\hardhat.dm"
#include "code\modules\clothing\head\helmet.dm"