diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80d46b6f49..3b10db6503 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1 - name: Annotate Linter - uses: yogstation13/DreamAnnotate@v1 + uses: yogstation13/DreamAnnotate@v2 if: always() with: outputFile: output-annotations.txt diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 2dacb33732..3b22956ab7 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -39,6 +39,12 @@ throwforce = 0 throw_speed = 4 throw_range = 20 + var/randomize = TRUE + var/square_chance = 10 + +/obj/item/weapon/soap/Initialize() + if(randomize && prob(square_chance)) + icon_state = "[icon_state]-alt" /obj/item/weapon/soap/nanotrasen desc = "A NanoTrasen-brand bar of soap. Smells of phoron, a years-old marketing gimmick." @@ -55,10 +61,6 @@ desc = "An untrustworthy bar of soap. Smells of fear." icon_state = "soapsyndie" -/obj/item/weapon/soap/syndie - desc = "An dubious bar of soap. Smells of lyes." - icon_state = "soapsyndie" - /obj/item/weapon/soap/space_soap desc = "Smells like hot metal and walnuts." icon_state = "space_soap" @@ -135,7 +137,6 @@ desc = "Smells like honey." icon_state = "golden_soap" - /obj/item/weapon/bikehorn name = "bike horn" desc = "A horn off of a bicycle." diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 44459d1b96..67fc80168a 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -84,6 +84,16 @@ R.adjustBruteLoss(-weld_rate) if(wire_rate && R.getFireLoss() && cell.checked_use(wire_power_use * wire_rate * CELLRATE)) R.adjustFireLoss(-wire_rate) + + //VOREStation Add Start + else if(ispAI(occupant)) + var/mob/living/silicon/pai/P = occupant + + if(P.nutrition < 400) + P.nutrition = min(P.nutrition+10, 400) + cell.use(7000/450*10) + //VOREStation Add End + else if(ishuman(occupant)) var/mob/living/carbon/human/H = occupant @@ -258,6 +268,21 @@ occupant = R update_icon() return 1 + + //VOREStation Add Start + else if(istype(L, /mob/living/silicon/pai)) + var/mob/living/silicon/pai/P = L + + if(P.incapacitated()) + return + + add_fingerprint(P) + P.reset_view(src) + P.forceMove(src) + occupant = P + update_icon() + return 1 + //VOREStation Add End else if(istype(L, /mob/living/carbon/human)) var/mob/living/carbon/human/H = L diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 4d037bc37c..b67da34424 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -193,6 +193,12 @@ YW Edit end */ icon_state = "techtile_grid" no_variants = FALSE +/obj/item/stack/tile/floor/techmaint + name = "maint techfloor tile" + singular_name = "maint techfloor tile" + icon_state = "techtile_maint" + no_variants = FALSE + /obj/item/stack/tile/floor/steel_dirty name = "steel floor tile" singular_name = "steel floor tile" diff --git a/code/game/objects/random/_random.dm b/code/game/objects/random/_random.dm index 460ef4ef4f..3d68245676 100644 --- a/code/game/objects/random/_random.dm +++ b/code/game/objects/random/_random.dm @@ -6,12 +6,14 @@ var/spawn_nothing_percentage = 0 // this variable determines the likelyhood that this random object will not spawn anything var/drop_get_turf = TRUE -// creates a new object and deletes itself + /obj/random/Initialize() + . = INITIALIZE_HINT_QDEL ..() - if(!prob(spawn_nothing_percentage)) - try_spawn_item() - return INITIALIZE_HINT_QDEL + if (prob(spawn_nothing_percentage)) + return + try_spawn_item() + /obj/random/proc/try_spawn_item() var/atom/result = spawn_item() diff --git a/code/game/objects/random/guns_and_ammo.dm b/code/game/objects/random/guns_and_ammo.dm index 9d6053336d..96184919da 100644 --- a/code/game/objects/random/guns_and_ammo.dm +++ b/code/game/objects/random/guns_and_ammo.dm @@ -507,7 +507,6 @@ /obj/random/projectile/scrapped_gun name = "broken gun spawner" desc = "Spawns a random broken gun, or rarely a fully functional one." - icon = 'icons/obj/gun.dmi' icon_state = "gun_scrap" /obj/random/projectile/scrapped_gun/item_to_spawn() diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 8844c28ee7..546af717c8 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -245,6 +245,7 @@ desc = "Hot Stuff." icon_state = "sus" spawn_nothing_percentage = 50 + /obj/random/contraband/item_to_spawn() return pick(prob(6);/obj/item/weapon/storage/pill_bottle/paracetamol, //VOREStation Edit, prob(4);/obj/item/weapon/storage/pill_bottle/happy, @@ -307,10 +308,10 @@ prob(5);/obj/item/weapon/spacecash/c1000) /obj/random/soap - name = "Random Soap" - desc = "This is a random bar of soap." - icon = 'icons/obj/items.dmi' - icon_state = "soap" + name = "Random Soap (All)" + desc = "This is a random bar of soap. Includes special types." + icon = 'icons/obj/soap.dmi' + icon_state = "rainbow_soap" /obj/random/soap/item_to_spawn() return pick(/obj/item/weapon/soap, @@ -338,6 +339,35 @@ /obj/item/weapon/soap/red_soap, /obj/item/weapon/soap/golden_soap) +/obj/random/soap_common + name = "Random Soap (Common)" + desc = "This is a random bar of soap. Only has the basic types; no NT, deluxe, or syndisoap." + icon = 'icons/obj/soap.dmi' + icon_state = "rainbow_soap" + +/obj/random/soap_common/item_to_spawn() + return pick(/obj/item/weapon/soap, + /obj/item/weapon/soap/space_soap, + /obj/item/weapon/soap/space_soap, + /obj/item/weapon/soap/water_soap, + /obj/item/weapon/soap/fire_soap, + /obj/item/weapon/soap/rainbow_soap, + /obj/item/weapon/soap/diamond_soap, + /obj/item/weapon/soap/uranium_soap, + /obj/item/weapon/soap/silver_soap, + /obj/item/weapon/soap/brown_soap, + /obj/item/weapon/soap/white_soap, + /obj/item/weapon/soap/grey_soap, + /obj/item/weapon/soap/pink_soap, + /obj/item/weapon/soap/purple_soap, + /obj/item/weapon/soap/blue_soap, + /obj/item/weapon/soap/cyan_soap, + /obj/item/weapon/soap/green_soap, + /obj/item/weapon/soap/yellow_soap, + /obj/item/weapon/soap/orange_soap, + /obj/item/weapon/soap/red_soap, + /obj/item/weapon/soap/golden_soap) + /obj/random/drinkbottle name = "random drink" desc = "This is a random drink." diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm index d4ba52ef82..ae5dc0c666 100644 --- a/code/game/objects/structures/catwalk.dm +++ b/code/game/objects/structures/catwalk.dm @@ -13,7 +13,9 @@ var/static/plating_colors = list( /obj/item/stack/tile/floor = "#858a8f", /obj/item/stack/tile/floor/dark = "#4f4f4f", - /obj/item/stack/tile/floor/white = "#e8e8e8") + /obj/item/stack/tile/floor/white = "#e8e8e8", + /obj/item/stack/tile/floor/techmaint = "#4d585b", + /obj/item/stack/tile/floor/techgrey = "#363f43") var/health = 100 var/maxhealth = 100 @@ -189,3 +191,13 @@ icon_state = "catwalk_platedwhite" tile = /obj/item/stack/tile/floor/white platecolor = "#e8e8e8" + +/obj/effect/catwalk_plated/techmaint + icon_state = "catwalk_techmaint" + tile = /obj/item/stack/tile/floor/techmaint + platecolor = "#4d585b" + +/obj/effect/catwalk_plated/techfloor + icon_state = "catwalk_techfloor" + tile = /obj/item/stack/tile/floor/techgrey + platecolor = "#363f43" \ No newline at end of file diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 60a8e64e25..4821694a8c 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -407,6 +407,7 @@ var/list/flooring_types /decl/flooring/tiling/new_tile/techmaint icon_base = "techmaint" + build_type = /obj/item/stack/tile/floor/techmaint /decl/flooring/tiling/new_tile/monofloor icon_base = "monofloor" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm index 9aae4969ef..23c3d490e1 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -62,6 +62,10 @@ display_name = "Security HUDpatch" path = /obj/item/clothing/glasses/hud/security/eyepatch +/datum/gear/eyes/security/secpatch2 + display_name = "Security HUDpatch MKII" + path = /obj/item/clothing/glasses/hud/security/eyepatch2 + /datum/gear/eyes/medical/medpatch display_name = "Health HUDpatch" path = /obj/item/clothing/glasses/hud/health/eyepatch diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 59abe8a91e..560e2ea90e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -529,6 +529,13 @@ ckeywhitelist = list("jacobdragon") character_name = list("Earthen Breath") +/datum/gear/fluff/jademanique_freyr_mask + path = /obj/item/clothing/mask/fluff/freyr_mask + display_name = "Freyr's Mask" + slot = slot_head + ckeywhitelist = list("jademanique") + character_name = list("Freyr") + /datum/gear/fluff/cirra_box path = /obj/item/weapon/storage/box/fluff/cirra display_name = "Cirra's Box" diff --git a/code/modules/clothing/glasses/hud_vr.dm b/code/modules/clothing/glasses/hud_vr.dm index 272d0863c8..12f409204e 100644 --- a/code/modules/clothing/glasses/hud_vr.dm +++ b/code/modules/clothing/glasses/hud_vr.dm @@ -258,6 +258,31 @@ icon_state = initial(icon_state) update_clothing_icon() +/obj/item/clothing/glasses/hud/security/eyepatch2 + name = "Security Hudpatch MKII" + desc = "An eyepatch with built in scanners, that analyzes those in view and provides accurate data about their ID status and security records. This updated model offers better ergonomics and updated sensors." + icon = 'icons/inventory/eyes/item_vr.dmi' + icon_override = 'icons/inventory/eyes/mob_vr.dmi' + icon_state = "sec_eyepatch" + item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold") + body_parts_covered = 0 + enables_planes = list(VIS_CH_ID,VIS_CH_WANTED,VIS_CH_IMPTRACK,VIS_CH_IMPLOYAL,VIS_CH_IMPCHEM) + var/eye = null + +/obj/item/clothing/glasses/hud/security/eyepatch2/verb/switcheye() + set name = "Switch Eyepatch" + set category = "Object" + set src in usr + if(!istype(usr, /mob/living)) return + if(usr.stat) return + + eye = !eye + if(eye) + icon_state = "[icon_state]_1" + else + icon_state = initial(icon_state) + update_clothing_icon() + /obj/item/clothing/glasses/hud/health/eyepatch name = "Medical Hudpatch" diff --git a/code/modules/clothing/head/hood_vr.dm b/code/modules/clothing/head/hood_vr.dm index 5483c461af..cc911db7c8 100644 --- a/code/modules/clothing/head/hood_vr.dm +++ b/code/modules/clothing/head/hood_vr.dm @@ -33,4 +33,23 @@ name = "Talon winter hood" desc = "A cozy winter hood attached to a heavy winter jacket." icon_override = 'icons/inventory/head/mob_vr.dmi' - icon_state = "winterhood_talon" \ No newline at end of file + icon_state = "winterhood_talon" + +//Food costumes +// Hotdog suit hood +/obj/item/clothing/head/hood_vr/hotdog_hood + name = "Hotdog suit hood" + desc = "The hood of a hotdog suit, attached to said hotdog suit." //Honestly i just don't know how to force the costume to hide hats. + icon = 'icons/inventory/head/mob_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' + icon_state = "hotdog_hood" + flags_inv = HIDEEARS|BLOCKHAIR + +// Turnip suit hood +/obj/item/clothing/head/hood_vr/turnip_hood + name = "Turnip suit hood" + desc = "The hood of a hotdog suit, attached to said hotdog suit. Most cooks cut this part off and throw it in the garbage" + icon = 'icons/inventory/head/mob_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' + icon_state = "turnip_hood" + flags_inv = HIDEEARS|BLOCKHAIR \ No newline at end of file diff --git a/code/modules/clothing/suits/hooded_vr.dm b/code/modules/clothing/suits/hooded_vr.dm index 4b79a4e3c0..d6f1465f45 100644 --- a/code/modules/clothing/suits/hooded_vr.dm +++ b/code/modules/clothing/suits/hooded_vr.dm @@ -79,6 +79,31 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) hoodtype = /obj/item/clothing/head/hood/winter/talon +// Food costumes +/obj/item/clothing/suit/storage/hooded/foodcostume //Separate type of costume that does not cover arms and legs. Similar to a cheap mascot costume. + body_parts_covered = UPPER_TORSO|LOWER_TORSO + flags_inv = HIDETIE|HIDEHOLSTER + cold_protection = UPPER_TORSO|LOWER_TORSO + action_button_name = "Toggle Hood" + +/obj/item/clothing/suit/storage/hooded/foodcostume/hotdog //Belly filler uniform :^). + name = "hotdog costume" + desc = "A giant hotdog costume, comes with authentic artificial hotdog scent." + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "hotdog" + item_state_slots = list(slot_r_hand_str = "hotdog", slot_l_hand_str = "hotdog") + hoodtype = /obj/item/clothing/head/hood_vr/hotdog_hood + +/obj/item/clothing/suit/storage/hooded/foodcostume/turnip //Honey wake up, new vorny jail uniform just dropped. + name = "turnip costume" + desc = "A giant turnip costume, extra padding helps the wearer stand in the same spot for hours." + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "turnip" + item_state_slots = list(slot_r_hand_str = "turnip", slot_l_hand_str = "turnip") + hoodtype = /obj/item/clothing/head/hood_vr/turnip_hood + //Functional hoodie /obj/item/clothing/suit/storage/hooded/hoodie diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index b10b1c4a34..2d152ff76d 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -1237,6 +1237,7 @@ /obj/item/clothing/mask/bandana/red = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/security = 5, /obj/item/clothing/accessory/armband = 5, + /obj/item/clothing/glasses/hud/security/eyepatch2 = 5, //VoreStation edit - cool eyepatch! /obj/item/clothing/accessory/holster/armpit = 2, //VOREStation edit - gives some variety of available holsters for those who forgot to bring their own /obj/item/clothing/accessory/holster/waist = 2, //VOREStation edit - But also reduces the number per type, so there's 8 overall rather than like, 20 /obj/item/clothing/accessory/holster/hip = 2, //VOREStation edit diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index d8c5aa8e9a..f32bede4fb 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -1431,7 +1431,9 @@ /obj/item/clothing/gloves/combat/knight_costume = 3, /obj/item/clothing/gloves/combat/knight_costume/brown = 3, /obj/item/clothing/shoes/knight_costume = 3, - /obj/item/clothing/shoes/knight_costume/black = 3) + /obj/item/clothing/shoes/knight_costume/black = 3, + /obj/item/clothing/suit/storage/hooded/foodcostume/hotdog = 3, + /obj/item/clothing/suit/storage/hooded/foodcostume/turnip = 3) prices = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 200, /obj/item/clothing/suit/storage/hooded/costume/carp = 200, /obj/item/clothing/suit/chickensuit = 200, @@ -1496,7 +1498,9 @@ /obj/item/clothing/gloves/combat/knight_costume = 200, /obj/item/clothing/gloves/combat/knight_costume/brown = 200, /obj/item/clothing/shoes/knight_costume = 200, - /obj/item/clothing/shoes/knight_costume/black = 200) + /obj/item/clothing/shoes/knight_costume/black = 200, + /obj/item/clothing/suit/storage/hooded/foodcostume/hotdog = 200, + /obj/item/clothing/suit/storage/hooded/foodcostume/turnip = 200) premium = list(/obj/item/clothing/suit/imperium_monk = 3, /obj/item/clothing/suit/barding/agatha = 2, /obj/item/clothing/suit/barding/alt_agatha = 2, diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm index d702a32d3a..8808ed38f5 100644 --- a/code/modules/emotes/definitions/audible.dm +++ b/code/modules/emotes/definitions/audible.dm @@ -140,7 +140,7 @@ /decl/emote/audible/bug_buzz key = "bbuzz" - emote_message_3p = "buzzes its wings." + emote_message_3p = "buzzes USER_THEIR wings." emote_sound = 'sound/voice/BugBuzz.ogg' /decl/emote/audible/bug_chitter @@ -244,4 +244,4 @@ emote_message_3p = "prbts." emote_message_1p_target = "You prbt at TARGET." emote_message_3p_target = "prbts at TARGET." - emote_sound = 'sound/voice/prbt.ogg' \ No newline at end of file + emote_sound = 'sound/voice/prbt.ogg' diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 33fc69c562..3cac3ef38c 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -1266,7 +1266,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() if(tail_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL && !istaurtail(tail_style)) && !tail_hidden) var/icon/tail_s = new/icon("icon" = tail_style.icon, "icon_state" = (tail_style.can_loaf && resting) ? "[tail_style.icon_state]_loaf" : (wagging && tail_style.ani_state ? tail_style.ani_state : tail_style.icon_state)) // VOREStation Edit: Taur Loafing if(tail_style.can_loaf && !is_shifted) - pixel_y = (resting) ? -tail_style.loaf_offset : 0 //move player down, then taur up, to fit the overlays correctly // VOREStation Edit: Taur Loafing + pixel_y = (resting) ? -tail_style.loaf_offset*size_multiplier : default_pixel_y //move player down, then taur up, to fit the overlays correctly // VOREStation Edit: Taur Loafing if(tail_style.do_colouration) tail_s.Blend(rgb(src.r_tail, src.g_tail, src.b_tail), tail_style.color_blend_mode) if(tail_style.extra_overlay) diff --git a/code/modules/reagents/reagent_containers/syringes_vr.dm b/code/modules/reagents/reagent_containers/syringes_vr.dm index 83c5bacaef..89d81d1f18 100644 --- a/code/modules/reagents/reagent_containers/syringes_vr.dm +++ b/code/modules/reagents/reagent_containers/syringes_vr.dm @@ -85,7 +85,7 @@ //Allow for capped syringes /obj/item/weapon/reagent_containers/syringe/update_icon() - cut_overlays(src) + cut_overlays() var/matrix/tf = matrix() if(isstorage(loc)) @@ -101,12 +101,11 @@ icon_state = "capped" return - var/list/new_overlays = list() var/rounded_vol = round(reagents.total_volume, round(reagents.maximum_volume / 3)) if(reagents.total_volume) filling = image(icon, src, "filler[rounded_vol]") filling.color = reagents.get_color() - new_overlays += filling + add_overlay(filling) if(ismob(loc)) var/injoverlay @@ -115,9 +114,8 @@ injoverlay = "draw" if (SYRINGE_INJECT) injoverlay = "inject" - new_overlays += injoverlay + add_overlay(injoverlay) - add_overlay(new_overlays) icon_state = "[rounded_vol]" item_state = "syringe_[rounded_vol]" diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm index f41e33500e..c172b9bc44 100644 --- a/code/modules/surgery/encased.dm +++ b/code/modules/surgery/encased.dm @@ -68,11 +68,11 @@ affected.fracture() /////////////////////////////////////////////////////////////// -// Rib Opening Surgery +// Bone Opening Surgery /////////////////////////////////////////////////////////////// /datum/surgery_step/open_encased/retract - surgery_name = "Retract Ribs Open" + surgery_name = "Retract Bone" allowed_tools = list( /obj/item/weapon/surgical/retractor = 100 ) @@ -122,11 +122,11 @@ affected.fracture() /////////////////////////////////////////////////////////////// -// Rib Closing Surgery +// Retracted Bone Closing Surgery /////////////////////////////////////////////////////////////// /datum/surgery_step/open_encased/close - surgery_name = "Retract Ribs Closed" + surgery_name = "Close Retracted Bone" allowed_tools = list( /obj/item/weapon/surgical/retractor = 100, ) @@ -181,11 +181,11 @@ target.rupture_lung()*/ /////////////////////////////////////////////////////////////// -// Rib Mending Surgery +// Retracted Bone Mending Surgery /////////////////////////////////////////////////////////////// /datum/surgery_step/open_encased/mend - surgery_name = "Mend Ribs" + surgery_name = "Mend Retracted Bone" allowed_tools = list( /obj/item/weapon/surgical/bonegel = 100 ) @@ -227,7 +227,7 @@ // Saw/Retractor/Gel Combi-open and close. /////////////////////////////////////////////////////////////// /datum/surgery_step/open_encased/advancedsaw_open - surgery_name = "Advanced Cut Ribs" + surgery_name = "Advanced Cut Bone" allowed_tools = list( /obj/item/weapon/surgical/circular_saw/manager = 100 ) @@ -278,7 +278,7 @@ /datum/surgery_step/open_encased/advancedsaw_mend - surgery_name = "Advanced Mend Ribs" + surgery_name = "Advanced Mend Retracted Bone" allowed_tools = list( /obj/item/weapon/surgical/circular_saw/manager = 100 ) diff --git a/code/modules/surgery/external_repair.dm b/code/modules/surgery/external_repair.dm index 820ae4e559..3698f2d1c4 100644 --- a/code/modules/surgery/external_repair.dm +++ b/code/modules/surgery/external_repair.dm @@ -106,8 +106,6 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) if(affected.burn_stage < 1 || !(affected.burn_dam)) return 0 - if(affected.burn_dam < affected.brute_dam) - return 0 return 1 return 0 @@ -173,8 +171,6 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) if(affected.brute_stage < 1 || !(affected.brute_dam)) return 0 - if(affected.brute_dam < affected.burn_dam) - return 0 return 1 return 0 diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 76b9973daf..b0aa01cb29 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -2524,4 +2524,16 @@ Departamental Swimsuits, for general use icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "greek_dress" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS \ No newline at end of file + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS +//JadeManique: Freyr +/obj/item/clothing/mask/fluff/freyr_mask + name = "Freyr's Mask" + desc = "A pristine white mask with antlers. Its silky to the touch, like porcelain!" + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "freyrmask" + icon_override = 'icons/vore/custom_onmob_vr.dmi' + item_state = "freyrmask_mob" + item_state_slots = null + body_parts_covered = FACE + + diff --git a/icons/inventory/eyes/item_vr.dmi b/icons/inventory/eyes/item_vr.dmi index eee1bd9bfc..4822216c87 100644 Binary files a/icons/inventory/eyes/item_vr.dmi and b/icons/inventory/eyes/item_vr.dmi differ diff --git a/icons/inventory/eyes/mob_vr.dmi b/icons/inventory/eyes/mob_vr.dmi index f19fed9626..e2ad4dd16c 100644 Binary files a/icons/inventory/eyes/mob_vr.dmi and b/icons/inventory/eyes/mob_vr.dmi differ diff --git a/icons/inventory/head/mob_vr.dmi b/icons/inventory/head/mob_vr.dmi index 2da016ca45..52e3a4121f 100644 Binary files a/icons/inventory/head/mob_vr.dmi and b/icons/inventory/head/mob_vr.dmi differ diff --git a/icons/inventory/suit/item_vr.dmi b/icons/inventory/suit/item_vr.dmi index 6c461429e8..970690999c 100644 Binary files a/icons/inventory/suit/item_vr.dmi and b/icons/inventory/suit/item_vr.dmi differ diff --git a/icons/inventory/suit/mob_vr.dmi b/icons/inventory/suit/mob_vr.dmi index 488b75567e..8743a62765 100644 Binary files a/icons/inventory/suit/mob_vr.dmi and b/icons/inventory/suit/mob_vr.dmi differ diff --git a/icons/mob/items/lefthand_suits.dmi b/icons/mob/items/lefthand_suits.dmi index fd2c56a4c5..301bbc3ff3 100644 Binary files a/icons/mob/items/lefthand_suits.dmi and b/icons/mob/items/lefthand_suits.dmi differ diff --git a/icons/mob/items/righthand_suits.dmi b/icons/mob/items/righthand_suits.dmi index d710deb759..83c7e7b777 100644 Binary files a/icons/mob/items/righthand_suits.dmi and b/icons/mob/items/righthand_suits.dmi differ diff --git a/icons/obj/furniture_vr.dmi b/icons/obj/furniture_vr.dmi index 32cbe3b036..5f79c3df6a 100644 Binary files a/icons/obj/furniture_vr.dmi and b/icons/obj/furniture_vr.dmi differ diff --git a/icons/obj/soap.dmi b/icons/obj/soap.dmi index e610eb2490..23a7bf2394 100644 Binary files a/icons/obj/soap.dmi and b/icons/obj/soap.dmi differ diff --git a/icons/obj/stacks.dmi b/icons/obj/stacks.dmi index 9c3cf31f09..8ade0ce4ae 100644 Binary files a/icons/obj/stacks.dmi and b/icons/obj/stacks.dmi differ diff --git a/icons/turf/catwalks.dmi b/icons/turf/catwalks.dmi index 20c5e1f4d9..7ff2c50a35 100644 Binary files a/icons/turf/catwalks.dmi and b/icons/turf/catwalks.dmi differ diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index 341c7f6f23..4abd369691 100644 Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ diff --git a/icons/vore/custom_onmob_vr.dmi b/icons/vore/custom_onmob_vr.dmi index e90afae8d4..68403c0974 100644 Binary files a/icons/vore/custom_onmob_vr.dmi and b/icons/vore/custom_onmob_vr.dmi differ diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index 368368c3a9..8fd5b03d0b 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -1268,7 +1268,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/catwalk_plated/dark, +/obj/effect/catwalk_plated/techfloor, /turf/simulated/floor/plating, /area/talon_v2/central_hallway/fore) "dw" = ( @@ -1581,6 +1581,7 @@ /area/talon_v2/central_hallway/fore) "eC" = ( /obj/structure/closet/walllocker_double/hydrant/west, +/obj/machinery/light/small, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering/star_store) "eD" = ( @@ -1874,7 +1875,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/catwalk_plated/dark, +/obj/effect/catwalk_plated/techfloor, /turf/simulated/floor/plating, /area/talon_v2/central_hallway/fore) "fi" = ( @@ -1984,6 +1985,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/light, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/cap_room) "fA" = ( @@ -2217,7 +2219,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/catwalk_plated/dark, +/obj/effect/catwalk_plated/techfloor, /turf/simulated/floor/plating, /area/talon_v2/central_hallway/fore) "gu" = ( @@ -3397,7 +3399,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/catwalk_plated/dark, +/obj/effect/catwalk_plated/techfloor, /turf/simulated/floor/plating, /area/shuttle/talonboat) "kw" = ( @@ -3483,7 +3485,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/catwalk_plated/dark, +/obj/effect/catwalk_plated/techfloor, /turf/simulated/floor/plating, /area/shuttle/talonboat) "kJ" = ( @@ -4233,11 +4235,11 @@ "nn" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/catwalk_plated, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/central_hallway) "no" = ( @@ -4702,6 +4704,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/workroom) +"oP" = ( +/obj/structure/table/rack/shelf/steel, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, +/obj/item/weapon/storage/box/lights/mixed, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/gen_store) "oS" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -5609,9 +5618,6 @@ /turf/simulated/floor/plating, /area/talon_v2/engineering/port_store) "rQ" = ( -/obj/machinery/light/small{ - dir = 1 - }, /obj/structure/toilet, /turf/simulated/floor/tiled/white, /area/talon_v2/crew_quarters/restrooms) @@ -5726,10 +5732,10 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/catwalk_plated, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/brig) "sk" = ( @@ -5802,10 +5808,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/catwalk_plated, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/central_hallway) "ss" = ( @@ -6048,11 +6054,11 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/catwalk_plated, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/central_hallway/star) "tb" = ( @@ -6449,6 +6455,22 @@ "up" = ( /turf/simulated/wall/rshull, /area/talon_v2/anomaly_storage) +"uq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) "uu" = ( /obj/structure/hull_corner/long_vert{ dir = 9 @@ -6904,6 +6926,9 @@ dir = 10 }, /obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) "vR" = ( @@ -7940,6 +7965,9 @@ /obj/machinery/disposal/wall{ dir = 8 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/med_room) "zv" = ( @@ -8006,6 +8034,9 @@ /obj/machinery/disposal/wall{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/sec_room) "zI" = ( @@ -8298,11 +8329,11 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/catwalk_plated, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/central_hallway/fore) "AQ" = ( @@ -8660,6 +8691,9 @@ /obj/item/device/radio/off{ channels = list("Talon" = 1) }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/pilot_room) "Cf" = ( @@ -8714,7 +8748,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/effect/catwalk_plated, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -8722,6 +8755,7 @@ /obj/structure/sign/directions/engineering/atmospherics{ pixel_x = -32 }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/central_hallway) "CB" = ( @@ -9204,6 +9238,15 @@ }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/pilot_room) +"Em" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) "En" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9511,12 +9554,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/effect/catwalk_plated, /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/central_hallway/star) "Ff" = ( @@ -9899,7 +9942,6 @@ "Gm" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/effect/catwalk_plated, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -9908,6 +9950,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/central_hallway/port) "Gn" = ( @@ -10430,7 +10473,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/effect/catwalk_plated, /obj/structure/disposalpipe/junction, /obj/structure/sign/directions/engineering{ pixel_x = 32; @@ -10451,6 +10493,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/central_hallway) "HN" = ( @@ -10482,7 +10525,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/effect/catwalk_plated, /obj/structure/disposalpipe/junction{ dir = 2; icon_state = "pipe-j2" @@ -10497,6 +10539,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/central_hallway) "HU" = ( @@ -10945,7 +10988,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/effect/catwalk_plated, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/central_hallway/fore) "IY" = ( @@ -11169,6 +11212,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/light/small, /turf/simulated/floor/tiled/white, /area/talon_v2/crew_quarters/restrooms) "JJ" = ( @@ -11962,13 +12006,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/effect/catwalk_plated, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/sign/department/medbay{ pixel_y = 32 }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/central_hallway/star) "LV" = ( @@ -12420,6 +12464,9 @@ }, /obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/structure/closet/walllocker_double/survival/south, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/talonboat) "Nw" = ( @@ -12443,13 +12490,15 @@ /area/shuttle/talonboat) "NB" = ( /obj/structure/closet/walllocker_double/south, -/obj/machinery/light, /obj/item/weapon/extinguisher, /obj/item/stack/cable_coil/green, /obj/item/stack/cable_coil/green, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/effect/map_helper/airlock/atmos/pump_out_internal, /obj/machinery/atmospherics/unary/vent_pump/high_volume, +/obj/structure/handrail{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/talonboat) "NC" = ( @@ -12527,6 +12576,9 @@ }, /obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/structure/closet/walllocker_double/survival/south, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/talonboat) "NO" = ( @@ -14471,7 +14523,6 @@ "TW" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/catwalk_plated, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -14485,6 +14536,7 @@ dir = 4; icon_state = "pipe-c" }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/central_hallway/port) "TX" = ( @@ -14858,7 +14910,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/effect/catwalk_plated, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -14867,6 +14918,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/central_hallway/port) "Vh" = ( @@ -15577,7 +15629,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/catwalk_plated, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -15587,6 +15638,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/central_hallway/fore) "Xo" = ( @@ -15734,10 +15786,10 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/catwalk_plated, /obj/structure/disposalpipe/junction{ dir = 8 }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/talon_v2/central_hallway/star) "XS" = ( @@ -22945,7 +22997,7 @@ xL LL xB OQ -LT +oP kk LT OQ @@ -25749,7 +25801,7 @@ ZC WL yt EN -Rs +dT Pe pb Xy @@ -25914,7 +25966,7 @@ lr lZ SQ Xn -mc +uq mc mk an @@ -26766,7 +26818,7 @@ tj mk ru sD -DG +Em DG qb Fd diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index 0dd7d311ab..f8f16f01bf 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -2494,7 +2494,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/catwalk_plated, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/ship/ert/barracks) "nl" = ( @@ -4610,12 +4610,12 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/catwalk_plated, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/ship/ert/engineering) "yX" = ( @@ -4723,12 +4723,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/effect/catwalk_plated, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/ship/ert/hallways) "zB" = ( @@ -6832,7 +6832,7 @@ /obj/item/ammo_magazine/ammo_box/b12g/pellet, /obj/item/ammo_magazine/ammo_box/b12g, /obj/item/ammo_magazine/ammo_box/b12g, -/obj/item/weapon/storage/box/empshells/large, +/obj/item/ammo_magazine/ammo_box/b12g/emp, /obj/item/ammo_magazine/ammo_box/b12g/flash, /obj/item/ammo_magazine/ammo_box/b12g/beanbag, /obj/item/ammo_magazine/ammo_box/b12g/beanbag, @@ -6983,7 +6983,7 @@ /obj/item/ammo_magazine/ammo_box/b12g/pellet, /obj/item/ammo_magazine/ammo_box/b12g, /obj/item/ammo_magazine/ammo_box/b12g, -/obj/item/weapon/storage/box/empshells/large, +/obj/item/ammo_magazine/ammo_box/b12g/emp, /obj/item/ammo_magazine/ammo_box/b12g/flash, /obj/item/ammo_magazine/ammo_box/b12g/beanbag, /obj/item/ammo_magazine/ammo_box/b12g/beanbag, @@ -7205,7 +7205,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/effect/catwalk_plated/dark, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -7221,6 +7220,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/catwalk_plated/techfloor, /turf/simulated/floor/plating, /area/ship/ert/engine) "NI" = ( @@ -7457,7 +7457,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/catwalk_plated, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/ship/ert/bridge) "OA" = ( @@ -7497,7 +7497,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/catwalk_plated, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/ship/ert/bridge) "OF" = ( @@ -7784,7 +7784,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/catwalk_plated, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/ship/ert/eng_storage) "PG" = ( @@ -8108,12 +8108,12 @@ "Sp" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/catwalk_plated, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/ship/ert/med) "Sr" = ( @@ -8884,10 +8884,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/effect/catwalk_plated, /obj/effect/landmark{ name = "Commando" }, +/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/plating, /area/ship/ert/barracks) "WZ" = ( diff --git a/maps/submaps/admin_use_vr/kk_mercship.dmm b/maps/submaps/admin_use_vr/kk_mercship.dmm index ad77de938c..9f4f5e3d38 100644 --- a/maps/submaps/admin_use_vr/kk_mercship.dmm +++ b/maps/submaps/admin_use_vr/kk_mercship.dmm @@ -7549,10 +7549,6 @@ /obj/item/clothing/accessory/armor/armguards/green, /obj/item/clothing/accessory/armor/armguards/green, /obj/item/clothing/accessory/armor/armguards/green, -/obj/item/clothing/accessory/armor/tag/saare, -/obj/item/clothing/accessory/armor/tag/saare, -/obj/item/clothing/accessory/armor/tag/saare, -/obj/item/clothing/accessory/armor/tag/saare, /obj/item/clothing/accessory/armor/armorplate/tactical, /obj/item/clothing/accessory/armor/armorplate/tactical, /obj/item/clothing/accessory/armor/armorplate/tactical, @@ -11168,22 +11164,22 @@ /obj/item/weapon/gun/projectile/automatic/bullpup{ pixel_y = -6 }, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m/ap, -/obj/item/ammo_magazine/m762m/ap, -/obj/item/ammo_magazine/m762m/ap, -/obj/item/ammo_magazine/m762m/ap, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, +/obj/item/ammo_magazine/m762/ext, +/obj/item/ammo_magazine/m762/ext, +/obj/item/ammo_magazine/m762/ext, +/obj/item/ammo_magazine/m762/ext, +/obj/item/ammo_magazine/m762/ext, +/obj/item/ammo_magazine/m762/ext, +/obj/item/ammo_magazine/m762/ext, +/obj/item/ammo_magazine/m762/ext, +/obj/item/ammo_magazine/m762/ext, +/obj/item/ammo_magazine/m762/ext, +/obj/item/ammo_magazine/m762/ext, +/obj/item/ammo_magazine/m762/ext, +/obj/item/ammo_magazine/m762/ext, +/obj/item/ammo_magazine/m762/ext, +/obj/item/ammo_magazine/m762/ext, +/obj/item/ammo_magazine/m762/ext, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_as) "Vx" = ( diff --git a/vorestation.dme b/vorestation.dme index 1e63f33684..3d205f7ea5 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4291,6 +4291,7 @@ #include "maps\southern_cross\loadout\loadout_suit.dm" #include "maps\southern_cross\loadout\loadout_uniform.dm" #include "maps\southern_cross\loadout\loadout_vr.dm" +#include "maps\stellar_delight\stellar_delight.dm" #include "maps\submaps\_helpers.dm" #include "maps\submaps\_readme.dm" #include "maps\submaps\engine_submaps\engine.dm"