diff --git a/aurorastation.dme b/aurorastation.dme index 836642512f1..145848c71df 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1663,6 +1663,7 @@ #include "code\modules\clothing\ears\earrings.dm" #include "code\modules\clothing\ears\skrell.dm" #include "code\modules\clothing\factions\dominia.dm" +#include "code\modules\clothing\factions\einstein.dm" #include "code\modules\clothing\factions\elyra.dm" #include "code\modules\clothing\factions\europa.dm" #include "code\modules\clothing\factions\gadpathur.dm" diff --git a/code/datums/outfits/event/outfit_megacorps.dm b/code/datums/outfits/event/outfit_megacorps.dm index 723f7fa30e9..1bbcc67a8c5 100644 --- a/code/datums/outfits/event/outfit_megacorps.dm +++ b/code/datums/outfits/event/outfit_megacorps.dm @@ -133,7 +133,7 @@ /datum/outfit/admin/megacorp/einstein_trooper/heavy name = "Einstein Engines Asset Protection" - uniform = /obj/item/clothing/under/rank/engineer/heph + uniform = /obj/item/clothing/under/rank/einstein back = /obj/item/rig/ert/assetprotection/einstein belt = /obj/item/storage/belt/security/tactical shoes = null diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index 2e06cb06b8d..d15fed95899 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -514,6 +514,11 @@ new /obj/item/clothing/suit/space/void/einstein(src) new /obj/item/clothing/suit/space/void/einstein(src) new /obj/item/clothing/suit/space/void/einstein(src) + new /obj/item/clothing/under/rank/einstein(src) + new /obj/item/clothing/under/rank/einstein(src) + new /obj/item/clothing/under/rank/einstein(src) + new /obj/item/clothing/under/rank/einstein(src) + new /obj/item/clothing/under/rank/einstein(src) new /obj/item/gun/energy/laser/shotgun(src) new /obj/item/gun/energy/rifle(src) new /obj/item/gun/energy/rifle(src) @@ -537,6 +542,7 @@ /obj/structure/closet/crate/secure/gear_loadout/einstein/single/fill() new /obj/item/clothing/head/helmet/space/void/einstein(src) new /obj/item/clothing/suit/space/void/einstein(src) + new /obj/item/clothing/under/rank/einstein(src) new /obj/item/gun/energy/rifle(src) new /obj/item/gun/projectile/pistol(src) new /obj/item/suppressor(src) diff --git a/code/modules/clothing/factions/einstein.dm b/code/modules/clothing/factions/einstein.dm new file mode 100644 index 00000000000..26746386549 --- /dev/null +++ b/code/modules/clothing/factions/einstein.dm @@ -0,0 +1,7 @@ +/obj/item/clothing/under/rank/einstein + name = "\improper Einstein Engines uniform" + desc = "A standardized uniform used by Einstein Engines personnel." + icon = 'icons/clothing/under/uniforms/einstein.dmi' + icon_state = "einstein" + item_state = "einstein" + contained_sprite = TRUE diff --git a/html/changelogs/GeneralCamo - Einstein Uniform.yml b/html/changelogs/GeneralCamo - Einstein Uniform.yml new file mode 100644 index 00000000000..6b64f58e2da --- /dev/null +++ b/html/changelogs/GeneralCamo - Einstein Uniform.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: GeneralCamo + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a uniform for Einstein Engines, replacing the Hephaestus uniform for these roles." diff --git a/icons/clothing/under/uniforms/einstein.dmi b/icons/clothing/under/uniforms/einstein.dmi new file mode 100644 index 00000000000..b3f8ced3076 Binary files /dev/null and b/icons/clothing/under/uniforms/einstein.dmi differ diff --git a/maps/away/ships/einstein/ee_spy_ship_ghostroles.dm b/maps/away/ships/einstein/ee_spy_ship_ghostroles.dm index ff7c9f90b8f..b707e5a6bf6 100644 --- a/maps/away/ships/einstein/ee_spy_ship_ghostroles.dm +++ b/maps/away/ships/einstein/ee_spy_ship_ghostroles.dm @@ -19,7 +19,7 @@ /datum/outfit/admin/ee_crewman name = "Einstein Engines Crewman" - uniform = /obj/item/clothing/under/rank/engineer/heph + uniform = /obj/item/clothing/under/rank/einstein shoes = /obj/item/clothing/shoes/jackboots back = /obj/item/storage/backpack/satchel belt = /obj/item/storage/belt/utility/full @@ -55,7 +55,7 @@ /datum/outfit/admin/ee_research_officer name = "Einstein Engines Research Officer" - uniform = /obj/item/clothing/under/rank/engineer/heph + uniform = /obj/item/clothing/under/rank/einstein shoes = /obj/item/clothing/shoes/jackboots back = /obj/item/storage/backpack/satchel/leather glasses = /obj/item/clothing/glasses/sunglasses