cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Beret + softcap .dmi split (#25314)

Browse Source 
* 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 12:37:44 +01:00
committed by GitHub
parent 15e7fcdb3f
commit d587effe2c
37 changed files with 250 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/character.dm
+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)
code/modules/client/preference/loadout/loadout_hat.dm
+6 -6
View File
@@ -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