From 096df974f55c28e8048389b25616b5171dd1f012 Mon Sep 17 00:00:00 2001 From: evilew Date: Wed, 30 Oct 2024 12:23:44 +0100 Subject: [PATCH] haydee suit - fixed some shutter/blast door sprites too (to be perspective'd) - nerfed haydee suit, made it available in clothesmate hacked section --- GainStation13/code/clothing/haydee_suit.dm | 2 +- code/game/machinery/doors/poddoor.dm | 2 +- code/game/machinery/doors/shutters.dm | 8 ++++---- code/modules/vending/clothesmate.dm | 3 +-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/GainStation13/code/clothing/haydee_suit.dm b/GainStation13/code/clothing/haydee_suit.dm index 348cb7f20a..25066765ff 100644 --- a/GainStation13/code/clothing/haydee_suit.dm +++ b/GainStation13/code/clothing/haydee_suit.dm @@ -17,7 +17,7 @@ anthro_mob_worn_overlay = 'GainStation13/icons/obj/clothing/haydee_modular.dmi' icon_state = "haydee_suit1" item_state = "item_haydee" - armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 0, "rad" = 25, "fire" = 25, "acid" = 25) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 25, "fire" = 5, "acid" = 5) allowed = list(/obj/item/flashlight, /obj/item/tank/internals) actions_types = list(/datum/action/item_action/toggle_helmet) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/haydee diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 63ead98b61..949be30452 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -1,7 +1,7 @@ /obj/machinery/door/poddoor name = "blast door" desc = "A heavy duty blast door that opens mechanically." - icon = 'icons/obj/doors/blastdoor.dmi' + icon = 'GainStation13/icons/obj/doors/blastdoor.dmi' //GS13 icon_state = "closed" var/id = 1 layer = BLASTDOOR_LAYER diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index 323fab4cf2..53e761bce8 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -2,7 +2,7 @@ gender = PLURAL name = "shutters" desc = "Mechanical metal shutters operated by a button with a magnetic seal, keeping them airtight." - icon = 'icons/obj/doors/shutters.dmi' + icon = 'GainStation13/icons/obj/doors/shutters.dmi' //GS13 layer = SHUTTER_LAYER closingLayer = SHUTTER_LAYER armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 75, BOMB = 25, BIO = 100, RAD = 100, FIRE = 100, ACID = 70) @@ -22,7 +22,7 @@ /obj/machinery/door/poddoor/shutters/old name = "strong shutters" desc = "These shutters have an armoured frame; it looks like plasteel. These shutters look robust enough to survive explosions." - icon = 'icons/obj/doors/shutters_old.dmi' + icon = 'GainStation13/icons/obj/doors/shutters_old.dmi' //GS13 icon_state = "closed" armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 75, BOMB = 30, BIO = 100, RAD = 100, FIRE = 100, ACID = 70) max_integrity = 300 @@ -37,7 +37,7 @@ /obj/machinery/door/poddoor/shutters/radiation name = "radiation shutters" desc = "Lead-lined shutters painted yellow with a radioactive hazard symbol on it. Blocks out most radiation" - icon = 'icons/obj/doors/shutters_radiation.dmi' + icon = 'GainStation13/icons/obj/doors/shutters_radiation.dmi' //GS13 icon_state = "closed" rad_insulation = 0.2 @@ -60,7 +60,7 @@ /obj/machinery/door/poddoor/shutters/window name = "windowed shutters" desc = "Mechanical shutters that have some form of plastic window in them, allowing you to see through the shutters at all times." - icon = 'icons/obj/doors/shutters_window.dmi' + icon = 'GainStation13/icons/obj/doors/shutters_window.dmi' //GS13 icon_state = "closed" opacity = 0 glass = 1 diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 283ee5ad95..e858431db6 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -228,7 +228,6 @@ /obj/item/clothing/under/costume/basil_boys = 20, /obj/item/clothing/head/basil_boys = 20, /obj/item/clothing/shoes/basil_boys = 20, - /* Commenting out until next Christmas or made automatic /obj/item/clothing/accessory/sweater/uglyxmas = 3, /obj/item/clothing/under/costume/christmas = 3, /obj/item/clothing/under/costume/christmas/green = 3, @@ -242,7 +241,6 @@ /obj/item/clothing/shoes/winterboots/christmasbootsr = 3, /obj/item/clothing/shoes/winterboots/christmasbootsg = 3, /obj/item/clothing/shoes/winterboots/santaboots = 3, - */ /obj/item/clothing/head/cowboyhat = 3, /obj/item/clothing/head/cowboyhat/black = 3, /obj/item/clothing/head/cowboyhat/white = 3, @@ -269,6 +267,7 @@ /obj/item/clothing/suit/vapeshirt = 2, /obj/item/clothing/under/costume/geisha = 4, /obj/item/clothing/under/misc/keyholesweater = 3, + /obj/item/clothing/suit/space/hardsuit/engine/haydee = 1, //GS13 /obj/item/clothing/under/misc/staffassistant = 5) premium = list(/obj/item/clothing/under/suit/checkered = 4, /obj/item/clothing/head/mailman = 2,