diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index b68feb73..a0d765e3 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -37381,13 +37381,13 @@ /obj/structure/table/glass, /obj/item/folder/white, /obj/item/stamp/cmo, -/obj/item/clothing/glasses/hud/health, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/item/clothing/glasses/hud/health/gar, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "bDW" = ( diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index f05e204a..18c4c646 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -4091,7 +4091,7 @@ "bCp" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 4},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bCr" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable{icon_state = "1-2"},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/crew_quarters/heads/cmo) "bCs" = (/obj/structure/table/glass,/obj/item/paper_bin{pixel_x = -2; pixel_y = 5},/obj/item/pen{layer = 3.1},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/crew_quarters/heads/cmo) -"bCt" = (/obj/structure/table/glass,/obj/item/folder/white,/obj/item/clothing/glasses/hud/health,/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/crew_quarters/heads/cmo) +"bCt" = (/obj/structure/table/glass,/obj/item/folder/white,/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/obj/item/clothing/glasses/hud/health/gar,/turf/open/floor/plasteel/white,/area/crew_quarters/heads/cmo) "bCu" = (/obj/structure/table/glass,/obj/structure/disposalpipe/segment{dir = 4},/obj/item/stack/medical/gauze,/obj/item/clothing/neck/stethoscope,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/crew_quarters/heads/cmo) "bCv" = (/obj/structure/cable{icon_state = "2-4"},/obj/structure/disposalpipe/sorting/mail{dir = 8; sortType = 10},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/cable{icon_state = "1-4"},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/crew_quarters/heads/cmo) "bCx" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/light/small{dir = 1},/turf/open/floor/plating,/area/maintenance/department/engine) diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 225d75f4..12cca53b 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -224,6 +224,17 @@ force = 12 throwforce = 12 +/obj/item/clothing/glasses/garb + name = "plain black gar glasses" + desc = "Go beyond impossible and kick reason to the curb! Doesn't seem to have flash protection and doesn't seem sharp either." + icon_state = "garb" + item_state = "garb" + +/obj/item/clothing/glasses/garb/supergarb + name = "plain black giga gar glasses" + desc = "Believe in us humans. Also doesn't seem to have flash protection and doesn't seem sharp either." + icon_state = "supergarb" + /obj/item/clothing/glasses/sunglasses/gar name = "gar glasses" desc = "Just who the hell do you think I am?!" diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index c85d2f47..2bba49e4 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -45,6 +45,20 @@ vision_correction = 1 glass_colour_type = /datum/client_colour/glass_colour/lightblue +/obj/item/clothing/glasses/hud/health/gar + name = "gar health scanner HUD" + desc = "When you're scared, that's all the more reason to move forward!" + icon_state = "garh" + item_state = "garh" + hud_type = DATA_HUD_MEDICAL_ADVANCED + glass_colour_type = /datum/client_colour/glass_colour/lightblue + force = 10 + throwforce = 10 + throw_speed = 4 + attack_verb = list("sliced") + hitsound = 'sound/weapons/bladeslice.ogg' + sharpness = IS_SHARP + /obj/item/clothing/glasses/hud/health/night name = "night vision health scanner HUD" desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness." diff --git a/code/modules/clothing/suits/vg_suits.dm b/code/modules/clothing/suits/vg_suits.dm index fe011c60..c750f1cd 100644 --- a/code/modules/clothing/suits/vg_suits.dm +++ b/code/modules/clothing/suits/vg_suits.dm @@ -55,16 +55,6 @@ alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION - -/obj/item/clothing/suit/kaminacape - name = "Kamina's Cape" - desc = "Don't believe in yourself, dumbass. Believe in me. Believe in the Kamina who believes in you." - icon_state = "kaminacape" - body_parts_covered = 0 - icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' - mutantrace_variation = NO_MUTANTRACE_VARIATION - /obj/item/clothing/suit/officercoat name = "Officer's Coat" desc = "Ein Mantel gemacht, um die Juden zu bestrafen." @@ -75,7 +65,7 @@ /obj/item/clothing/suit/soldiercoat name = "Soldier's Coat" - desc = "Und das heißt: Erika." + desc = "Und das hei�t: Erika." icon_state = "soldiersuit" body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' diff --git a/hyperstation/code/modules/client/loadout/glasses.dm b/hyperstation/code/modules/client/loadout/glasses.dm new file mode 100644 index 00000000..72c02568 --- /dev/null +++ b/hyperstation/code/modules/client/loadout/glasses.dm @@ -0,0 +1,11 @@ +/datum/gear/glasses/garb + name = "polychromic gar glasses" + category = SLOT_GLASSES + path = /obj/item/clothing/glasses/polychromic/garpoly + cost = 2 + +/datum/gear/glasses/gigagarb + name = "polychromic giga gar glasses" + category = SLOT_GLASSES + path = /obj/item/clothing/glasses/polychromic/supergarpoly + cost = 2 diff --git a/hyperstation/code/modules/clothing/glasses/polychromic_glasses.dm b/hyperstation/code/modules/clothing/glasses/polychromic_glasses.dm new file mode 100644 index 00000000..fa6a67fb --- /dev/null +++ b/hyperstation/code/modules/clothing/glasses/polychromic_glasses.dm @@ -0,0 +1,41 @@ +//Archie was here + +/obj/item/clothing/glasses/polychromic + name = "polychromic glasses template" + desc = "You shouldn't be seeing this. Report it if you do." + icon = 'hyperstation/icons/obj/clothing/glasses.dmi' + icon_state = "polygar" + item_color = "polygar" + item_state = "polygar" + alternate_worn_icon = 'hyperstation/icons/mob/eyes.dmi' //Because, as it appears, the item itself is normally not directly aware of its worn overlays, so this is about the easiest way, without adding a new var. + hasprimary = TRUE + primary_color = "#0c0c0c" + vision_correction = 1 + +/obj/item/clothing/glasses/polychromic/worn_overlays(isinhands, icon_file) //this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon + . = ..() + if(hasprimary | hassecondary | hastertiary) + if(!isinhands) //prevents the worn sprites from showing up if you're just holding them + if(hasprimary) //checks if overlays are enabled + var/mutable_appearance/primary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-primary") //automagical sprite selection + primary_worn.color = primary_color //colors the overlay + . += primary_worn //adds the overlay onto the buffer list to draw on the mob sprite. + if(hassecondary) + var/mutable_appearance/secondary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-secondary") + secondary_worn.color = secondary_color + . += secondary_worn + if(hastertiary) + var/mutable_appearance/tertiary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-tertiary") + tertiary_worn.color = tertiary_color + . += tertiary_worn + +/obj/item/clothing/glasses/polychromic/garpoly + name = "polychromic gar glasses" + desc = "Go beyond impossible and kick reason to the curb! Doesn't seem to have flash protection and doesn't seem sharp either. It is made out of bluespace prescription glass though." + +/obj/item/clothing/glasses/polychromic/supergarpoly + name = "polychromic giga gar glasses" + desc = "Believe in the you who believes in yourself. Also doesn't seem to have flash protection and doesn't seem sharp either. It is made out of bluespace prescription glass though." + icon_state = "polysupergar" + item_color = "polysupergar" + item_state = "polysupergar" diff --git a/hyperstation/code/modules/clothing/suits/misc.dm b/hyperstation/code/modules/clothing/suits/misc.dm new file mode 100644 index 00000000..15504607 --- /dev/null +++ b/hyperstation/code/modules/clothing/suits/misc.dm @@ -0,0 +1,9 @@ +/obj/item/clothing/suit/kaminacape + name = "Kamina's Cape" + desc = "Don't believe in yourself, dumbass. Believe in me. Believe in the Kamina who believes in you." + icon_state = "kaminacape" + item_state = "kaminacape" + body_parts_covered = 0 + icon = 'hyperstation/icons/obj/clothing/suits.dmi' + alternate_worn_icon = 'hyperstation/icons/mob/suit.dmi' + mutantrace_variation = NO_MUTANTRACE_VARIATION diff --git a/hyperstation/icons/mob/eyes.dmi b/hyperstation/icons/mob/eyes.dmi new file mode 100644 index 00000000..628bc237 Binary files /dev/null and b/hyperstation/icons/mob/eyes.dmi differ diff --git a/hyperstation/icons/mob/suit.dmi b/hyperstation/icons/mob/suit.dmi new file mode 100644 index 00000000..2a36355c Binary files /dev/null and b/hyperstation/icons/mob/suit.dmi differ diff --git a/hyperstation/icons/obj/clothing/glasses.dmi b/hyperstation/icons/obj/clothing/glasses.dmi new file mode 100644 index 00000000..5c030a88 Binary files /dev/null and b/hyperstation/icons/obj/clothing/glasses.dmi differ diff --git a/hyperstation/icons/obj/clothing/suits.dmi b/hyperstation/icons/obj/clothing/suits.dmi new file mode 100644 index 00000000..b303d60f Binary files /dev/null and b/hyperstation/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 2cdf97bd..2b803c77 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/tgstation.dme b/tgstation.dme index cf7c2cfd..95cda5aa 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2989,7 +2989,10 @@ #include "hyperstation\code\mobs\werewolf.dm" #include "hyperstation\code\modules\traits.dm" #include "hyperstation\code\modules\antagonists\werewolf\werewolf.dm" +#include "hyperstation\code\modules\client\loadout\glasses.dm" #include "hyperstation\code\modules\clothing\head.dm" +#include "hyperstation\code\modules\clothing\glasses\polychromic_glasses.dm" +#include "hyperstation\code\modules\clothing\suits\misc.dm" #include "hyperstation\code\modules\crafting\bounties.dm" #include "hyperstation\code\modules\crafting\recipes.dm" #include "hyperstation\code\modules\integrated_electronics\input.dm"