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

[MODULAR][READY]Soft-Reverts 18747 (#18821)

Browse Source 
* Soft-Reverts 18747

* Update modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
This commit is contained in:
Cursor
2023-01-21 16:41:01 -05:00
committed by GitHub
co-authored by Tom
parent 46adb94ee3
commit 716c372f44
5 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/modules/customization/modules/clothing/head/jobs.dm
+8
View File
@@ -77,6 +77,14 @@
greyscale_colors = "#FFBC30#EFEFEF"
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!"
icon_state = "beret_badge"
greyscale_config = /datum/greyscale_config/beret_badge
greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
greyscale_colors = "#FFDE15#00A5FF"
flags_1 = NONE
// From this point forth will be berets that are made especially for Skyrat. Those are loosely based off of the ones that were ported initially, but they might not be 1:1
modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm
+8
View File
@@ -544,6 +544,14 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
* JOB BERETS
*/
/datum/loadout_item/head/atmos_beret
name = "Atmospherics Beret"
item_path = /obj/item/clothing/head/beret/atmos
restricted_roles = list(
JOB_ATMOSPHERIC_TECHNICIAN,
JOB_CHIEF_ENGINEER,
)
/datum/loadout_item/head/engi_beret
name = "Engineering Beret"
item_path = /obj/item/clothing/head/beret/engi
modular_skyrat/modules/modular_vending/code/wardrobes.dm
+1
View File
@@ -29,6 +29,7 @@
/obj/machinery/vending/wardrobe/atmos_wardrobe
skyrat_products = list(
/obj/item/clothing/glasses/meson/engine = 2,
/obj/item/clothing/head/beret/atmos = 4,
)
/obj/machinery/vending/wardrobe/cargo_wardrobe
modular_skyrat/modules/teshari/code/teshari_clothes.dm
+3
View File
@@ -110,6 +110,9 @@
/obj/item/clothing/head/beret/engi
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
/obj/item/clothing/head/beret/atmos
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
/obj/item/clothing/head/beret/cargo/qm
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
modular_skyrat/modules/vox_sprites/code/head.dm
+3
View File
@@ -43,6 +43,9 @@
/obj/item/clothing/head/beret/engi
greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox
/obj/item/clothing/head/beret/atmos
greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox
/obj/item/clothing/head/beret/cargo/qm
greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox