diff --git a/GainStation13/code/clothing/haydee_suit.dm b/GainStation13/code/clothing/haydee_suit.dm index 15eda9d7..ad7ae8ee 100644 --- a/GainStation13/code/clothing/haydee_suit.dm +++ b/GainStation13/code/clothing/haydee_suit.dm @@ -7,7 +7,9 @@ item_state = "haydee_helmet" armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 25, "fire" = 25, "acid" = 25) item_color = "white" + slowdown = 0 mutantrace_variation = NO_MUTANTRACE_VARIATION + actions_types = list() /obj/item/clothing/suit/space/hardsuit/engine/haydee name = "Haydee Suit" @@ -20,6 +22,7 @@ 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 + slowdown = 0 mutantrace_variation = NO_MUTANTRACE_VARIATION var/icon_location = 'GainStation13/icons/obj/clothing/haydee_modular.dmi' var/mob/living/carbon/U diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index d4b6afcc..bedf72a2 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -957,7 +957,7 @@ "asu" = (/obj/effect/landmark/xeno_spawn,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/carpet,/area/crew_quarters/dorms) "asv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/carpet,/area/crew_quarters/dorms) "asw" = (/obj/machinery/light{dir = 8},/obj/structure/chair/sofa{dir = 4},/turf/open/floor/carpet,/area/crew_quarters/fitness) -"asx" = (/obj/machinery/airalarm{pixel_y = 23},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/item/twohanded/required/kirbyplants/random,/turf/open/floor/plasteel,/area/crew_quarters/dorms) +"asx" = (/obj/machinery/airalarm{pixel_y = 23},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/machinery/vending/autodrobe,/turf/open/floor/plasteel,/area/crew_quarters/dorms) "asy" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/structure/table/wood,/obj/item/candle{pixel_x = 8; pixel_y = 6},/obj/item/storage/pill_bottle/dice{pixel_x = -3},/turf/open/floor/carpet,/area/crew_quarters/fitness) "asz" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel,/area/crew_quarters/fitness/pool) "asA" = (/obj/effect/turf_decal/bot,/obj/machinery/holopad,/turf/open/floor/plasteel,/area/crew_quarters/fitness/pool) @@ -2380,7 +2380,7 @@ "aUb" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock{dir = 4; name = "Kitchen"; req_access_txt = "28"},/turf/open/floor/plasteel,/area/crew_quarters/kitchen) "aUc" = (/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/dark,/area/hydroponics) "aUd" = (/obj/effect/turf_decal/tile/green{dir = 1},/obj/effect/turf_decal/tile/green{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/hydroponics) -"aUf" = (/obj/machinery/firealarm{pixel_y = 24},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/vending/gato,/turf/open/floor/plasteel/dark/side{dir = 1},/area/crew_quarters/fitness/sauna) +"aUf" = (/obj/machinery/firealarm{pixel_y = 24},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/vending/autodrobe,/turf/open/floor/plasteel/dark/side{dir = 1},/area/crew_quarters/fitness/sauna) "aUg" = (/obj/effect/turf_decal/tile/green,/obj/effect/turf_decal/tile/green{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/hydroponics) "aUh" = (/obj/machinery/hydroponics/constructable,/obj/machinery/airalarm{dir = 8; pixel_x = 24},/turf/open/floor/plasteel/dark,/area/hydroponics) "aUi" = (/obj/structure/bookcase/random/adult,/turf/open/floor/wood,/area/library) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index d04a32bc..ac38dc29 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -18,6 +18,7 @@ /obj/item/toy/clockwork_watch = ARCADE_WEIGHT_TRICK, /obj/item/toy/dummy = ARCADE_WEIGHT_TRICK, /obj/item/toy/eightball = ARCADE_WEIGHT_USELESS, + /obj/item/gun/ballistic/automatic/toy/pistol/haydee = ARCADE_WEIGHT_USELESS, //GS13 /obj/item/toy/eightball/haunted = ARCADE_WEIGHT_RARE, /obj/item/storage/box/actionfigure = ARCADE_WEIGHT_USELESS, /obj/item/toy/foamblade = ARCADE_WEIGHT_TRICK, diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm index 24e984ba..c6118aa3 100644 --- a/code/modules/cargo/packs/costumes_toys.dm +++ b/code/modules/cargo/packs/costumes_toys.dm @@ -393,3 +393,13 @@ /obj/item/vending_refill/kink, /obj/item/vending_refill/kink) crate_name = "Kinkmate kit" + + +/datum/supply_pack/costumes_toys/haydee //GS13 + name = "H4Y-D33 Suit Crate" + desc = "A crate with a strange, futiristic white suit." + cost = 6000 + contraband = TRUE + contains = list(/obj/item/clothing/suit/space/hardsuit/engine/haydee, + /obj/item/gun/ballistic/automatic/pistol/haydee) + crate_name = "suit crate" diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index e53d8a47..d85fb5bd 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -3,7 +3,7 @@ desc = "A vending machine for costumes." icon_state = "theater" icon_deny = "theater-deny" - req_access = list(ACCESS_THEATRE) + req_access = list() product_slogans = "Dress for success!;Suited and booted!;It's show time!;Why leave style up to fate? Use AutoDrobe!" vend_reply = "Thank you for using AutoDrobe!" products = list(/obj/item/clothing/suit/chickensuit = 1, @@ -116,6 +116,7 @@ /obj/item/clothing/head/powdered_wig = 1, /obj/item/gun/magic/wand = 2, /obj/item/clothing/glasses/sunglasses/garb = 2, + /obj/item/clothing/suit/space/hardsuit/engine/haydee = 1, /obj/item/clothing/glasses/sunglasses/blindfold = 1, /obj/item/clothing/mask/muzzle = 2) premium = list(/obj/item/clothing/suit/pirate/captain = 2, diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm index 08bb4615..680993db 100644 --- a/code/modules/vending/toys.dm +++ b/code/modules/vending/toys.dm @@ -9,6 +9,7 @@ products = list( /obj/item/gun/ballistic/automatic/toy/unrestricted = 10, /obj/item/gun/ballistic/automatic/toy/pistol/unrestricted = 10, + /obj/item/gun/ballistic/automatic/toy/pistol/haydee = 5, /obj/item/gun/ballistic/shotgun/toy/unrestricted = 10, /obj/item/toy/sword = 10, /obj/item/ammo_box/foambox = 20, diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 55eb0cd3..e753cce2 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -189,6 +189,18 @@ datum/gear/lyricalpawsring path = /obj/item/clothing/suit/chloe/halsey ckeywhitelist = list("yeeny") +/datum/gear/haydee_suit + name = "Haydee Suit" + category = SLOT_IN_BACKPACK + path = /obj/item/clothing/suit/space/hardsuit/engine/haydee + ckeywhitelist = list("lumu", "sonoida") + +/datum/gear/haydee_pistol + name = "Haydee Pistol" + category = SLOT_IN_BACKPACK + path = /obj/item/gun/ballistic/automatic/toy/pistol/haydee + ckeywhitelist = list("lumu", "sonoida") + //sorry for defining this here, just thought it'd be more convenient /obj/item/clothing/suit/chloe/halsey //sorry to whoever chloe is, but that coat is far too badass not to be used name = "Halsey's Commander Overcoat" diff --git a/modular_citadel/code/modules/research/designs/autoylathe_designs.dm b/modular_citadel/code/modules/research/designs/autoylathe_designs.dm index ecb004c5..ef48ed1e 100644 --- a/modular_citadel/code/modules/research/designs/autoylathe_designs.dm +++ b/modular_citadel/code/modules/research/designs/autoylathe_designs.dm @@ -607,6 +607,14 @@ build_path = /obj/item/gun/ballistic/automatic/toy/pistol/stealth category = list("initial", "Pistols") +/datum/design/haydee_pistol //GS13 + name = "Foam Force Haydee Pistol" + id = "haydee_pistol" + build_type = AUTOYLATHE + materials = list(MAT_PLASTIC = 2000, MAT_METAL = 1000) + build_path = /obj/item/gun/ballistic/automatic/toy/pistol/haydee + category = list("initial", "Pistols") + /datum/design/toyray name = "RayTag Gun" id = "toyray" diff --git a/tgstation.dme b/tgstation.dme index 82f2322c..8888857a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3073,6 +3073,7 @@ #include "code\modules\zombie\organs.dm" #include "GainStation13\code\clothing\accessory.dm" #include "GainStation13\code\clothing\calorite_collar.dm" +#include "GainStation13\code\clothing\haydee_suit.dm" #include "GainStation13\code\datums\components\fattening_door.dm" #include "GainStation13\code\datums\status_effects\fatstun.dm" #include "GainStation13\code\game\lore_papers.dm"