From c6f11fdf777b5e32879ec1a15ac060357381219b Mon Sep 17 00:00:00 2001 From: Poojawa Date: Mon, 17 Dec 2018 08:41:59 -0600 Subject: [PATCH] Fixes star trek memes --- .../code/modules/clothing/under/trek_under.dm | 20 ++++++++++-------- .../icons/mob/clothing/trek_mob_icon.dmi | Bin 8965 -> 8961 bytes .../icons/obj/clothing/trek_item_icon.dmi | Bin 0 -> 5381 bytes 3 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 modular_citadel/icons/obj/clothing/trek_item_icon.dmi diff --git a/modular_citadel/code/modules/clothing/under/trek_under.dm b/modular_citadel/code/modules/clothing/under/trek_under.dm index 00f84b7583..ddcf0e6344 100644 --- a/modular_citadel/code/modules/clothing/under/trek_under.dm +++ b/modular_citadel/code/modules/clothing/under/trek_under.dm @@ -11,7 +11,7 @@ /obj/item/clothing/under/rank/trek name = "Section 31 Uniform" desc = "Oooh... right." - icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' + icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' item_state = "" can_adjust = FALSE //to prevent you from "wearing it casually" @@ -91,11 +91,12 @@ /obj/item/clothing/suit/storage/trek/ds9 name = "Padded Overcoat" desc = "The overcoat worn by all officers of the 2380s." - icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' + icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi' icon_state = "trek_ds9_coat" alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' item_state = "trek_ds9_coat" body_parts_covered = CHEST|GROIN|ARMS + mutantrace_variation = NO_MUTANTRACE_VARIATION permeability_coefficient = 0.50 allowed = list( /obj/item/flashlight, /obj/item/analyzer, @@ -136,10 +137,11 @@ name = "Federation Uniform Jacket (Red)" desc = "A uniform jacket from the United Federation. Starfleet still uses this uniform and there are variations of it. Set phasers to awesome." - icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' + icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' icon_state = "fedcoat" item_state = "fedcoat" + mutantrace_variation = NO_MUTANTRACE_VARIATION blood_overlay_type = "coat" body_parts_covered = CHEST|GROIN|ARMS @@ -204,7 +206,7 @@ /obj/item/clothing/suit/storage/fluff/modernfedcoat name = "Modern Federation Uniform Jacket" desc = "A modern uniform jacket from the United Federation. Their Starfleet had recently started using these uniforms. Wearing this makes you feel like a competant commander." - icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' + icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' icon_state = "fedmodern" item_state = "fedmodern" @@ -237,20 +239,20 @@ /obj/item/clothing/head/caphat/formal/fedcover name = "Federation Officer's Cap" desc = "An officer's cap that demands discipline from the one who wears it." - icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' + icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi' icon_state = "fedcapofficer" alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' - item_state = "fedcapofficer_mob" + item_state = "fedcapofficer" //Variants /obj/item/clothing/head/caphat/formal/fedcover/medsci icon_state = "fedcapsci" - item_state = "fedcapsci_mob" + item_state = "fedcapsci" /obj/item/clothing/head/caphat/formal/fedcover/eng icon_state = "fedcapeng" - item_state = "fedcapeng_mob" + item_state = "fedcapeng" /obj/item/clothing/head/caphat/formal/fedcover/sec icon_state = "fedcapsec" - item_state = "fedcapsec_mob" + item_state = "fedcapsec" diff --git a/modular_citadel/icons/mob/clothing/trek_mob_icon.dmi b/modular_citadel/icons/mob/clothing/trek_mob_icon.dmi index 9323ea9f3c046bac5c946a909a5c0e6b7ef2ceac..45045b05801e5cdbbef702007ba73a1dc2a9c3b2 100644 GIT binary patch delta 308 zcmV-40n7e{MuA4K$O3;HdQ@0+L}hbha%pgMX>V=-0C=3GmBCH}ArOYo@D!xIHl}X9 zc<^G{m>%paY!GIfJsHKB^#;lR&HVE-*Q3EU zt)+N%wv6?%>7*FJ9mn!{$we2a$3;nS>P_@s2fL8Mx|ETXVn~151D>zHi6I;_7@F3D z&BoER0p1F$_yn-5PXx!)CBCyPp`PUk0gfS?Z+Q(6;7ovez9C(B>Rww<-8SYMBfuFL z^~8Y(utuLLmA{nan$<8-8Hd3cNEEe?7E<_4DaKgxIpX(Vz3RHv<_Gra`33&NH^!pi zjilRnYa#z8`&cL6gA(xkc#tHwnVn(<$xZ5N&5f**%{EK5J8Y+)(+6jM`bG38(F?Qj G0~8;n&YjZ$ delta 312 zcmV-80muGV=-0C=3GmAh^OArM7t_zGmVR^+VH zq(~Flid@9Mu);9wMG0U5@#F8!Y`Q4f%&a?*?wPss5X{x<=54!E>-ViZLCP)$^`f30 zmQtLZEq%SL8Yy~khrWDYa?u6qaaIz1v?hA5gPloXUCPKx(ItQF0nd*=#1IY{3{C67 zX5(nu0GGlFJ^(E11HtihidU8;)UzBRz%gX=GcN%GoC;9SH>3+s-D>Np+s2$R0-S3ZhhQS)y6T@)i^^PyUrO%RKiCKDg31reJuGH@qJh>nr5;3h24LC!99E} z?;d<)rsMe7g8nN{wz1BI(%|XsL6V$iau;#Cs7dO2O>J2vN7KyJX15+bs~gEV0LUYo KrYy7V0~8-)y_i1$ diff --git a/modular_citadel/icons/obj/clothing/trek_item_icon.dmi b/modular_citadel/icons/obj/clothing/trek_item_icon.dmi new file mode 100644 index 0000000000000000000000000000000000000000..4ac77773a0160f2c105f1eaee059a79f65d5b453 GIT binary patch literal 5381 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 p8a0zw