cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MDB Ignore]Hats DMI split (#70060)

Browse Source 
Splits head dmi into separate files for both mob and obj icons. Kept similar to suit split categorization + some more. New files include beanie, bio, chaplain, costume, cowboy, default, hats(softcaps, fedoras, head caps, generic hats), helmet(helmets and other armored headgear/hoods), spacehelm, utility(hardhats, mostly work related hats), wizard.
Moves animal/pet head sitting icons to 1 folder, pets_head.dmi
Renames PAI head sitting icon file to pai_head.dmi
This commit is contained in:
Twaticus
2022-10-06 21:37:06 -07:00
committed by GitHub
parent 81f03f2cba
commit c7dde06668
235 changed files with 1041 additions and 841 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/gimmick.dm
+1 -1
View File
@@ -28,7 +28,7 @@
/obj/structure/closet/gimmick/russian/PopulateContents()
..()
for(var/i in 1 to 5)
new /obj/item/clothing/head/ushanka(src)
new /obj/item/clothing/head/costume/ushanka(src)
for(var/i in 1 to 5)
new /obj/item/clothing/under/costume/soviet(src)
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+5 -5
View File
@@ -8,7 +8,7 @@
/obj/structure/closet/gmcloset/PopulateContents()
..()
var/static/items_inside = list(
/obj/item/clothing/head/that = 2,
/obj/item/clothing/head/hats/tophat = 2,
/obj/item/radio/headset/headset_srv = 2,
/obj/item/clothing/under/suit/sl = 2,
/obj/item/clothing/under/rank/civilian/bartender = 2,
@@ -41,7 +41,7 @@
/obj/item/circuitboard/machine/dish_drive = 1,
/obj/item/clothing/suit/toggle/chef = 1,
/obj/item/clothing/under/rank/civilian/chef = 1,
/obj/item/clothing/head/chefhat = 1,
/obj/item/clothing/head/utility/chefhat = 1,
/obj/item/reagent_containers/cup/rag = 1)
generate_items_inside(items_inside,src)
@@ -104,7 +104,7 @@
new /obj/item/clothing/under/rank/civilian/chaplain(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/suit/chaplainsuit/nun(src)
new /obj/item/clothing/head/nun_hood(src)
new /obj/item/clothing/head/chaplain/nun_hood(src)
new /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit(src)
new /obj/item/clothing/suit/chaplainsuit/holidaypriest(src)
new /obj/item/storage/backpack/cultpack(src)
@@ -175,7 +175,7 @@
/obj/item/clothing/under/rank/engineering/engineer = 3,
/obj/item/clothing/suit/hazardvest = 3,
/obj/item/clothing/shoes/workboots = 3,
/obj/item/clothing/head/hardhat = 3)
/obj/item/clothing/head/utility/hardhat = 3)
generate_items_inside(items_inside,src)
return
@@ -189,7 +189,7 @@
/obj/item/storage/backpack/medic = 1,
/obj/item/storage/backpack/satchel/med = 1,
/obj/item/clothing/suit/hooded/wintercoat/medical = 1,
/obj/item/clothing/head/nursehat = 1,
/obj/item/clothing/head/costume/nursehat = 1,
/obj/item/clothing/under/rank/medical/scrubs/blue = 1,
/obj/item/clothing/under/rank/medical/scrubs/green = 1,
/obj/item/clothing/under/rank/medical/scrubs/purple = 1,
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+2 -2
View File
@@ -50,7 +50,7 @@
/obj/structure/closet/secure_closet/engineering_welding/PopulateContents()
..()
for(var/i in 1 to 3)
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/head/utility/welding(src)
for(var/i in 1 to 3)
new /obj/item/weldingtool(src)
@@ -86,6 +86,6 @@
new /obj/item/watertank/atmos(src)
new /obj/item/clothing/suit/utility/fire/atmos(src)
new /obj/item/clothing/mask/gas/atmos(src)
new /obj/item/clothing/head/hardhat/atmos(src)
new /obj/item/clothing/head/utility/hardhat/atmos(src)
new /obj/item/clothing/glasses/meson/engine/tray(src)
new /obj/item/extinguisher/advanced(src)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+3 -3
View File
@@ -81,8 +81,8 @@
..()
new /obj/item/radio/headset/headset_sec(src)
new /obj/item/clothing/suit/armor/vest/warden(src)
new /obj/item/clothing/head/warden(src)
new /obj/item/clothing/head/warden/drill(src)
new /obj/item/clothing/head/hats/warden(src)
new /obj/item/clothing/head/hats/warden/drill(src)
new /obj/item/clothing/head/beret/sec/navywarden(src)
new /obj/item/clothing/suit/armor/vest/warden/alt(src)
new /obj/item/clothing/under/rank/security/warden/formal(src)
@@ -251,7 +251,7 @@
new /obj/item/paper/fluff/jobs/security/court_judgement (src)
new /obj/item/pen (src)
new /obj/item/clothing/suit/costume/judgerobe (src)
new /obj/item/clothing/head/powdered_wig (src)
new /obj/item/clothing/head/costume/powdered_wig (src)
new /obj/item/storage/briefcase(src)
/obj/structure/closet/secure_closet/contraband/armory
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+7 -7
View File
@@ -71,7 +71,7 @@
new /obj/item/clothing/mask/gas(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/extinguisher(src)
new /obj/item/clothing/head/hardhat/red(src)
new /obj/item/clothing/head/utility/hardhat/red(src)
new /obj/item/crowbar/large/emergency(src)
/obj/structure/closet/firecloset/full/PopulateContents()
@@ -80,7 +80,7 @@
new /obj/item/flashlight(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/extinguisher(src)
new /obj/item/clothing/head/hardhat/red(src)
new /obj/item/clothing/head/utility/hardhat/red(src)
new /obj/item/crowbar/large/emergency(src)
/*
@@ -123,7 +123,7 @@
if(prob(5))
new /obj/item/clothing/gloves/color/yellow(src)
if(prob(40))
new /obj/item/clothing/head/hardhat(src)
new /obj/item/clothing/head/utility/hardhat(src)
/*
@@ -139,7 +139,7 @@
..()
new /obj/item/geiger_counter(src)
new /obj/item/clothing/suit/utility/radiation(src)
new /obj/item/clothing/head/radiation(src)
new /obj/item/clothing/head/utility/radiation(src)
/*
* Bombsuit closet
@@ -154,19 +154,19 @@
new /obj/item/clothing/suit/utility/bomb_suit(src)
new /obj/item/clothing/under/color/black(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/head/bomb_hood(src)
new /obj/item/clothing/head/utility/bomb_hood(src)
/obj/structure/closet/bombcloset/security/PopulateContents()
new /obj/item/clothing/suit/utility/bomb_suit/security(src)
new /obj/item/clothing/under/rank/security/officer(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/head/bomb_hood/security(src)
new /obj/item/clothing/head/utility/bomb_hood/security(src)
/obj/structure/closet/bombcloset/white/PopulateContents()
new /obj/item/clothing/suit/utility/bomb_suit/white(src)
new /obj/item/clothing/under/color/black(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/head/bomb_hood/white(src)
new /obj/item/clothing/head/utility/bomb_hood/white(src)
/*
* Ammunition
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+5 -5
View File
@@ -42,7 +42,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/black(src)
for(var/i in 1 to 3)
new /obj/item/clothing/head/that(src)
new /obj/item/clothing/head/hats/tophat(src)
for(var/i in 1 to 3)
new /obj/item/clothing/head/soft/black(src)
new /obj/item/clothing/mask/bandana/black(src)
@@ -123,12 +123,12 @@
/obj/structure/closet/wardrobe/pjs/PopulateContents()
new /obj/item/clothing/under/misc/pj/red(src)
new /obj/item/clothing/under/misc/pj/red(src)
new /obj/item/clothing/head/nightcap/red(src)
new /obj/item/clothing/head/nightcap/red(src)
new /obj/item/clothing/head/costume/nightcap/red(src)
new /obj/item/clothing/head/costume/nightcap/red(src)
new /obj/item/clothing/under/misc/pj/blue(src)
new /obj/item/clothing/under/misc/pj/blue(src)
new /obj/item/clothing/head/nightcap/blue(src)
new /obj/item/clothing/head/nightcap/blue(src)
new /obj/item/clothing/head/costume/nightcap/blue(src)
new /obj/item/clothing/head/costume/nightcap/blue(src)
for(var/i in 1 to 4)
new /obj/item/clothing/shoes/sneakers/white(src)
return