diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 1e1f830c05..ea9dfcc983 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -96,7 +96,7 @@ /datum/crafting_recipe/shortbow name = "Shortbow" - result = /obj/item/weapon/gun/launcher/crossbow/bow + result = /obj/item/gun/launcher/crossbow/bow reqs = list(list(/obj/item/stack/material/wood = 10), list(/obj/item/stack/material/cloth = 5)) time = 120 @@ -105,7 +105,7 @@ /datum/crafting_recipe/arrow_sandstone name = "Wood arrow (sandstone tip)" - result = /obj/item/weapon/arrow/wood + result = /obj/item/arrow/wood reqs = list(list(/obj/item/stack/material/wood = 2), list(/obj/item/stack/material/sandstone = 2)) time = 20 @@ -114,7 +114,7 @@ /datum/crafting_recipe/arrow_marble name = "Wood arrow (marble tip)" - result = /obj/item/weapon/arrow/wood + result = /obj/item/arrow/wood reqs = list(list(/obj/item/stack/material/wood = 2), list(/obj/item/stack/material/marble = 2)) time = 20 @@ -123,7 +123,7 @@ /datum/crafting_recipe/quiver name = "Arrow quiver" - result = /obj/item/weapon/storage/bag/quiver + result = /obj/item/storage/bag/quiver reqs = list(list(/obj/item/stack/material/leather = 8)) time = 60 category = CAT_STORAGE diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm index 2cb249c02b..3c975a382d 100644 --- a/code/game/objects/items/weapons/material/swords.dm +++ b/code/game/objects/items/weapons/material/swords.dm @@ -25,7 +25,7 @@ icon_state = "katana" slot_flags = SLOT_BELT | SLOT_BACK -/obj/item/weapon/material/sword/rapier +/obj/item/material/sword/rapier name = "rapier" desc = "A slender, fancy and sharply pointed sword." icon_state = "rapier" @@ -35,7 +35,7 @@ attack_verb = list("attacked", "stabbed", "prodded", "poked", "lunged") edge = 0 //rapiers are pointy, but not cutty like other swords -/obj/item/weapon/material/sword/longsword +/obj/item/material/sword/longsword name = "longsword" desc = "A double-edged large blade." icon_state = "longsword" @@ -44,7 +44,7 @@ slot_flags = SLOT_BELT | SLOT_BACK can_cleave = TRUE -/obj/item/weapon/material/sword/sabre +/obj/item/material/sword/sabre name = "sabre" desc = "A sharp curved sword, a favored weapon of pirates far in the past." icon_state = "sabre" @@ -52,7 +52,7 @@ applies_material_colour = 0 //messes up the hilt color otherwise slot_flags = SLOT_BELT -/obj/item/weapon/material/sword/battleaxe +/obj/item/material/sword/battleaxe name = "battleaxe" desc = "A one handed battle axe, still a deadly weapon." icon_state = "axe" @@ -64,14 +64,14 @@ pickup_sound = 'sound/items/pickup/axe.ogg' can_cleave = TRUE -/obj/item/weapon/material/sword/battleaxe/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/material/sword/battleaxe/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(unique_parry_check(user, attacker, damage_source) && prob(10)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 -/obj/item/weapon/material/sword/gladius +/obj/item/material/sword/gladius name = "gladius" desc = "An ancient short sword, designed to stab and cut." icon_state = "gladius" diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index 944ae31c0d..e1e1cb043d 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -175,7 +175,7 @@ icon_state = "riding_crop0" attack_verb = list("cropped","spanked","swatted","smacked","peppered") -/obj/item/weapon/material/twohanded/spear/pike +/obj/item/material/twohanded/spear/pike name = "pike" icon_state = "pike0" base_icon = "pike" @@ -187,7 +187,7 @@ drop_sound = 'sound/items/drop/woodweapon.ogg' pickup_sound = 'sound/items/pickup/woodweapon.ogg' -/obj/item/weapon/material/twohanded/spear/halberd +/obj/item/material/twohanded/spear/halberd icon_state = "halberd0" base_icon = "halberd" name = "halberd" @@ -200,14 +200,14 @@ can_cleave = TRUE -/obj/item/weapon/material/twohanded/spear/pike/pitchfork +/obj/item/material/twohanded/spear/pike/pitchfork icon_state = "pitchfork0" base_icon = "pitchfork" name = "pitchfork" desc = "An old farming tool, not something you would find at hydroponics." applies_material_colour = 0 -/obj/item/weapon/material/twohanded/zweihander +/obj/item/material/twohanded/zweihander icon_state = "zweihander0" base_icon = "zweihander" name = "zweihander" @@ -225,7 +225,7 @@ default_material = "steel" can_cleave = TRUE -/obj/item/weapon/material/twohanded/zweihander/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/material/twohanded/zweihander/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(unique_parry_check(user, attacker, damage_source) && prob(10)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index f438adadaa..a6e65ee2b7 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -401,7 +401,7 @@ // ----------------------------- // Quiver (arrow bag) // ----------------------------- -/obj/item/weapon/storage/bag/quiver +/obj/item/storage/bag/quiver name = "quiver" icon = 'icons/obj/storage.dmi' icon_state = "quiver" @@ -410,4 +410,4 @@ max_w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_LARGE slot_flags = SLOT_BACK - can_hold = list(/obj/item/weapon/arrow/wood) \ No newline at end of file + can_hold = list(/obj/item/arrow/wood) \ No newline at end of file diff --git a/code/modules/projectiles/guns/launcher/bows.dm b/code/modules/projectiles/guns/launcher/bows.dm index 7de22cb799..0859aec2f2 100644 --- a/code/modules/projectiles/guns/launcher/bows.dm +++ b/code/modules/projectiles/guns/launcher/bows.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/arrow/wood +/obj/item/arrow/wood name = "wooden arrow" desc = "A wooden arrow with a stone tip. Simple, but gets the job done." icon = 'icons/obj/weapons.dmi' @@ -12,7 +12,7 @@ pickup_sound = 'sound/items/pickup/woodweapon.ogg' -/obj/item/weapon/arrow/energy +/obj/item/arrow/energy name = "hardlight arrow" desc = "An arrow made out of energy! Classic?" icon = 'icons/obj/weapons.dmi' @@ -25,17 +25,17 @@ embed_chance = 0 catchable = FALSE // no catching energy -/obj/item/weapon/arrow/energy/throw_impact(atom/hit_atom) +/obj/item/arrow/energy/throw_impact(atom/hit_atom) . = ..() qdel(src) -/obj/item/weapon/arrow/energy/equipped() +/obj/item/arrow/energy/equipped() if(isliving(loc)) var/mob/living/L = loc L.drop_from_inventory(src) qdel(src) -/obj/item/weapon/gun/launcher/crossbow/bow +/obj/item/gun/launcher/crossbow/bow name = "shortbow" desc = "A common shortbow, capable of firing arrows at high speed towards a target. Useful for hunting while keeping quiet." icon = 'icons/obj/weapons.dmi' @@ -53,37 +53,37 @@ pickup_sound = 'sound/items/pickup/woodweapon.ogg' -/obj/item/weapon/gun/launcher/crossbow/bow/update_release_force(obj/item/projectile) +/obj/item/gun/launcher/crossbow/bow/update_release_force(obj/item/projectile) return 0 -/obj/item/weapon/gun/launcher/crossbow/bow/proc/unload(mob/user) - var/obj/item/weapon/arrow/A = bolt +/obj/item/gun/launcher/crossbow/bow/proc/unload(mob/user) + var/obj/item/arrow/A = bolt bolt = null drawn = FALSE A.forceMove(get_turf(user)) user.put_in_hands(A) update_icon() -/obj/item/weapon/gun/launcher/crossbow/bow/consume_next_projectile(mob/user) +/obj/item/gun/launcher/crossbow/bow/consume_next_projectile(mob/user) if(!drawn) to_chat(user, "\The [src] is not drawn back!") return null return bolt -/obj/item/weapon/gun/launcher/crossbow/bow/handle_post_fire(mob/user, atom/target) +/obj/item/gun/launcher/crossbow/bow/handle_post_fire(mob/user, atom/target) bolt = null drawn = FALSE update_icon() ..() -/obj/item/weapon/gun/launcher/crossbow/bow/attack_hand(mob/living/user) +/obj/item/gun/launcher/crossbow/bow/attack_hand(mob/living/user) if(loc == user && bolt && !drawn) user.visible_message("[user] removes [bolt] from [src].","You remove [bolt] from [src].") unload(user) else return ..() -/obj/item/weapon/gun/launcher/crossbow/bow/attack_self(mob/living/user) +/obj/item/gun/launcher/crossbow/bow/attack_self(mob/living/user) if(drawn) user.visible_message("[user] relaxes the tension on [src]'s string.","You relax the tension on [src]'s string.") drawn = FALSE @@ -91,7 +91,7 @@ else draw(user) -/obj/item/weapon/gun/launcher/crossbow/bow/draw(var/mob/user) +/obj/item/gun/launcher/crossbow/bow/draw(var/mob/user) if(!bolt) to_chat(user, "You don't have anything nocked to [src].") return @@ -106,17 +106,17 @@ user.visible_message("[user] draws the string on [src] back fully!", "You draw the string on [src] back fully!") update_icon() -/obj/item/weapon/gun/launcher/crossbow/bow/handle_click_empty(mob/user) +/obj/item/gun/launcher/crossbow/bow/handle_click_empty(mob/user) return -/obj/item/weapon/gun/launcher/crossbow/bow/attackby(obj/item/W as obj, mob/user) - if(!bolt && istype(W,/obj/item/weapon/arrow/wood)) +/obj/item/gun/launcher/crossbow/bow/attackby(obj/item/W as obj, mob/user) + if(!bolt && istype(W,/obj/item/arrow/wood)) user.drop_from_inventory(W, src) bolt = W user.visible_message("[user] nocks [bolt] in [src].","You nock [bolt] in [src].") update_icon() -/obj/item/weapon/gun/launcher/crossbow/bow/update_icon() +/obj/item/gun/launcher/crossbow/bow/update_icon() if(drawn) icon_state = "[initial(icon_state)]_firing" else if(bolt) @@ -124,14 +124,14 @@ else icon_state = "[initial(icon_state)]" -/obj/item/weapon/gun/launcher/crossbow/bow/dropped(mob/user) +/obj/item/gun/launcher/crossbow/bow/dropped(mob/user) if(drawn) to_chat(user, "\The [src]'s tension is relaxed as you let go of it!") drawn = FALSE update_icon() -/obj/item/weapon/gun/launcher/crossbow/bow/hardlight +/obj/item/gun/launcher/crossbow/bow/hardlight name = "hardlight bow" icon_state = "bow_hardlight" item_state = "bow_hardlight" @@ -139,18 +139,18 @@ drop_sound = 'sound/items/drop/gun.ogg' pickup_sound = 'sound/items/pickup/gun.ogg' -/obj/item/weapon/gun/launcher/crossbow/bow/hardlight/unload(mob/user) +/obj/item/gun/launcher/crossbow/bow/hardlight/unload(mob/user) qdel_null(bolt) update_icon() -/obj/item/weapon/gun/launcher/crossbow/bow/hardlight/attack_self(mob/living/user) +/obj/item/gun/launcher/crossbow/bow/hardlight/attack_self(mob/living/user) if(drawn) user.visible_message("[user] relaxes the tension on [src]'s string.","You relax the tension on [src]'s string.") drawn = FALSE update_icon() else if(!bolt) user.visible_message("[user] fabricates a new hardlight projectile with [src].","You fabricate a new hardlight projectile with [src].") - bolt = new /obj/item/weapon/arrow/energy(src) + bolt = new /obj/item/arrow/energy(src) update_icon() else draw(user) \ No newline at end of file diff --git a/maps/_templates_and_guidance/Mapping Guides/Complete Room Checklist.dmm b/maps/_templates_and_guidance/Mapping Guides/Complete Room Checklist.dmm index a9f89ac5cd..9d00ac83a3 100644 --- a/maps/_templates_and_guidance/Mapping Guides/Complete Room Checklist.dmm +++ b/maps/_templates_and_guidance/Mapping Guides/Complete Room Checklist.dmm @@ -40,7 +40,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; diff --git a/maps/_templates_and_guidance/Public Event Templates/Maze_Reward_-_Copy.dmm b/maps/_templates_and_guidance/Public Event Templates/Maze_Reward_-_Copy.dmm index 3a3e647383..1745f6853b 100644 --- a/maps/_templates_and_guidance/Public Event Templates/Maze_Reward_-_Copy.dmm +++ b/maps/_templates_and_guidance/Public Event Templates/Maze_Reward_-_Copy.dmm @@ -1,7 +1,7 @@ "bh" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 8; maxhealth = 500; name = "Veil of sanity"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "bu" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 4; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/effect/spider/stickyweb/dark{color = #8A0808; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "bG" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; maxhealth = 500; name = "Veil of sanity"},/obj/structure/fans/hardlight/colorable{invisibility = 99},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) -"bL" = (/obj/item/weapon/bone/ribs,/turf/simulated/floor/gorefloor2,/area/survivalpod) +"bL" = (/obj/item/bone/ribs,/turf/simulated/floor/gorefloor2,/area/survivalpod) "bX" = (/obj/fire,/turf/simulated/floor/gorefloor,/area/survivalpod) "cb" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 4; maxhealth = 500; name = "Veil of sanity"},/obj/effect/spider/stickyweb/dark{color = #8A0808; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "cA" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; maxhealth = 500; name = "Veil of sanity"},/obj/effect/spider/stickyweb{color = #8A0808; desc = "Like a leash you can see those strings trying to hold you back, hesitating at the thought only to exasperate the sensation of the reality you are in. . . this may not be an illusion."; name = "Strings of distress"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) @@ -20,7 +20,7 @@ "ib" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/effect/spider/stickyweb/dark{color = #8A0808; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "iK" = (/turf/simulated/floor/gorefloor,/area/survivalpod) "lk" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 8; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 4; maxhealth = 500; name = "Veil of sanity"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) -"lQ" = (/obj/item/weapon/bone/skull/unknown,/turf/simulated/floor/lava,/area/survivalpod) +"lQ" = (/obj/item/bone/skull/unknown,/turf/simulated/floor/lava,/area/survivalpod) "nc" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; maxhealth = 500; name = "Veil of sanity"},/obj/effect/spider/stickyweb/dark{color = #8A0808; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt"},/obj/effect/step_trigger/message{message = "Finally, you gaze upon a horror your sanity fails to understand. The numbness of your body fades as the sound of glass shattering fills your mind, the horrifying sensation of barbed wire tangling your body as every waking second you spend gazing upon this nightmare tightens those bonds. . . Is this what your mortal coil desires?. . ."; once = 0},/turf/simulated/floor/gorefloor,/area/survivalpod) "nn" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 4; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; maxhealth = 500; name = "Veil of sanity"},/obj/effect/spider/stickyweb/dark{color = #8A0808; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "nA" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 8; maxhealth = 500; name = "Veil of sanity"},/turf/simulated/floor/gorefloor,/area/survivalpod) @@ -61,7 +61,7 @@ "El" = (/obj/structure/simple_door/cult,/turf/simulated/floor/cult,/area/survivalpod) "Es" = (/obj/effect/spider/stickyweb/dark{color = #8A0808; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "Fv" = (/obj/structure/girder/cult,/turf/simulated/floor/gorefloor2,/area/survivalpod) -"Fz" = (/obj/item/weapon/bone/ribs,/turf/simulated/floor/lava,/area/survivalpod) +"Fz" = (/obj/item/bone/ribs,/turf/simulated/floor/lava,/area/survivalpod) "FX" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; maxhealth = 500; name = "Veil of sanity"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "GI" = (/obj/machinery/power/supermatter/shard{color = "red"; simulated = 0},/turf/simulated/floor/gorefloor2,/area/survivalpod) "Hm" = (/obj/structure/girder/cult,/turf/simulated/floor/cult,/area/survivalpod) @@ -103,7 +103,7 @@ "Ut" = (/obj/structure/cult/talisman,/obj/effect/map_effect/interval/sound_emitter/geiger/med,/turf/simulated/floor/cult,/area/survivalpod) "Ux" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 4; maxhealth = 500; name = "Veil of sanity"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "UH" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 4; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) -"UO" = (/obj/item/weapon/bone/arm,/turf/simulated/floor/lava,/area/survivalpod) +"UO" = (/obj/item/bone/arm,/turf/simulated/floor/lava,/area/survivalpod) "Vm" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 8; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/effect/spider/stickyweb{color = #8A0808; desc = "Like a leash you can see those strings trying to hold you back, hesitating at the thought only to exasperate the sensation of the reality you are in. . . this may not be an illusion."; name = "Strings of distress"},/turf/simulated/floor/gorefloor,/area/survivalpod) "Vn" = (/obj/structure/cult/forge,/turf/simulated/floor/cult,/area/survivalpod) "VA" = (/obj/structure/grille/broken/cult,/turf/simulated/floor/gorefloor,/area/survivalpod) diff --git a/maps/_templates_and_guidance/Templates/shelter_Medical.dmm b/maps/_templates_and_guidance/Templates/shelter_Medical.dmm index 13f34cff4e..1a5f109ef7 100644 --- a/maps/_templates_and_guidance/Templates/shelter_Medical.dmm +++ b/maps/_templates_and_guidance/Templates/shelter_Medical.dmm @@ -1,18 +1,18 @@ "a" = (/turf/simulated/shuttle/wall/voidcraft/survival,/area/survivalpod) -"b" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/medical,/obj/structure/curtain/open/privacy,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"b" = (/obj/structure/bed/padded,/obj/item/bedsheet/medical,/obj/structure/curtain/open/privacy,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "c" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/machinery/disposal,/obj/effect/floor_decal/industrial/warning/full,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "d" = (/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "e" = (/obj/machinery/light/small,/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "f" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/bed/chair/comfy/black{dir = 8},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) -"g" = (/obj/structure/table/glass,/obj/structure/closet/secure_closet/guncabinet/phase{pixel_y = -32},/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) +"g" = (/obj/structure/table/glass,/obj/structure/closet/secure_closet/guncabinet/phase{pixel_y = -32},/obj/item/gun/energy/locked/frontier/holdout,/obj/item/gun/energy/locked/frontier/holdout,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "h" = (/obj/structure/sign/mining/survival{dir = 8},/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod) "i" = (/obj/effect/floor_decal/industrial/danger/full,/obj/structure/fans/tiny,/obj/machinery/door/airlock/voidcraft/survival_pod,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "j" = (/obj/structure/sign/mining/survival,/turf/simulated/shuttle/wall/voidcraft/survival,/area/survivalpod) "k" = (/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "l" = (/obj/machinery/sleeper/survival_pod,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "m" = (/obj/structure/disposalpipe/segment,/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod) -"n" = (/obj/machinery/smartfridge/survival_pod,/obj/item/weapon/storage/mre/menu10,/obj/item/weapon/storage/mre/menu10,/obj/item/weapon/storage/mre/menu10,/obj/item/weapon/storage/mre/menu10,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose,/obj/item/weapon/storage/box/freezer,/obj/item/weapon/storage/box/freezer,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/glass/beaker,/obj/machinery/light{dir = 1},/obj/item/device/defib_kit/loaded,/obj/item/device/defib_kit/loaded,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) -"o" = (/obj/item/device/gps/computer,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"n" = (/obj/machinery/smartfridge/survival_pod,/obj/item/storage/mre/menu10,/obj/item/storage/mre/menu10,/obj/item/storage/mre/menu10,/obj/item/storage/mre/menu10,/obj/item/storage/mre/menu11,/obj/item/storage/mre/menu11,/obj/item/storage/mre/menu11,/obj/item/storage/mre/menu11,/obj/item/fbp_backup_cell,/obj/item/fbp_backup_cell,/obj/item/fbp_backup_cell,/obj/item/fbp_backup_cell,/obj/item/reagent_containers/glass/beaker/large,/obj/item/reagent_containers/glass/beaker/large,/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose,/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose,/obj/item/storage/box/freezer,/obj/item/storage/box/freezer,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/glass/beaker,/obj/machinery/light{dir = 1},/obj/item/defib_kit/loaded,/obj/item/defib_kit/loaded,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"o" = (/obj/item/gps/computer,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "p" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/toilet{dir = 8},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "s" = (/obj/structure/sign/mining/survival{dir = 1},/turf/simulated/shuttle/wall/voidcraft/survival,/area/survivalpod) "t" = (/obj/structure/window/reinforced/survival_pod{dir = 8},/obj/structure/window/reinforced/survival_pod{dir = 4},/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/window/reinforced/survival_pod,/obj/structure/grille,/obj/structure/curtain/black,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) @@ -21,14 +21,14 @@ "w" = (/obj/structure/table/steel_reinforced,/obj/machinery/chemical_dispenser/full,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "x" = (/obj/structure/sign/redcross,/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod) "z" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/sign/mining/survival{dir = 4},/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod) -"A" = (/obj/machinery/shower{dir = 8},/obj/item/weapon/soap/deluxe,/obj/structure/curtain,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) -"B" = (/obj/structure/table/survival_pod,/obj/item/weapon/storage/firstaid/adv,/obj/item/weapon/storage/firstaid/o2{pixel_x = 5; pixel_y = 5},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"A" = (/obj/machinery/shower{dir = 8},/obj/item/soap/deluxe,/obj/structure/curtain,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"B" = (/obj/structure/table/survival_pod,/obj/item/storage/firstaid/adv,/obj/item/storage/firstaid/o2{pixel_x = 5; pixel_y = 5},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "C" = (/obj/effect/floor_decal/industrial/outline,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) -"D" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/table/gamblingtable,/obj/item/device/starcaster_news,/obj/item/weapon/deck/cards,/obj/structure/fireaxecabinet{pixel_y = 27},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) +"D" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/table/gamblingtable,/obj/item/starcaster_news,/obj/item/deck/cards,/obj/structure/fireaxecabinet{pixel_y = 27},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "E" = (/obj/machinery/optable,/obj/machinery/oxygen_pump/anesthetic{pixel_x = 32},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "F" = (/obj/machinery/door/window/survival_pod{dir = 1},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "G" = (/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod) -"H" = (/obj/machinery/smartfridge/survival_pod,/obj/item/weapon/storage/box/bodybags,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/mask/muzzle,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/mask/muzzle,/obj/item/device/sleevemate,/obj/item/roller{pixel_y = 8},/obj/item/roller{pixel_y = 8},/obj/item/roller{pixel_y = 8},/obj/item/weapon/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/obj/item/weapon/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/surgery,/obj/item/device/defib_kit/compact/loaded,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/device/binoculars,/obj/item/device/bluespaceradio,/obj/item/device/radio/emergency,/obj/item/device/radio/emergency,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/toy/crossbow,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"H" = (/obj/machinery/smartfridge/survival_pod,/obj/item/storage/box/bodybags,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/mask/muzzle,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/mask/muzzle,/obj/item/sleevemate,/obj/item/roller{pixel_y = 8},/obj/item/roller{pixel_y = 8},/obj/item/roller{pixel_y = 8},/obj/item/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/obj/item/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/surgery,/obj/item/defib_kit/compact/loaded,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/extinguisher/mini,/obj/item/extinguisher/mini,/obj/item/towel/random,/obj/item/towel/random,/obj/item/towel/random,/obj/item/towel/random,/obj/item/binoculars,/obj/item/bluespaceradio,/obj/item/radio/emergency,/obj/item/radio/emergency,/obj/item/storage/box/survival/space,/obj/item/storage/box/survival/space,/obj/item/storage/box/survival/space,/obj/item/storage/box/survival/space,/obj/item/storage/box/survival/comp,/obj/item/storage/box/survival/comp,/obj/item/storage/toolbox/mechanical,/obj/item/toy/crossbow,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "I" = (/obj/machinery/light,/obj/machinery/sleeper{dir = 4},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "J" = (/obj/machinery/sleep_console{dir = 4},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "K" = (/obj/structure/fans,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) @@ -39,11 +39,11 @@ "R" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/machinery/vending/medical{req_access = null; req_log_access = null},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "S" = (/obj/machinery/iv_drip,/obj/machinery/iv_drip,/obj/machinery/vending/wallmed1{dir = 8; pixel_x = 22; pixel_y = 3},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "T" = (/obj/machinery/iv_drip,/obj/effect/floor_decal/industrial/loading{dir = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) -"U" = (/obj/structure/table/survival_pod,/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/fire{pixel_x = 5; pixel_y = 5},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"U" = (/obj/structure/table/survival_pod,/obj/item/storage/firstaid/toxin,/obj/item/storage/firstaid/fire{pixel_x = 5; pixel_y = 5},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "V" = (/obj/structure/disposalpipe/segment,/obj/structure/sign/mining/survival{dir = 4},/turf/simulated/shuttle/wall/voidcraft/survival,/area/survivalpod) -"W" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/masks,/obj/item/weapon/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/machinery/newscaster{pixel_y = -30},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) +"W" = (/obj/structure/table/glass,/obj/item/storage/box/masks,/obj/item/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/machinery/newscaster{pixel_y = -30},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "X" = (/obj/structure/sign/mining/survival{dir = 8},/turf/simulated/shuttle/wall/voidcraft/survival,/area/survivalpod) -"Y" = (/obj/structure/table/survival_pod,/obj/item/weapon/storage/firstaid/surgery,/obj/structure/sink/kitchen{dir = 4; pixel_x = -13},/obj/machinery/recharger,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"Y" = (/obj/structure/table/survival_pod,/obj/item/storage/firstaid/surgery,/obj/structure/sink/kitchen{dir = 4; pixel_x = -13},/obj/machinery/recharger,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "Z" = (/obj/machinery/door/window/survival_pod{dir = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) (1,1,1) = {"