cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 11:07:12 +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 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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/sheet_types.dm
+1 -1
View File
@@ -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,
code/game/objects/items/weapons/storage/garment.dm
+5 -5
View File
@@ -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)
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+2 -2
View File
@@ -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)
code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
+1 -1
View File
@@ -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
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+3 -3
View File
@@ -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))