diff --git a/code/datums/supplypacks/recreation_vr.dm b/code/datums/supplypacks/recreation_vr.dm index d59fdabb15..8d8ae503de 100644 --- a/code/datums/supplypacks/recreation_vr.dm +++ b/code/datums/supplypacks/recreation_vr.dm @@ -108,7 +108,7 @@ containername = "Snack planets crate" /datum/supply_pack/recreation/pinkpillows - name = "Pink Pillow Crate" + name = "Pillow Crate - Pink" contains = list( /obj/item/weapon/bedsheet/pillow = 6 ) @@ -116,7 +116,7 @@ containertype = /obj/structure/closet/crate /datum/supply_pack/recreation/tealpillows - name = "Teal Pillow Crate" + name = "Pillow Crate - Teal" contains = list( /obj/item/weapon/bedsheet/pillow/teal = 6 ) @@ -124,7 +124,7 @@ containertype = /obj/structure/closet/crate /datum/supply_pack/recreation/whitepillows - name = "White Pillow Crate" + name = "Pillow Crate - White" contains = list( /obj/item/weapon/bedsheet/pillow/white = 6 ) @@ -132,7 +132,7 @@ containertype = /obj/structure/closet/crate /datum/supply_pack/recreation/blackpillows - name = "Black Pillow Crate" + name = "Pillow Crate - Black" contains = list( /obj/item/weapon/bedsheet/pillow/black = 6 ) @@ -140,7 +140,7 @@ containertype = /obj/structure/closet/crate /datum/supply_pack/recreation/redpillows - name = "Red Pillow Crate" + name = "Pillow Crate - Red" contains = list( /obj/item/weapon/bedsheet/pillow/red = 6 ) @@ -148,7 +148,7 @@ containertype = /obj/structure/closet/crate /datum/supply_pack/recreation/greenpillows - name = "Green Pillow Crate" + name = "Pillow Crate - Green" contains = list( /obj/item/weapon/bedsheet/pillow/green = 6 ) @@ -156,7 +156,7 @@ containertype = /obj/structure/closet/crate /datum/supply_pack/recreation/orangepillows - name = "Orange Pillow Crate" + name = "Pillow Crate - Orange" contains = list( /obj/item/weapon/bedsheet/pillow/orange = 6 ) @@ -164,10 +164,9 @@ containertype = /obj/structure/closet/crate /datum/supply_pack/recreation/yellowpillows - name = "Yellow Pillow Crate" + name = "Pillow Crate - Yellow" contains = list( /obj/item/weapon/bedsheet/pillow/yellow = 6 ) cost = 10 containertype = /obj/structure/closet/crate - diff --git a/code/game/objects/items/falling_object_vr.dm b/code/game/objects/items/falling_object_vr.dm index f1c6d235bd..0494594dce 100644 --- a/code/game/objects/items/falling_object_vr.dm +++ b/code/game/objects/items/falling_object_vr.dm @@ -31,6 +31,14 @@ qdel(src) /atom/movable/proc/end_fall(var/crushing = FALSE) + if(istype(src, /mob/living)) + var/mob/living/L = src + if(L.vore_selected && L.can_be_drop_pred && L.drop_vore) + for(var/mob/living/P in loc) + if(P.can_be_drop_prey && P.drop_vore) + L.feed_grabbed_to_self_falling_nom(L,P) + L.visible_message("\The [L] falls right onto \the [P]!") + if(crushing) for(var/atom/movable/AM in loc) if(AM != src) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 19abe702b5..4644154e07 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -296,6 +296,18 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "rubberducky" honk_sound = 'sound/voice/quack.ogg' //VOREStation edit + var/honk_text = 0 + +/obj/item/weapon/bikehorn/rubberducky/attack_self(mob/user as mob) + if(spam_flag == 0) + spam_flag = 1 + playsound(src, honk_sound, 50, 1) + if(honk_text) + audible_message(span_maroon("[honk_text]")) + src.add_fingerprint(user) + spawn(20) + spam_flag = 0 + return //Admin spawn duckies @@ -317,6 +329,8 @@ spam_flag = 1 playsound(src, honk_sound, 50, 1) src.add_fingerprint(user) + if(honk_text) + audible_message(span_maroon("[honk_text]")) honk_count ++ spawn(20) spam_flag = 0 @@ -336,6 +350,100 @@ whereweare.wet_floor(2) spam_flag = 1 playsound(src, honk_sound, 50, 1) + if(honk_text) + audible_message(span_maroon("[honk_text]")) + src.add_fingerprint(user) + spawn(20) + spam_flag = 0 + return + +/obj/item/weapon/bikehorn/rubberducky/pink + name = "rubber ducky" + desc = "It's extra squishy!" + icon = 'icons/obj/watercloset.dmi' + icon_state = "rubberducky_pink" + honk_sound = 'sound/vore/sunesound/pred/insertion_01.ogg' + var/honk_count = 0 + +/obj/item/weapon/bikehorn/rubberducky/pink/attack_self(mob/user as mob) + if(spam_flag == 0) + if(!user.devourable) + to_chat(user, "You can't bring yourself to squeeze it...") + return + spam_flag = 1 + playsound(src, honk_sound, 50, 1) + if(honk_text) + audible_message(span_maroon("[honk_text]")) + src.add_fingerprint(user) + user.drop_item() + user.forceMove(src) + to_chat(user, "You have been swallowed alive by the rubber ducky. Your entire body compacted up and squeezed into the tiny space that makes up the oddly realistic and not at all rubbery stomach. The walls themselves are kneading over you, grinding some sort of fluids into your trapped body. You can even hear the sound of bodily functions echoing around you...") + spawn(20) + spam_flag = 0 + return + +/obj/item/weapon/bikehorn/rubberducky/pink/container_resist(var/mob/living/escapee) + escapee.forceMove(get_turf(src)) + to_chat(escapee, "You managed to crawl out of the rubber ducky!") + +/obj/item/weapon/bikehorn/rubberducky/grey + name = "rubber ducky" + desc = "There's something otherworldly about this particular duck..." + icon = 'icons/obj/watercloset.dmi' + icon_state = "rubberducky_grey" + honk_sound = 'sound/effects/ghost.ogg' + var/honk_count = 0 + +/obj/item/weapon/bikehorn/rubberducky/grey/attack_self(mob/user as mob) + if(spam_flag == 0) + for(var/obj/machinery/light/L in machines) + if(L.z != user.z || get_dist(user,L) > 10) + continue + else + L.flicker(10) + spam_flag = 1 + playsound(src, honk_sound, 50, 1) + if(honk_text) + audible_message(span_maroon("[honk_text]")) + src.add_fingerprint(user) + user.drop_item() + var/turf/T = locate(rand(1, 140), rand(1, 140), user.z) + src.forceMove(T) + return + +/obj/item/weapon/bikehorn/rubberducky/green + name = "rubber ducky" + desc = "Like a true Nature’s child, we were born, born to be wild." + icon = 'icons/obj/watercloset.dmi' + icon_state = "rubberducky_green" + honk_sound = 'sound/arcade/mana.ogg' + var/honk_count = 0 + var/list/flora = list(/obj/structure/flora/ausbushes, + /obj/structure/flora/ausbushes/reedbush, + /obj/structure/flora/ausbushes/leafybush, + /obj/structure/flora/ausbushes/palebush, + /obj/structure/flora/ausbushes/stalkybush, + /obj/structure/flora/ausbushes/grassybush, + /obj/structure/flora/ausbushes/fernybush, + /obj/structure/flora/ausbushes/sunnybush, + /obj/structure/flora/ausbushes/genericbush, + /obj/structure/flora/ausbushes/pointybush, + /obj/structure/flora/ausbushes/lavendergrass, + /obj/structure/flora/ausbushes/ywflowers, + /obj/structure/flora/ausbushes/brflowers, + /obj/structure/flora/ausbushes/ppflowers, + /obj/structure/flora/ausbushes/sparsegrass, + /obj/structure/flora/ausbushes/fullgrass) + +/obj/item/weapon/bikehorn/rubberducky/green/attack_self(mob/user as mob) + if(spam_flag == 0) + var/turf/simulated/whereweare = get_turf(src) + var/obj/P = pick(flora) + new P(whereweare) + spam_flag = 1 + playsound(src, honk_sound, 50, 1) + if(honk_text) + audible_message(span_maroon("[honk_text]")) src.add_fingerprint(user) spawn(20) spam_flag = 0 @@ -354,6 +462,8 @@ lightning_strike(get_turf(src), 1) spam_flag = 1 playsound(src, honk_sound, 50, 1) + if(honk_text) + audible_message(span_maroon("[honk_text]")) src.add_fingerprint(user) spawn(20) spam_flag = 0 //leaving this in incase it doesn't qdel somehow @@ -366,6 +476,7 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "rubberducky_black" det_time = 20 + var/honk_text = 0 /obj/item/weapon/grenade/anti_photon/rubberducky/black/detonate() playsound(src, 'sound/voice/quack.ogg', 50, 1, 5) @@ -380,6 +491,8 @@ spawn(210) ..() playsound(src, 'sound/voice/quack.ogg', 50, 1, 5) + if(honk_text) + audible_message(span_maroon("[honk_text]")) qdel(src) /obj/structure/sink diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index fa4f4a7e27..2b601144ac 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -301,9 +301,10 @@ // Called when turf is hit by a thrown object /turf/hitby(atom/movable/AM as mob|obj, var/speed) - if(src.density) - spawn(2) - step(AM, turn(AM.last_move, 180)) + if(density) + if(!has_gravity(AM)) //Checked a different codebase for reference. Turns out it's only supposed to happen in no-gravity + spawn(2) + step(AM, turn(AM.last_move, 180)) //This makes it float away after hitting a wall in 0G if(isliving(AM)) var/mob/living/M = AM M.turf_collision(src, speed) diff --git a/code/modules/admin/admin_verb_lists_vr.dm b/code/modules/admin/admin_verb_lists_vr.dm index ecc9b3f024..40b96f9c6e 100644 --- a/code/modules/admin/admin_verb_lists_vr.dm +++ b/code/modules/admin/admin_verb_lists_vr.dm @@ -195,7 +195,8 @@ var/list/admin_verbs_spawn = list( /client/proc/map_template_load, /client/proc/map_template_upload, /client/proc/map_template_load_on_new_z, - /client/proc/eventkit_open_mob_spawner //VOREStation Add + /client/proc/eventkit_open_mob_spawner, + /client/proc/generic_structure //VOREStation Add ) var/list/admin_verbs_server = list( diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm index 283c6a5031..ef5987e4be 100644 --- a/code/modules/admin/verbs/buildmode.dm +++ b/code/modules/admin/verbs/buildmode.dm @@ -7,8 +7,9 @@ #define BUILDMODE_CONTENTS 7 #define BUILDMODE_LIGHTS 8 #define BUILDMODE_AI 9 +#define BUILDMODE_DROP 10 -#define LAST_BUILDMODE 9 +#define LAST_BUILDMODE 10 /proc/togglebuildmode(mob/M as mob in player_list) set name = "Toggle Build Mode" @@ -171,6 +172,16 @@ Right Mouse Button + shift on tile = Command selected mobs to reposition to tile (will not be interrupted by enemies)
\ Right Mouse Button + alt on obj/turfs = Command selected mobs to attack obj/turf
\ ***********************************************************") + + if(BUILDMODE_DROP) + to_chat(usr, "***********************************************************
\ + Right Mouse Button on buildmode button = Set object type
\ + Middle Mouse Button on buildmode button= On/Off object type saying
\ + Middle Mouse Button on turf/obj = Capture object type
\ + Left Mouse Button on turf/obj = Drop objects safely
\ + Right Mouse Button = Drop objects unsafely
\ + Mouse Button + ctrl = Copy object type

\ + ***********************************************************") return 1 /obj/effect/bmode/buildquit @@ -315,6 +326,8 @@ var/input = input(usr, "New light color.","Light Maker",3) as null|color if(input) new_light_color = input + if(BUILDMODE_DROP) + objholder = get_path_from_partial_text() return 1 /proc/build_click(var/mob/user, buildmode, params, var/obj/object) @@ -637,6 +650,27 @@ flick_overlay(orderimage, list(user.client), 8, TRUE) return + + if(BUILDMODE_DROP) + if(ispath(holder.buildmode.objholder,/turf)) + to_chat(user, "Cannot use turfs with this mode.") + return + if(pa.Find("left") && !pa.Find("ctrl")) + if(ispath(holder.buildmode.objholder)) + var/obj/effect/falling_effect/FE = new /obj/effect/falling_effect(get_turf(object), holder.buildmode.objholder) + FE.crushing = FALSE + else if(pa.Find("right")) + if(ispath(holder.buildmode.objholder)) + var/obj/effect/falling_effect/FE = new /obj/effect/falling_effect(get_turf(object), holder.buildmode.objholder) + FE.crushing = TRUE + else if(pa.Find("ctrl")) + holder.buildmode.objholder = object.type + to_chat(user, "[object]([object.type]) copied to buildmode.") + if(pa.Find("middle")) + holder.buildmode.objholder = text2path("[object.type]") + if(holder.buildmode.objsay) + to_chat(usr, "[object.type]") + /proc/build_drag(var/client/user, buildmode, var/atom/fromatom, var/atom/toatom, var/atom/fromloc, var/atom/toloc, var/fromcontrol, var/tocontrol, params) var/obj/effect/bmode/buildholder/holder = null for(var/obj/effect/bmode/buildholder/H) diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index b5b12caa89..d09aa71fa3 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -247,11 +247,14 @@ void = new() screen += void + //disabled because we don't use the ingame changelog system any more + /* if((prefs.lastchangelog != changelog_hash) && isnewplayer(src.mob)) //bolds the changelog button on the interface so we know there are updates. to_chat(src, "You have unread updates in the changelog.") winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold") if(config.aggressive_changelog) src.changes() + */ if(config.paranoia_logging) var/alert = FALSE //VOREStation Edit start. diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index b33965dcd1..c6f689e4cc 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -180,3 +180,41 @@ Talon pin "security-technician replikant chestplate" = /obj/item/clothing/accessory/replika/star ) gear_tweaks += new/datum/gear_tweak/path(replika_vests) + +/datum/gear/accessory/insignia + display_name = "Insignia Selection" + path = /obj/item/clothing/accessory/solgov/department + +/datum/gear/accessory/insignia/New() + ..() + var/insignia = list( + "Command - Crew" = /obj/item/clothing/accessory/solgov/department/command, + "Command - Crew Short" = /obj/item/clothing/accessory/solgov/department/command/service, + "Command - Bands" = /obj/item/clothing/accessory/solgov/department/command/fleet, + "Command - Echelons" = /obj/item/clothing/accessory/solgov/department/command/army, + "Security - Crew" = /obj/item/clothing/accessory/solgov/department/security, + "Security - Crew Short" = /obj/item/clothing/accessory/solgov/department/security/service, + "Security - Bands" = /obj/item/clothing/accessory/solgov/department/security/fleet, + "Security - Echelons" = /obj/item/clothing/accessory/solgov/department/security/army, + "Medical - Crew" = /obj/item/clothing/accessory/solgov/department/medical, + "Medical - Crew Short" = /obj/item/clothing/accessory/solgov/department/medical/service, + "Medical - Bands" = /obj/item/clothing/accessory/solgov/department/medical/fleet, + "Medical - Echelons" = /obj/item/clothing/accessory/solgov/department/medical/army, + "Science - Crew" = /obj/item/clothing/accessory/solgov/department/research, + "Science - Crew Short" = /obj/item/clothing/accessory/solgov/department/research/service, + "Science - Bands" = /obj/item/clothing/accessory/solgov/department/research/fleet, + "Science - Echelons" = /obj/item/clothing/accessory/solgov/department/research/army, + "Engineering - Crew" = /obj/item/clothing/accessory/solgov/department/engineering, + "Engineering - Crew Short" = /obj/item/clothing/accessory/solgov/department/engineering/service, + "Engineering - Bands" = /obj/item/clothing/accessory/solgov/department/engineering/fleet, + "Engineering - Echelons" = /obj/item/clothing/accessory/solgov/department/engineering/army, + "Supply - Crew" = /obj/item/clothing/accessory/solgov/department/supply, + "Supply - Crew Short" = /obj/item/clothing/accessory/solgov/department/supply/service, + "Supply - Bands" = /obj/item/clothing/accessory/solgov/department/supply/fleet, + "Supply - Echelons" = /obj/item/clothing/accessory/solgov/department/supply/army, + "Service - Crew" = /obj/item/clothing/accessory/solgov/department/service, + "Service - Crew Short" = /obj/item/clothing/accessory/solgov/department/service/service, + "Service - Bands" = /obj/item/clothing/accessory/solgov/department/service/fleet, + "Service - Echelons" = /obj/item/clothing/accessory/solgov/department/service/army + ) + gear_tweaks += new/datum/gear_tweak/path(insignia) diff --git a/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm b/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm index 2d5e732d50..5e56cca10e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm @@ -157,6 +157,27 @@ ) gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) +/datum/gear/uniform/undersuit + display_name = "Civilian - Void Undersuits" + description = "Select from a range of void undersuits. Each is breathable, sleek, and has standard induction ports. Security, Engineering, and Command variants can be found under the standard uniform selectors for those departments." + path = /obj/item/clothing/under/undersuit/ + sort_category = "Uniforms" + cost = 1 + +/datum/gear/uniform/undersuit/New() + ..() + var/list/suits = list() + var/list/blacklisted_types = list(/obj/item/clothing/under/undersuit/sec, + /obj/item/clothing/under/undersuit/sec/hos, + /obj/item/clothing/under/undersuit/hazard, + /obj/item/clothing/under/undersuit/command, + /obj/item/clothing/under/undersuit/centcom) + for(var/obj/item/clothing/under/undersuit/undersuit_type as anything in typesof(/obj/item/clothing/under/undersuit)) + if(undersuit_type in blacklisted_types) + continue + suits[initial(undersuit_type.name)] = undersuit_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(suits)) + //Security /datum/gear/uniform/security_selector diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 8a58b7e86b..0b250ec9cd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -122,25 +122,6 @@ Talon jumpsuit ) gear_tweaks += new/datum/gear_tweak/path(dresses) -// undersuits -/datum/gear/uniform/undersuit - display_name = "undersuit selection" - path = /obj/item/clothing/under/undersuit/ - -/datum/gear/uniform/undersuit/New() - ..() - var/list/suits = list() - var/list/blacklisted_types = list(/obj/item/clothing/under/undersuit/sec, - /obj/item/clothing/under/undersuit/sec/hos, - /obj/item/clothing/under/undersuit/hazard, - /obj/item/clothing/under/undersuit/command, - /obj/item/clothing/under/undersuit/centcom) - for(var/obj/item/clothing/under/undersuit/undersuit_type as anything in typesof(/obj/item/clothing/under/undersuit)) - if(undersuit_type in blacklisted_types) - continue - suits[initial(undersuit_type.name)] = undersuit_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(suits)) - //Altevian Uniforms /datum/gear/uniform/altevian description = "A comfortable set of clothing for people to handle their day to day work around the fleets with little to no discomfort." diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index 14b0775363..644bc955dc 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/code/modules/client/preference_setup/vore/07_traits.dm @@ -607,6 +607,8 @@ var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","s break varconflict for(var/V in instance.var_changes) + if(V == "flags") + continue if(V in instance_test.var_changes) conflict = instance_test.name break varconflict diff --git a/code/modules/clothing/under/accessories/torch.dm b/code/modules/clothing/under/accessories/torch.dm index 6965056059..1bdac7a80f 100644 --- a/code/modules/clothing/under/accessories/torch.dm +++ b/code/modules/clothing/under/accessories/torch.dm @@ -292,7 +292,7 @@ department tags **************/ /obj/item/clothing/accessory/solgov/department name = "department insignia" - desc = "Insignia denoting assignment to a department. These appear blank." + desc = "Insignia denoting assignment to a department." icon_state = "dept_exped" on_rolled = list("down" = "none", "rolled" = "dept_exped_sleeves") slot = ACCESSORY_SLOT_DEPT @@ -300,7 +300,7 @@ department tags /obj/item/clothing/accessory/solgov/department/command name = "command insignia" - desc = "Insignia denoting assignment to the command department. These fit Expeditionary Corps uniforms." + desc = "Insignia denoting assignment to the command department." color = "#e5ea4f" /obj/item/clothing/accessory/solgov/department/command/service @@ -312,17 +312,15 @@ department tags /obj/item/clothing/accessory/solgov/department/command/fleet icon_state = "dept_fleet" - desc = "Insignia denoting assignment to the command department. These fit Fleet uniforms." on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none") /obj/item/clothing/accessory/solgov/department/command/army icon_state = "dept_army" - desc = "Insignia denoting assignment to the command department. These fit Marine uniforms." on_rolled = list("down" = "none") /obj/item/clothing/accessory/solgov/department/engineering name = "engineering insignia" - desc = "Insignia denoting assignment to the engineering department. These fit Expeditionary Corps uniforms." + desc = "Insignia denoting assignment to the engineering department." color = "#ff7f00" /obj/item/clothing/accessory/solgov/department/engineering/service @@ -333,17 +331,15 @@ department tags /obj/item/clothing/accessory/solgov/department/engineering/fleet icon_state = "dept_fleet" - desc = "Insignia denoting assignment to the engineering department. These fit Fleet uniforms." on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none") /obj/item/clothing/accessory/solgov/department/engineering/army icon_state = "dept_army" - desc = "Insignia denoting assignment to the engineering department. These fit Marine uniforms." on_rolled = list("down" = "none") /obj/item/clothing/accessory/solgov/department/security name = "security insignia" - desc = "Insignia denoting assignment to the security department. These fit Expeditionary Corps uniforms." + desc = "Insignia denoting assignment to the security department." color = "#bf0000" /obj/item/clothing/accessory/solgov/department/security/service @@ -355,17 +351,15 @@ department tags /obj/item/clothing/accessory/solgov/department/security/fleet icon_state = "dept_fleet" - desc = "Insignia denoting assignment to the security department. These fit Fleet uniforms." on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none") /obj/item/clothing/accessory/solgov/department/security/army icon_state = "dept_army" - desc = "Insignia denoting assignment to the security department. These fit Marine uniforms." on_rolled = list("down" = "none") /obj/item/clothing/accessory/solgov/department/medical name = "medical insignia" - desc = "Insignia denoting assignment to the medical department. These fit Expeditionary Corps uniforms." + desc = "Insignia denoting assignment to the medical department." color = "#4c9ce4" /obj/item/clothing/accessory/solgov/department/medical/service @@ -378,17 +372,15 @@ department tags /obj/item/clothing/accessory/solgov/department/medical/fleet icon_state = "dept_fleet" - desc = "Insignia denoting assignment to the medical department. These fit Fleet uniforms." on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none") /obj/item/clothing/accessory/solgov/department/medical/army icon_state = "dept_army" - desc = "Insignia denoting assignment to the medical department. These fit Marine uniforms." on_rolled = list("down" = "none") /obj/item/clothing/accessory/solgov/department/supply name = "supply insignia" - desc = "Insignia denoting assignment to the supply department. These fit Expeditionary Corps uniforms." + desc = "Insignia denoting assignment to the supply department." color = "#bb9042" /obj/item/clothing/accessory/solgov/department/supply/service @@ -400,17 +392,15 @@ department tags /obj/item/clothing/accessory/solgov/department/supply/fleet icon_state = "dept_fleet" - desc = "Insignia denoting assignment to the supply department. These fit Fleet uniforms." on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none") /obj/item/clothing/accessory/solgov/department/supply/army icon_state = "dept_army" - desc = "Insignia denoting assignment to the supply department. These fit Marine uniforms." on_rolled = list("down" = "none") /obj/item/clothing/accessory/solgov/department/service name = "service insignia" - desc = "Insignia denoting assignment to the service department. These fit Expeditionary Corps uniforms." + desc = "Insignia denoting assignment to the service department." color = "#6eaa2c" /obj/item/clothing/accessory/solgov/department/service/service @@ -422,17 +412,15 @@ department tags /obj/item/clothing/accessory/solgov/department/service/fleet icon_state = "dept_fleet" - desc = "Insignia denoting assignment to the service department. These fit Fleet uniforms." on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none") /obj/item/clothing/accessory/solgov/department/service/army icon_state = "dept_army" - desc = "Insignia denoting assignment to the service department. These fit Marine uniforms." on_rolled = list("down" = "none") /obj/item/clothing/accessory/solgov/department/exploration name = "exploration insignia" - desc = "Insignia denoting assignment to the exploration department. These fit Expeditionary Corps uniforms." + desc = "Insignia denoting assignment to the exploration department." color = "#68099e" /obj/item/clothing/accessory/solgov/department/exploration/service @@ -443,17 +431,15 @@ department tags /obj/item/clothing/accessory/solgov/department/exploration/fleet icon_state = "dept_fleet" - desc = "Insignia denoting assignment to the exploration department. These fit Fleet uniforms." on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none") /obj/item/clothing/accessory/solgov/department/exploration/army icon_state = "dept_army" - desc = "Insignia denoting assignment to the exploration department. These fit Marine uniforms." on_rolled = list("down" = "none") /obj/item/clothing/accessory/solgov/department/research name = "research insignia" - desc = "Insignia denoting assignment to the research department. These fit Expeditionary Corps uniforms." + desc = "Insignia denoting assignment to the research department." color = "#68099e" /obj/item/clothing/accessory/solgov/department/research/service @@ -463,6 +449,14 @@ department tags icon_state = "dept_exped_jumper" color = "#916f8d" +/obj/item/clothing/accessory/solgov/department/research/fleet + icon_state = "dept_fleet" + on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none") + +/obj/item/clothing/accessory/solgov/department/research/army + icon_state = "dept_army" + on_rolled = list("down" = "none") + /********* ranks - ec *********/ diff --git a/code/modules/clothing/under/eva_bodysuits.dm b/code/modules/clothing/under/eva_bodysuits.dm new file mode 100644 index 0000000000..8b77595f9f --- /dev/null +++ b/code/modules/clothing/under/eva_bodysuits.dm @@ -0,0 +1,89 @@ +/obj/item/clothing/under/undersuit // undersuits! intended for wearing under hardsuits or for being too lazy to not wear anything other than it + name = "undersuit" + desc = "A nondescript undersuit, intended for wearing under a voidsuit or other EVA equipment. Breathable, yet sleek." + icon = 'icons/inventory/uniform/item_vr.dmi' + default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi' + rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi' + icon_state = "bodysuit" + item_state = "bodysuit" + rolled_sleeves = -1 + rolled_down_icon_override = FALSE + +/obj/item/clothing/under/undersuit/eva + name = "EVA undersuit" + desc = "A nondescript undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for EVA usage, but differs little from the standard." + icon_state = "bodysuit_eva" + item_state = "bodysuit_eva" + +/obj/item/clothing/under/undersuit/command + name = "command undersuit" + desc = "A fancy undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for those in Command, and comes with a swanky gold trim and navy blue inlay." + icon_state = "bodysuit_com" + item_state = "bodysuit_com" + +/obj/item/clothing/under/undersuit/sec + name = "security undersuit" + desc = "A reinforced undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for those in Security, and has slight protective capabilities against simple melee attacks." + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + siemens_coefficient = 0.9 + icon_state = "bodysuit_sec" + item_state = "bodysuit_sec" + +/obj/item/clothing/under/undersuit/sec/hos + name = "security command undersuit" + desc = "A reinforced undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for the Head of Security or equivalent, and has slight protective capabilities against simple melee attacks." + icon_state = "bodysuit_seccom" + item_state = "bodysuit_seccom" + +/obj/item/clothing/under/undersuit/hazard + name = "hazard undersuit" + desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Engineering crew, and comes with slight radiation absorption capabilities. Not a lot, but it's there." + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) + icon_state = "bodysuit_haz" + item_state = "bodysuit_haz" + +/obj/item/clothing/under/undersuit/mining + name = "mining undersuit" + desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Mining crew, and comes with an interestingly colored trim." + icon_state = "bodysuit_min" + item_state = "bodysuit_min" + +/obj/item/clothing/under/undersuit/emt + name = "medical technician undersuit" + desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Medical response crew, and comes with a distinctive coloring scheme." + icon_state = "bodysuit_emt" + item_state = "bodysuit_emt" + +/obj/item/clothing/under/undersuit/explo + name = "exploration undersuit" + desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Exploration crew, for hazardous environments." + icon_state = "bodysuit_exp" + item_state = "bodysuit_exp" + +/obj/item/clothing/under/undersuit/centcom + name = "Central Command undersuit" + desc = "A very descript undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for NanoTrasen Central Command officers, and comes with a swanky gold trim and other fancy markings." + icon_state = "bodysuit_cent" + item_state = "bodysuit_cent" + +/obj/item/clothing/under/undersuit/alt + name = "alternate undersuit" + desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This basic version is a sleek onyx grey comes with the standard induction ports." + icon_state = "altbodysuit" + item_state = "altbodysuit" + +/obj/item/clothing/under/undersuit/alt/sleeveless + name = "alternate undersuit, sleeveless" + desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one is designed to stop at the mid-bicep, allowing total freedom to the wearer's forearms." + item_state = "altbodysuit_sleeveless" + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/under/undersuit/alt/fem + name = "alternate undersuit, feminine" + desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This basic version is a sleek onyx grey comes with the standard induction ports." + item_state = "altbodysuitfem" + +/obj/item/clothing/under/undersuit/alt/sleeveless/fem + name = "alternate undersuit, feminine sleeveless" + desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one is designed to stop at the mid-bicep, allowing total freedom to the wearer's forearms." + item_state = "altbodysuitfem_sleeveless" diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index bbc7ee457a..051fcd68e9 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -326,75 +326,6 @@ rolled_down = -1 body_parts_covered = UPPER_TORSO // frankly this thing's a fucking embarassment -/obj/item/clothing/under/undersuit // undersuits! intended for wearing under hardsuits or for being too lazy to not wear anything other than it - name = "undersuit" - desc = "A nondescript undersuit, intended for wearing under a voidsuit or other EVA equipment. Breathable, yet sleek." - icon = 'icons/inventory/uniform/item_vr.dmi' - default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi' - rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi' - icon_state = "bodysuit" - item_state = "bodysuit" - rolled_sleeves = -1 - rolled_down_icon_override = FALSE - -/obj/item/clothing/under/undersuit/eva - name = "EVA undersuit" - desc = "A nondescript undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for EVA usage, but differs little from the standard." - icon_state = "bodysuit_eva" - item_state = "bodysuit_eva" - -/obj/item/clothing/under/undersuit/command - name = "command undersuit" - desc = "A fancy undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for those in Command, and comes with a swanky gold trim and navy blue inlay." - icon_state = "bodysuit_com" - item_state = "bodysuit_com" - -/obj/item/clothing/under/undersuit/sec - name = "security undersuit" - desc = "A reinforced undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for those in Security, and has slight protective capabilities against simple melee attacks." - armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - siemens_coefficient = 0.9 - icon_state = "bodysuit_sec" - item_state = "bodysuit_sec" - -/obj/item/clothing/under/undersuit/sec/hos - name = "security command undersuit" - desc = "A reinforced undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for the Head of Security or equivalent, and has slight protective capabilities against simple melee attacks." - icon_state = "bodysuit_seccom" - item_state = "bodysuit_seccom" - -/obj/item/clothing/under/undersuit/hazard - name = "hazard undersuit" - desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Engineering crew, and comes with slight radiation absorption capabilities. Not a lot, but it's there." - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) - icon_state = "bodysuit_haz" - item_state = "bodysuit_haz" - -/obj/item/clothing/under/undersuit/mining - name = "mining undersuit" - desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Mining crew, and comes with an interestingly colored trim." - icon_state = "bodysuit_min" - item_state = "bodysuit_min" - -/obj/item/clothing/under/undersuit/emt - name = "medical technician undersuit" - desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Medical response crew, and comes with a distinctive coloring scheme." - icon_state = "bodysuit_emt" - item_state = "bodysuit_emt" - -/obj/item/clothing/under/undersuit/explo - name = "exploration undersuit" - desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Exploration crew, for hazardous environments." - icon_state = "bodysuit_exp" - item_state = "bodysuit_exp" - -/obj/item/clothing/under/undersuit/centcom - name = "Central Command undersuit" - desc = "A very descript undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for NanoTrasen Central Command officers, and comes with a swanky gold trim and other fancy markings." - icon_state = "bodysuit_cent" - item_state = "bodysuit_cent" - - //FEMININE JUMPSUITS. /obj/item/clothing/under/color/fjumpsuit //They won't see this so we can make it whatever we want. name = "blue feminine jumpsuit" diff --git a/code/modules/eventkit/generic_objects/generic_structure.dm b/code/modules/eventkit/generic_objects/generic_structure.dm new file mode 100644 index 0000000000..d7be876bdb --- /dev/null +++ b/code/modules/eventkit/generic_objects/generic_structure.dm @@ -0,0 +1,245 @@ +/obj/structure/generic_structure + name = "unusual object" + desc = "An unusual object of some sort." + icon = 'icons/obj/props/decor.dmi' + icon_state = "bsb_off" + anchored = 1 + density = 1 + climbable = 0 + breakable = 0 + var/on = 0 + var/icon_state_off = "bsb_off" + var/icon_state_on = "bsb_on" + var/wrenchable = 0 + var/activatable_hand = 1 + var/togglable = 1 + var/text_activated = "The strucutre turns on." + var/text_deactivated = "The structure turns off." + var/effect = 0 + var/sound_activated = 0 + var/delay_time = 0 + +/obj/structure/generic_structure/attack_hand(mob/user) + if(activatable_hand) + if(!on) + if(delay_time) + if(!do_after(user, delay_time, src, exclusive = TASK_USER_EXCLUSIVE)) + return 0 + on = 1 + icon_state = icon_state_on + src.visible_message("[text_activated]") + update_icon() + if(effect) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(3, 1, src) + s.start() + if(sound_activated) + playsound(src, sound_activated, 50, 1) + else if(togglable) + if(delay_time) + if(!do_after(user, delay_time, src, exclusive = TASK_USER_EXCLUSIVE)) + return 0 + on = 0 + icon_state = icon_state_off + src.visible_message("[text_deactivated]") + update_icon() + return ..() + +/obj/structure/generic_structure/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(wrenchable && W.has_tool_quality(TOOL_WRENCH)) + add_fingerprint(user) + anchored = !anchored + to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + +/client/proc/generic_structure() + set category = "EventKit" + set name = "Spawn Generic Structure" + set desc = "Spawn a customisable structure with a range of different options." + + var/s_wrenchable = 0 + var/s_anchored = 0 + var/s_density = 0 + var/s_activatable = 0 + var/s_togglable = 0 + var/s_icon_state_on = 0 + var/s_delay = 0 + var/s_text_activated = 0 + var/s_text_deactivated = 0 + var/s_effect = 0 + var/s_sound = 0 + var/list/icon_state_options = list("bsb_off", + "bsb_on", + "bsc", + "bsc_dust", + "biosyphon", + "von_krabin", + "last_shelter", + "complicator", + "random_radio", + "nt_pedestal0_old", + "nt_pedestal1_old", + "nt_reader_off", + "nt_reader_on", + "nt_biocan", + "nt_optable-idle", + "nt_optable-active", + "nt_obelisk", + "nt_obelisk_on", + "nt_cruciforge", + "nt_cruciforge_start", + "nt_cruciforge_work", + "nt_solidifier", + "nt_solidifier_on", + "artwork_statue_1", + "artwork_statue_2", + "artwork_statue_3", + "artwork_statue_4", + "artwork_statue_5", + "artwork_statue", + "dominator", + "dominator-broken", + "gel_cocoon", + "tank_broken", + "tank_larva", + "stump", + "conduit_off", + "conduit_spin", + "core_empty", + "core_inactive", + "core_active", + "tradebeacon", + "tradebeacon_active", + "tradebeacon_sending", + "treadebeacon_sending_active", + "smelter", + "smelter-process", + "sorter", + "sorter-process", + "stamper", + "stamper_on", + "tgmc_console1", + "tgmc_console1_on", + "tgmc_console2", + "tgmc_console2_on", + "tgmc_console3", + "tgmc_console3_on", + "tgmc_console4", + "tgmc_console4_on", + "tgmc_console5", + "tgmc_console5_on", + "tgmc_sentry", + "minirocket_pod", + "ob_warhead_1", + "ob_warhead_2", + "ob_warhead_3", + "ob_warhead_4", + "angel") + var/list/sound_options = list('sound/effects/alert.ogg', + 'sound/effects/bamf.ogg', + 'sound/effects/bang.ogg', + 'sound/effects/blobattack.ogg', + 'sound/effects/cascade.ogg', + 'sound/effects/clockcult_gateway_disrupted.ogg', + 'sound/effects/closet_close.ogg', + 'sound/effects/confetti_ball.ogg', + 'sound/effects/deskbell.ogg', + 'sound/effects/EMPulse.ogg', + 'sound/effects/Explosion1.ogg', + 'sound/effects/ghost.ogg', + 'sound/effects/Glassbr1.ogg', + 'sound/effects/lightningshock.ogg', + 'sound/effects/lighton.ogg', + 'sound/effects/magnetclamp.ogg', + 'sound/effects/pai_boot.ogg', + 'sound/effects/pai_login.ogg', + 'sound/effects/pai-restore.ogg', + 'sound/effects/radio_common.ogg', + 'sound/effects/refill.ogg', + 'sound/effects/siren.ogg', + 'sound/effects/smoke.ogg', + 'sound/effects/sparks1.ogg', + 'sound/effects/spray.ogg', + 'sound/effects/squelch1.ogg', + 'sound/effects/supermatter.ogg', + 'sound/effects/Whipcrack.ogg', + 'sound/effects/woodcutting.ogg') + + var/check_togglable + + + if(!holder) + return + + var/s_name = tgui_input_text(src, "Structure Name:", "Name") + var/s_desc = tgui_input_text(src, "Structure Description:", "Description") + var/check_anchored = tgui_alert(src, "Start anchored?", "anchored", list("Yes", "No", "Cancel")) + if(check_anchored == "Cancel") + return + if(check_anchored == "No") + s_anchored = 0 + if(check_anchored == "Yes") + s_anchored = 1 + var/check_density = tgui_alert(src, "Start dense?", "density", list("Yes", "No", "Cancel")) + if(check_density == "Cancel") + return + if(check_density == "No") + s_density = 0 + if(check_density == "Yes") + s_density = 1 + var/check_wrenchable = tgui_alert(src, "Allow it to be fastened and unfastened with a wrench?", "wrenchable", list("Yes", "No", "Cancel")) + if(check_wrenchable == "Cancel") + return + if(check_wrenchable == "No") + s_wrenchable = 0 + if(check_wrenchable == "Yes") + s_wrenchable = 1 + var/s_icon_state_off = tgui_input_list(src, "Choose starting icon state:", "icon_state_off", icon_state_options) + var/check_activatable = tgui_alert(src, "Allow it to be turned on?", "activatable", list("Yes", "No", "Cancel")) + if(check_activatable == "Cancel") + return + if(check_activatable == "No") + s_activatable = 0 + if(check_activatable == "Yes") + s_activatable = 1 + s_text_activated = tgui_input_text(src, "Activation text:", "Activation Text") + check_togglable = tgui_alert(src, "Allow it to be turned back off again?", "togglable", list("Yes", "No", "Cancel")) + if(check_togglable == "Cancel") + return + if(check_togglable == "No") + s_togglable = 0 + if(check_togglable == "Yes") + s_text_deactivated = tgui_input_text(src, "Deactivation text:", "Deactivation Text") + s_togglable = 1 + s_icon_state_on = tgui_input_list(src, "Choose activated icon state:", "icon_state_on", icon_state_options) + s_delay = tgui_input_number(src, "Do you want it to take time to put turn on? Choose a number of deciseconds to activate, or 0 for instant.", "Delay") + var/check_effect = tgui_alert(src, "Spark when turning on?", "Spark?", list("Yes", "No", "Cancel")) + if(check_effect == "Cancel") + return + if(check_effect == "No") + s_effect = 0 + if(check_effect == "Yes") + s_effect = 1 + var/check_sound = tgui_alert(src, "Play a sound when turning on?", "Sound", list("Yes", "No", "Cancel")) + if(check_sound == "Cancel") + return + if(check_sound == "Yes") + s_sound = tgui_input_list(src, "Choose a sound to play on activation:", "Sound", sound_options) + + var/spawnloc = get_turf(src.mob) + var/obj/structure/generic_structure/P = new(spawnloc) + P.name = s_name + P.desc = s_desc + P.anchored = s_anchored + P.density = s_density + P.icon_state_off = s_icon_state_off + P.icon_state_on = s_icon_state_on + P.wrenchable = s_wrenchable + P.activatable_hand = s_activatable + P.togglable = s_togglable + P.text_activated = s_text_activated + P.text_deactivated = s_text_deactivated + P.effect = s_effect + P.sound_activated = s_sound + P.delay_time = s_delay + P.update_icon() + diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index ede94cab06..674c470e5b 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1622,6 +1622,12 @@ /mob/living/carbon/human/can_feel_pain(var/obj/item/organ/check_organ) if(isSynthetic()) return 0 + //RS ADD START + if(!digest_pain && (isbelly(src.loc) || istype(src.loc, /turf/simulated/floor/water/digestive_enzymes))) + var/obj/belly/b = src.loc + if(b.digest_mode == DM_DIGEST || b.digest_mode == DM_SELECT) + return FALSE + //RS ADD END for(var/datum/modifier/M in modifiers) if(M.pain_immunity == TRUE) return 0 diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index acc4475f6d..83a5fc1d19 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -569,7 +569,7 @@ YW CHANGE STOP*/ cost = 0 custom_only = FALSE var_changes = list("icon_scale_y" = 1.09) - excludes = list(/datum/trait/neutral/tall, /datum/trait/neutral/short, /datum/trait/neutral/shorter) + excludes = list(/datum/trait/neutral/tall, /datum/trait/neutral/tallest, /datum/trait/neutral/short, /datum/trait/neutral/shorter, /datum/trait/neutral/shortest) /datum/trait/neutral/taller/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..() @@ -582,12 +582,25 @@ YW CHANGE STOP*/ cost = 0 custom_only = FALSE var_changes = list("icon_scale_y" = 1.05) - excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/short, /datum/trait/neutral/shorter) + excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/tallest, /datum/trait/neutral/short, /datum/trait/neutral/shorter, /datum/trait/neutral/shortest) /datum/trait/neutral/tall/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..() H.update_transform() +/datum/trait/neutral/tallest + name = "Tall, Major" + desc = "Your body is way taller than average." + sort = TRAIT_SORT_BODYTYPE + cost = 0 + custom_only = FALSE + var_changes = list("icon_scale_y" = 1.15) + excludes = list(/datum/trait/neutral/tall, /datum/trait/neutral/taller, /datum/trait/neutral/short, /datum/trait/neutral/shorter, /datum/trait/neutral/shortest) + +/datum/trait/neutral/tallest/apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..() + H.update_transform() + /datum/trait/neutral/short name = "Short, Minor" desc = "Your body is a bit shorter than average." @@ -595,7 +608,7 @@ YW CHANGE STOP*/ cost = 0 custom_only = FALSE var_changes = list("icon_scale_y" = 0.95) - excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/tall, /datum/trait/neutral/shorter) + excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/tall, /datum/trait/neutral/tallest, /datum/trait/neutral/shorter, /datum/trait/neutral/shortest) /datum/trait/neutral/short/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..() @@ -608,12 +621,25 @@ YW CHANGE STOP*/ cost = 0 custom_only = FALSE var_changes = list("icon_scale_y" = 0.915) - excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/tall, /datum/trait/neutral/short) + excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/tall, /datum/trait/neutral/tallest, /datum/trait/neutral/short, /datum/trait/neutral/shortest) /datum/trait/neutral/shorter/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..() H.update_transform() +/datum/trait/neutral/shortest + name = "Short, Major" + desc = "Your body is way shorter than average." + sort = TRAIT_SORT_BODYTYPE + cost = 0 + custom_only = FALSE + var_changes = list("icon_scale_y" = 0.85) + excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/tall, /datum/trait/neutral/tallest, /datum/trait/neutral/short, /datum/trait/neutral/shorter) + +/datum/trait/neutral/shortest/apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..() + H.update_transform() + /datum/trait/neutral/obese name = "Bulky, Major" desc = "Your body is much wider than average." @@ -713,6 +739,13 @@ YW CHANGE STOP*/ custom_only = FALSE var_changes = list("micro_size_mod" = -0.15) +/datum/trait/neutral/micro_size_down_plus + name = "Light Frame, Major" + desc = "You are considered much smaller than you are for micro interactions." + cost = 0 + custom_only = FALSE + var_changes = list("micro_size_mod" = -0.30) + /datum/trait/neutral/micro_size_up name = "Heavy Frame" desc = "You are considered bigger than you are for micro interactions." @@ -720,6 +753,13 @@ YW CHANGE STOP*/ custom_only = FALSE var_changes = list("micro_size_mod" = 0.15) +/datum/trait/neutral/micro_size_up_plus + name = "Heavy Frame, Major" + desc = "You are considered much bigger than you are for micro interactions." + cost = 0 + custom_only = FALSE + var_changes = list("micro_size_mod" = 0.30) + /datum/trait/neutral/digestion_value_up name = "Highly Filling" desc = "You provide notably more nutrition to anyone who makes a meal of you." diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index ac51e54c26..1e348d94ec 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -370,7 +370,9 @@ //This is called when the mob is thrown into a dense turf /mob/living/proc/turf_collision(var/turf/T, var/speed) - src.take_organ_damage(speed*5) + src.take_organ_damage(12) // used to be 5 * speed. That's a default of 25 and I dont see anything ever changing the "speed" value. + //src.Weaken(3) // That is absurdly high so im just setting it to a flat 12 with a bit of stun ontop. //Stun is too dangerous + playsound(src, get_sfx("punch"), 50) //ouch sound /mob/living/proc/near_wall(var/direction,var/distance=1) var/turf/T = get_step(get_turf(src),direction) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm index 36dd136e18..229e0430eb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm @@ -40,6 +40,7 @@ drop_vore = client.prefs_vr.drop_vore stumble_vore = client.prefs_vr.stumble_vore slip_vore = client.prefs_vr.slip_vore + digest_pain = client.prefs_vr.digest_pain resizable = client.prefs_vr.resizable show_vore_fx = client.prefs_vr.show_vore_fx diff --git a/code/modules/research/prosfab_designs.dm b/code/modules/research/prosfab_designs.dm index 0a725814d8..a0a5bafc2c 100644 --- a/code/modules/research/prosfab_designs.dm +++ b/code/modules/research/prosfab_designs.dm @@ -512,7 +512,7 @@ // Section for quick access for admins, events and such, but can't be produced. -/datum/design/item/prosfab/robot_upgrade/no_prod/cyborgtoy +/datum/design/item/prosfab/robot_upgrade/no_prod category = list() // We simply do not sort them in /datum/design/item/prosfab/robot_upgrade/no_prod/cyborgtoy diff --git a/code/modules/resleeving/autoresleever.dm b/code/modules/resleeving/autoresleever.dm index 1afd785a65..d6a212e44d 100644 --- a/code/modules/resleeving/autoresleever.dm +++ b/code/modules/resleeving/autoresleever.dm @@ -8,7 +8,7 @@ var/equip_body = FALSE //If true, this will spawn the person with equipment var/default_job = USELESS_JOB //The job that will be assigned if equip_body is true and the ghost doesn't have a job var/ghost_spawns = FALSE //If true, allows ghosts who haven't been spawned yet to spawn - var/vore_respawn = 15 MINUTES //The time to wait if you died from vore + var/vore_respawn = 5 MINUTES //The time to wait if you died from vore var/respawn = 30 MINUTES //The time to wait if you didn't die from vore var/spawn_slots = -1 //How many people can be spawned from this? If -1 it's unlimited var/spawntype //The kind of mob that will be spawned, if set. diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 13039e94f3..ede83168b9 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -92,6 +92,7 @@ //Handle case: /obj/item/weapon/grab if(istype(I, /obj/item/weapon/grab)) var/obj/item/weapon/grab/G = I + var/mob/living/carbon/victim = G.affecting //Has to be aggressive grab, has to be living click-er and non-silicon grabbed if(G.state >= GRAB_AGGRESSIVE && (isliving(user) && !issilicon(G.affecting))) @@ -101,6 +102,8 @@ ///// If user clicked on themselves if(src == G.assailant && is_vore_predator(src)) + if(istype(victim) && !victim.client && !victim.ai_holder) + log_and_message_admins("[key_name_admin(src)] attempted to eat [key_name_admin(G.affecting)] whilst they were AFK ([G.affecting ? ADMIN_JMP(G.affecting) : "null"])") if(feed_grabbed_to_self(src, G.affecting)) qdel(G) return TRUE @@ -109,6 +112,8 @@ ///// If user clicked on their grabbed target else if((src == G.affecting) && (attacker.a_intent == I_GRAB) && (attacker.zone_sel.selecting == BP_TORSO) && (is_vore_predator(G.affecting))) + if(istype(victim) && !victim.client && !victim.ai_holder) //Check whether the victim is: A carbon mob, has no client, but has a ckey. This should indicate an SSD player. + log_and_message_admins("[key_name_admin(attacker)] attempted to force feed themselves to [key_name_admin(G.affecting)] whilst they were AFK ([G.affecting ? ADMIN_JMP(G.affecting) : "null"])") if(!G.affecting.feeding) to_chat(user, "[G.affecting] isn't willing to be fed.") log_and_message_admins("[key_name_admin(src)] attempted to feed themselves to [key_name_admin(G.affecting)] against their prefs ([G.affecting ? ADMIN_JMP(G.affecting) : "null"])") @@ -122,6 +127,12 @@ ///// If user clicked on anyone else but their grabbed target else if((src != G.affecting) && (src != G.assailant) && (is_vore_predator(src))) + if(istype(victim) && !victim.client && !victim.ai_holder) + log_and_message_admins("[key_name_admin(attacker)] attempted to feed [key_name_admin(G.affecting)] to [key_name_admin(src)] whilst [key_name_admin(G.affecting)] was AFK ([G.affecting ? ADMIN_JMP(G.affecting) : "null"])") + var/mob/living/carbon/victim_fed = src + if(istype(victim_fed) && !victim_fed.client && !victim_fed.ai_holder) + log_and_message_admins("[key_name_admin(attacker)] attempted to feed [key_name_admin(G.affecting)] to [key_name_admin(src)] whilst [key_name_admin(src)] was AFK ([G.affecting ? ADMIN_JMP(G.affecting) : "null"])") + if(!feeding) to_chat(user, "[src] isn't willing to be fed.") log_and_message_admins("[key_name_admin(attacker)] attempted to feed [key_name_admin(G.affecting)] to [key_name_admin(src)] against predator's prefs ([src ? ADMIN_JMP(src) : "null"])") @@ -236,6 +247,7 @@ P.slip_vore = src.slip_vore P.throw_vore = src.throw_vore P.food_vore = src.food_vore + P.digest_pain = src.digest_pain P.stumble_vore = src.stumble_vore P.eating_privacy_global = src.eating_privacy_global @@ -624,6 +636,13 @@ user.update_icon() + var/mob/living/carbon/victim = prey // Check for afk vore + if(istype(victim) && !victim.client && !victim.ai_holder) + log_and_message_admins("[key_name_admin(pred)] ate [key_name_admin(prey)] whilst the prey was AFK ([pred ? ADMIN_JMP(pred) : "null"])") + var/mob/living/carbon/victim_pred = pred // Check for afk vore + if(istype(victim_pred) && !victim_pred.client && !victim_pred.ai_holder) + log_and_message_admins("[key_name_admin(pred)] ate [key_name_admin(prey)] whilst the pred was AFK ([pred ? ADMIN_JMP(pred) : "null"])") + // Inform Admins if(pred == user) add_attack_logs(pred, prey, "Eaten via [belly.name]") diff --git a/code/modules/vore/eating/mob_vr.dm b/code/modules/vore/eating/mob_vr.dm index 62a8c9655c..7567b3beb3 100644 --- a/code/modules/vore/eating/mob_vr.dm +++ b/code/modules/vore/eating/mob_vr.dm @@ -19,6 +19,7 @@ var/drop_vore = TRUE //Enabled by default since you have to enable drop pred/prey to do this anyway var/throw_vore = TRUE //Enabled by default since you have to enable drop pred/prey to do this anyway var/food_vore = TRUE //Enabled by default since you have to enable drop pred/prey to do this anyway + var/digest_pain = TRUE var/can_be_drop_prey = FALSE var/can_be_drop_pred = FALSE var/allow_spontaneous_tf = FALSE // Obviously. diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index 671416df9d..7888cdb010 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -62,6 +62,8 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE var/throw_vore = TRUE var/food_vore = TRUE + var/digest_pain = TRUE + var/resizable = TRUE var/show_vore_fx = TRUE var/step_mechanics_pref = FALSE @@ -185,6 +187,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE food_vore = json_from_file["food_vore"] throw_vore = json_from_file["throw_vore"] stumble_vore = json_from_file["stumble_vore"] + digest_pain = json_from_file["digest_pain"] nutrition_message_visible = json_from_file["nutrition_message_visible"] nutrition_messages = json_from_file["nutrition_messages"] weight_message_visible = json_from_file["weight_message_visible"] @@ -238,6 +241,8 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE stumble_vore = TRUE if(isnull(food_vore)) food_vore = TRUE + if(isnull(digest_pain)) + digest_pain = TRUE if(isnull(nutrition_message_visible)) nutrition_message_visible = TRUE if(isnull(weight_message_visible)) @@ -309,6 +314,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE "stumble_vore" = stumble_vore, "throw_vore" = throw_vore, "food_vore" = food_vore, + "digest_pain" = digest_pain, "nutrition_message_visible" = nutrition_message_visible, "nutrition_messages" = nutrition_messages, "weight_message_visible" = weight_message_visible, diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 9703b537e3..7a4c831831 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -316,6 +316,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", "stumble_vore" = host.stumble_vore, "throw_vore" = host.throw_vore, "food_vore" = host.food_vore, + "digest_pain" = host.digest_pain, "nutrition_message_visible" = host.nutrition_message_visible, "nutrition_messages" = host.nutrition_messages, "weight_message_visible" = host.weight_message_visible, @@ -587,6 +588,10 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", host.food_vore = !host.food_vore unsaved_changes = TRUE return TRUE + if("toggle_digest_pain") + host.digest_pain = !host.digest_pain + unsaved_changes = TRUE + return TRUE if("switch_selective_mode_pref") host.selective_preference = tgui_input_list(usr, "What would you prefer happen to you with selective bellymode?","Selective Bellymode", list(DM_DEFAULT, DM_DIGEST, DM_ABSORB, DM_DRAIN)) if(!(host.selective_preference)) diff --git a/icons/_nanomaps/tether_nanomap_z1.png b/icons/_nanomaps/tether_nanomap_z1.png index f6188b7881..cc281d1432 100644 Binary files a/icons/_nanomaps/tether_nanomap_z1.png and b/icons/_nanomaps/tether_nanomap_z1.png differ diff --git a/icons/_nanomaps/tether_nanomap_z2.png b/icons/_nanomaps/tether_nanomap_z2.png index 53492f77ee..5f1eacdb19 100644 Binary files a/icons/_nanomaps/tether_nanomap_z2.png and b/icons/_nanomaps/tether_nanomap_z2.png differ diff --git a/icons/_nanomaps/tether_nanomap_z3.png b/icons/_nanomaps/tether_nanomap_z3.png index 6ea37bcfa1..bf2d0d1e17 100644 Binary files a/icons/_nanomaps/tether_nanomap_z3.png and b/icons/_nanomaps/tether_nanomap_z3.png differ diff --git a/icons/_nanomaps/tether_nanomap_z4.png b/icons/_nanomaps/tether_nanomap_z4.png index 510d22b3d6..c2623219ee 100644 Binary files a/icons/_nanomaps/tether_nanomap_z4.png and b/icons/_nanomaps/tether_nanomap_z4.png differ diff --git a/icons/inventory/uniform/item_vr.dmi b/icons/inventory/uniform/item_vr.dmi index a5d3708c0a..26b5ff60a3 100644 Binary files a/icons/inventory/uniform/item_vr.dmi and b/icons/inventory/uniform/item_vr.dmi differ diff --git a/icons/inventory/uniform/mob_vr.dmi b/icons/inventory/uniform/mob_vr.dmi index 25b58456e1..90c0f33c65 100644 Binary files a/icons/inventory/uniform/mob_vr.dmi and b/icons/inventory/uniform/mob_vr.dmi differ diff --git a/icons/misc/buildmode.dmi b/icons/misc/buildmode.dmi index 82214656eb..d04de3a520 100644 Binary files a/icons/misc/buildmode.dmi and b/icons/misc/buildmode.dmi differ diff --git a/icons/mob/vore_raptor.dmi b/icons/mob/vore_raptor.dmi index e0a530943f..d5aed62105 100644 Binary files a/icons/mob/vore_raptor.dmi and b/icons/mob/vore_raptor.dmi differ diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi index 6be639fe4c..8aa0a9a9cf 100644 Binary files a/icons/obj/watercloset.dmi and b/icons/obj/watercloset.dmi differ diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index c85879e0a1..408bfb22a3 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -2676,6 +2676,12 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/centsquare) "fQ" = ( @@ -3392,9 +3398,8 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "hv" = ( -/obj/effect/landmark/start/entrepreneur, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/apparel) +/turf/simulated/wall, +/area/groundbase/civilian/entrepreneur) "hw" = ( /obj/structure/cable{ icon_state = "1-2" @@ -6531,7 +6536,6 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/effect/landmark/start/entrepreneur, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) "og" = ( @@ -6668,6 +6672,14 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) +"ow" = ( +/obj/structure/table/hardwoodtable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/item/device/tape, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur/meeting) "ox" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -6736,6 +6748,21 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/office) +"oE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur/meeting) "oF" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 6 @@ -6902,6 +6929,11 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/morgue) +"oW" = ( +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "oX" = ( /obj/structure/bed/chair/wood{ dir = 1 @@ -6959,6 +6991,12 @@ "pc" = ( /turf/simulated/floor/outdoors/grass/seasonal/dark/lowsnow, /area/groundbase/unexplored/outdoors) +"pd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur/meeting) "pe" = ( /obj/machinery/firealarm{ dir = 4 @@ -7307,6 +7345,12 @@ /obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/groundbase/security/warden) +"pZ" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur) "qa" = ( /turf/simulated/wall/r_wall, /area/groundbase/security/iaa1) @@ -7419,6 +7463,22 @@ "qp" = ( /turf/simulated/floor/tiled/white, /area/groundbase/medical/office) +"qq" = ( +/obj/machinery/door/airlock{ + id_tag = "session_room"; + name = "Session Room" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/entrepreneur/session) "qr" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -7550,6 +7610,11 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) +"qH" = ( +/obj/structure/bed/chair/office/light, +/obj/machinery/alarm, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/entrepreneur/session) "qI" = ( /obj/structure/bed/chair/sofa/bench/right{ dir = 8 @@ -7769,6 +7834,21 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/lobby) +"ri" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/level1/westspur) "rj" = ( /obj/structure/table/rack/steel, /obj/item/weapon/circuitboard/rdserver{ @@ -8192,6 +8272,23 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/equipment) +"si" = ( +/obj/structure/closet/walllocker_double/misc_civ/south{ + name = "vanity" + }, +/obj/item/weapon/reagent_containers/glass/bottle/essential_oil, +/obj/item/weapon/entrepreneur/crystal, +/obj/item/weapon/entrepreneur/crystal, +/obj/item/weapon/entrepreneur/crystal, +/obj/item/weapon/entrepreneur/crystal, +/obj/item/weapon/entrepreneur/crystal, +/obj/item/weapon/makeover, +/obj/item/weapon/lipstick/random, +/obj/item/weapon/lipstick/random, +/obj/item/weapon/nailpolish_remover, +/obj/item/weapon/nailpolish, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/entrepreneur/session) "sj" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -8898,6 +8995,22 @@ }, /turf/simulated/floor/outdoors/sidewalk/side, /area/groundbase/level1/centsquare) +"tQ" = ( +/obj/structure/closet/walllocker_double/misc_civ/north{ + name = "streamer equipment" + }, +/obj/item/device/tvcamera/streamer, +/obj/item/device/camera/selfie, +/obj/item/device/camera_film, +/obj/item/device/camera_film, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur) +"tR" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/entrepreneur/session) "tS" = ( /obj/structure/table/rack/shelf/steel, /obj/item/weapon/gun/energy/laser{ @@ -9241,6 +9354,9 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/civilian/bar) +"uE" = ( +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "uF" = ( /obj/structure/table/bench/padded, /obj/machinery/light, @@ -10014,6 +10130,14 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/or1) +"wD" = ( +/obj/structure/reagent_dispensers/water_cooler/full, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/sign/poster{ + dir = 1 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "wE" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -10040,6 +10164,18 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) +"wH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur) "wI" = ( /obj/item/weapon/storage/backpack/parachute{ pixel_x = 4; @@ -10219,6 +10355,13 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/civilian/gateway) +"wW" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur) "wX" = ( /obj/structure/cable{ icon_state = "2-8" @@ -10349,6 +10492,14 @@ }, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, /area/groundbase/level1/southwestspur) +"xl" = ( +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/item/weapon/clipboard, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "xm" = ( /obj/effect/floor_decal/industrial/danger, /obj/machinery/atmospherics/pipe/simple/hidden/black, @@ -10467,6 +10618,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/hall) +"xv" = ( +/obj/machinery/power/apc{ + dir = 8; + nightshift_setting = 2 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur) "xw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, @@ -10545,6 +10711,21 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/womensrestroom) +"xG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "xH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -10841,6 +11022,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/groundbase/engineering/atmos) +"yt" = ( +/obj/structure/flora/pottedplant/flower, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur) "yu" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -11065,6 +11250,13 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/groundbase/security/iaa2) +"yT" = ( +/obj/structure/mirror{ + dir = 4; + pixel_x = -27 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/entrepreneur/session) "yU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11212,6 +11404,9 @@ }, /turf/simulated/wall/r_wall, /area/groundbase/engineering/techstorage) +"zm" = ( +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur/meeting) "zn" = ( /obj/structure/stairs/spawner/north, /turf/simulated/floor/outdoors/sidewalk, @@ -11312,6 +11507,11 @@ }, /turf/simulated/floor/tiled, /area/groundbase/command/tcomms/foyer) +"zA" = ( +/obj/structure/bed/chair/office/dark, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur) "zB" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -11402,6 +11602,18 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/iaa1) +"zL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/entrepreneur/session) "zM" = ( /obj/machinery/power/terminal{ dir = 8 @@ -11422,6 +11634,17 @@ /obj/structure/closet/firecloset/full, /turf/simulated/floor, /area/maintenance/groundbase/trashpit) +"zO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur) "zP" = ( /turf/simulated/floor/tiled/white, /area/groundbase/civilian/mensrestroom) @@ -11695,6 +11918,30 @@ }, /turf/simulated/floor, /area/maintenance/groundbase/trashpit) +"Aw" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor, +/area/groundbase/civilian/entrepreneur) +"Ax" = ( +/obj/machinery/door/airlock/glass{ + name = "Shared Office Space" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/entrepreneur) "Ay" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11846,6 +12093,13 @@ }, /turf/simulated/floor/bmarble, /area/groundbase/civilian/foodplace) +"AR" = ( +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "AS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, @@ -12751,6 +13005,18 @@ }, /turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) +"Da" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "session_room"; + pixel_x = 27; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/entrepreneur/session) "Db" = ( /turf/simulated/floor/outdoors/newdirt, /area/groundbase/level1/southeastspur) @@ -12779,6 +13045,17 @@ outdoors = 0 }, /area/maintenance/groundbase/level1/netunnel) +"Df" = ( +/obj/machinery/power/apc{ + dir = 1; + nightshift_setting = 2 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/alarm, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur/meeting) "Dg" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -13355,6 +13632,18 @@ }, /turf/simulated/floor/lino, /area/groundbase/civilian/bar) +"Ew" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "Ex" = ( /obj/structure/table/standard, /obj/item/weapon/aiModule/reset, @@ -13599,6 +13888,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) +"Fd" = ( +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "meeting_room"; + pixel_x = 27; + specialfunctions = 4 + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur/meeting) "Fe" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -13724,6 +14022,19 @@ /obj/effect/landmark/start/engineer, /turf/simulated/floor/tiled, /area/groundbase/engineering/lobby) +"Fs" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "Ft" = ( /obj/structure/bed/chair/comfy/black, /obj/effect/landmark/start/hos, @@ -13863,6 +14174,12 @@ name = "impassable rock" }, /area/groundbase/level1/nw) +"FM" = ( +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/item/weapon/clipboard, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "FN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13992,6 +14309,15 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/carpet/bcarpet, /area/groundbase/security/briefing) +"Gd" = ( +/obj/structure/table/hardwoodtable, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/item/weapon/paper_bin, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "Ge" = ( /obj/structure/bed/chair/sofa/bench/left{ dir = 8 @@ -14607,6 +14933,24 @@ name = "impassable rock" }, /area/groundbase/level1/southeastspur) +"HA" = ( +/obj/machinery/camera/network/civilian{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur) "HB" = ( /obj/structure/sign/double/barsign{ pixel_y = -32 @@ -14958,6 +15302,12 @@ /obj/machinery/alarm, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos/monitoring) +"Iq" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "Ir" = ( /obj/structure/table/rack/shelf/steel, /obj/item/weapon/gun/energy/ionrifle/pistol, @@ -15157,6 +15507,22 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/centsquare) +"IL" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/junction, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/outdoors/sidewalk, +/area/groundbase/level1/centsquare) "IM" = ( /obj/structure/sign/painting/public{ pixel_y = 30 @@ -15538,6 +15904,21 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/resleeving) +"JK" = ( +/obj/structure/closet{ + name = "meeting room closet" + }, +/obj/item/weapon/entrepreneur/emf, +/obj/item/weapon/entrepreneur/spirit_board, +/obj/item/weapon/entrepreneur/crystal_ball, +/obj/item/weapon/entrepreneur/horoscope, +/obj/item/weapon/entrepreneur/magnifying_glass, +/obj/item/device/camera, +/obj/item/device/taperecorder, +/obj/item/device/tape, +/obj/item/sticky_pad/random, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur/meeting) "JL" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -15625,6 +16006,21 @@ /obj/item/weapon/shield/riot, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) +"JV" = ( +/obj/structure/closet/walllocker_double/misc_civ/south{ + name = "dentistry tools" + }, +/obj/item/device/flashlight/pen, +/obj/item/weapon/entrepreneur/dentist_mirror, +/obj/item/weapon/entrepreneur/dentist_probe, +/obj/item/weapon/entrepreneur/dentist_scaler, +/obj/item/weapon/entrepreneur/dentist_sickle, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -30 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/entrepreneur/session) "JW" = ( /obj/structure/sign/directions/evac{ dir = 1; @@ -15809,6 +16205,26 @@ /obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) +"Kk" = ( +/obj/structure/closet/walllocker_double/misc_civ/west{ + name = "Office Supplies" + }, +/obj/item/weapon/folder, +/obj/item/weapon/folder, +/obj/item/weapon/folder, +/obj/item/weapon/folder, +/obj/item/weapon/folder, +/obj/item/weapon/pen, +/obj/item/weapon/pen, +/obj/item/weapon/pen, +/obj/item/weapon/pen, +/obj/item/weapon/stamp/accepted, +/obj/item/weapon/stamp/denied, +/obj/item/weapon/tape_roll, +/obj/item/weapon/tape_roll, +/obj/item/sticky_pad/random, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur) "Kl" = ( /obj/structure/table/rack/steel, /obj/item/weapon/circuitboard/algae_farm{ @@ -15840,6 +16256,21 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/autoresleeving) +"Kp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/level1/centsquare) "Kq" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/highsecurity{ @@ -15913,6 +16344,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) +"Kz" = ( +/obj/machinery/door/airlock{ + id_tag = "meeting_room"; + name = "Meeting Room" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur/meeting) "KA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -16116,6 +16563,22 @@ outdoors = 0 }, /area/groundbase/level1/eastspur) +"Lc" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "Ld" = ( /obj/structure/table/steel_reinforced, /obj/structure/cable/yellow{ @@ -16372,6 +16835,14 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos) +"LE" = ( +/obj/structure/table/hardwoodtable, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/item/device/flashlight/lamp/green, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur/meeting) "LF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16775,6 +17246,10 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/ce) +"MB" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "MC" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -17406,10 +17881,23 @@ /obj/effect/landmark/start/intern, /turf/simulated/floor/outdoors/newdirt_nograss, /area/groundbase/level1/centsquare) +"Od" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "Oe" = ( /obj/effect/landmark/start/hos, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) +"Of" = ( +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -30 + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur/meeting) "Og" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -17699,6 +18187,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/groundbase/engineering/atmos) +"OV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "OW" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -18259,6 +18754,18 @@ "Qr" = ( /turf/simulated/floor/tiled/dark, /area/security/range) +"Qs" = ( +/obj/structure/table/hardwoodtable, +/obj/item/weapon/paper_bin, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 30 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "Qt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18384,6 +18891,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/groundbase/civilian/arrivals) +"QG" = ( +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/entrepreneur/session) "QH" = ( /obj/structure/table/reinforced, /obj/item/device/sleevemate, @@ -18864,6 +19374,18 @@ }, /turf/simulated/floor, /area/maintenance/groundbase/substation/medcargo) +"RN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur/meeting) "RO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ @@ -18871,6 +19393,17 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/eva) +"RP" = ( +/obj/structure/table/hardwoodtable, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/item/weapon/paper_bin, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "RQ" = ( /obj/structure/cable{ icon_state = "2-8" @@ -18891,15 +19424,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/centsquare) "RS" = ( @@ -19039,6 +19568,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/outdoors/sidewalk, /area/groundbase/level1/centsquare) +"Sk" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "Sl" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -19291,6 +19825,15 @@ outdoors = 0 }, /area/groundbase/security/halls) +"SL" = ( +/obj/structure/table/hardwoodtable, +/obj/item/weapon/paper_bin, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/alarm{ + dir = 8 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "SM" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -19354,6 +19897,13 @@ }, /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/chamber) +"SU" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur/meeting) "SV" = ( /obj/effect/map_effect/portal/line/side_a, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, @@ -19426,6 +19976,12 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/autoresleeving) +"Td" = ( +/obj/structure/filingcabinet{ + pixel_x = -10 + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur/meeting) "Te" = ( /obj/machinery/shower{ dir = 8 @@ -19765,6 +20321,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) +"TP" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "TQ" = ( /obj/machinery/computer/aifixer, /turf/simulated/floor/bluegrid, @@ -19958,6 +20529,26 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, /area/groundbase/security/halls) +"Un" = ( +/obj/structure/closet/walllocker_double/misc_civ/north{ + name = "office equipment" + }, +/obj/item/weapon/storage/briefcase{ + pixel_x = -2; + pixel_y = -5 + }, +/obj/item/weapon/storage/briefcase{ + pixel_x = -2; + pixel_y = -5 + }, +/obj/item/weapon/storage/briefcase{ + pixel_x = -2; + pixel_y = -5 + }, +/obj/item/weapon/storage/toolbox/brass, +/obj/item/device/measuring_tape, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur) "Up" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 1 @@ -20049,6 +20640,9 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) +"UB" = ( +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur) "UC" = ( /obj/machinery/light/small{ dir = 8 @@ -20161,11 +20755,34 @@ "UQ" = ( /turf/simulated/floor/tiled/white, /area/groundbase/medical/morgue) +"UR" = ( +/obj/machinery/power/apc{ + dir = 1; + nightshift_setting = 2 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/bed/chair/office/light, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/entrepreneur/session) "US" = ( /obj/structure/bed/chair/sofa/bench, /obj/effect/landmark/start/visitor, /turf/simulated/floor/outdoors/newdirt_nograss, /area/groundbase/level1/centsquare) +"UT" = ( +/obj/structure/closet{ + name = "session equipment" + }, +/obj/item/roller/massage, +/obj/item/weapon/bedsheet/pillow/exercise, +/obj/item/weapon/bedsheet/pillow/exercise, +/obj/item/weapon/entrepreneur/dumbbell, +/obj/item/weapon/entrepreneur/dumbbell, +/obj/item/clothing/under/pants/yogapants, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/entrepreneur/session) "UU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -20273,6 +20890,18 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/engineering/lobby) +"Vj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur) "Vk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -20492,6 +21121,16 @@ }, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) +"VJ" = ( +/obj/machinery/photocopier{ + pixel_y = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/sign/poster{ + dir = 1 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/groundbase/civilian/entrepreneur) "VK" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -21302,6 +21941,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/groundbase/civilian/arrivals) +"Xy" = ( +/turf/simulated/wall, +/area/groundbase/civilian/entrepreneur/meeting) "Xz" = ( /obj/structure/table/reinforced, /obj/random/tech_supply, @@ -21396,6 +22038,12 @@ /obj/random/coin/sometimes, /turf/simulated/floor/tiled, /area/groundbase/civilian/foodplace) +"XM" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/table/standard, +/obj/item/weapon/reagent_containers/glass/bottle/essential_oil, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/entrepreneur/session) "XN" = ( /turf/simulated/wall/r_wall, /area/groundbase/command/ai/hall) @@ -21595,6 +22243,16 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/northspur) +"Yn" = ( +/obj/structure/bed/chair/office/dark, +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 24 + }, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur) "Yo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21708,6 +22366,15 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/southwestspur) +"YB" = ( +/obj/machinery/disposal/wall{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/entrepreneur) "YC" = ( /turf/simulated/floor/outdoors/newdirt, /area/groundbase/level1/centsquare) @@ -22076,6 +22743,9 @@ /obj/machinery/light, /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/robot) +"Zv" = ( +/turf/simulated/wall, +/area/groundbase/civilian/entrepreneur/session) "Zw" = ( /obj/structure/cable{ icon_state = "4-8" @@ -22235,6 +22905,10 @@ name = "Holodeck Projector Floor" }, /area/holodeck/alphadeck) +"ZQ" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/entrepreneur/session) "ZR" = ( /turf/simulated/floor/outdoors/sidewalk/side, /area/groundbase/level1/northspur) @@ -27625,9 +28299,9 @@ ce Bk Bk Bk -Bk -Bk -Bk +ce +ce +ce ce ce ce @@ -27767,16 +28441,16 @@ Bk Bk Bk Bk -Bk ce -ce -ce -ce -ce -ce -AZ -AZ -AZ +Xy +Xy +Xy +Xy +Xy +Zv +Zv +Zv +Zv AZ AZ cB @@ -27908,17 +28582,17 @@ Bk Bk Bk Bk -Bk -Bk -Bk ce ce -ce -ce -ce -AZ -AZ -AZ +Xy +Of +SU +Td +Xy +UT +yT +JV +Zv AZ AZ cB @@ -28052,15 +28726,15 @@ ce ce ce ce -ce -ce -ce -ce -ce -ce -AZ -AZ -AZ +Xy +zm +ow +LE +Xy +qH +QG +si +Zv AZ AZ OL @@ -28194,15 +28868,15 @@ ce ce ce ce -ce -ce -ce -ce -ce -ce -AZ -AZ -AZ +Xy +Df +oE +pd +Xy +UR +tR +ZQ +Zv AZ AZ AZ @@ -28336,15 +29010,15 @@ ce ce ce ce -ce -ce -ce -ce -ce -ce -AZ -AZ -AZ +Xy +JK +RN +Fd +Xy +XM +zL +Da +Zv AZ AZ AZ @@ -28476,17 +29150,17 @@ Bk Bk ce ce -ce -ce -ce -ce -ce -ce -ce -ce -AZ -AZ -AZ +hv +hv +Xy +Xy +Kz +Xy +Xy +Zv +qq +Zv +Zv AZ AZ cB @@ -28618,16 +29292,16 @@ Bk Bk ce ce -ce -ce -ce -ce -ce -ce -ce -ce -AZ -AZ +hv +VJ +Kk +pZ +wH +xv +HA +zO +Vj +hv AZ AZ AZ @@ -28760,16 +29434,16 @@ Bk ce ce ce -ce -ce -ce -ce -ce -ce -ce -ce -AZ -AZ +hv +wD +UB +UB +Gd +OV +Fs +RP +UB +hv AZ XP RF @@ -28902,16 +29576,16 @@ ce ce ce ce -ce -ce -ce -ce -ce -ce -ce -ce -AZ -AZ +hv +hv +hv +Yn +xl +uE +Ew +oW +wW +hv tN pm VW @@ -29046,14 +29720,14 @@ AZ AZ AZ AZ -AZ -AZ -AZ -AZ -AZ -AZ -AZ -AZ +hv +Un +Od +MB +Lc +Sk +YB +hv tN eT sy @@ -29188,14 +29862,14 @@ AZ AZ AZ AZ -AZ -AZ -AZ -AZ -AZ -AZ -AZ -AZ +hv +zA +AR +uE +TP +FM +wW +hv AZ rs JW @@ -29330,14 +30004,14 @@ AZ Eb Eb AZ -AZ -AZ -AZ -AZ -AZ -AZ -AZ -cB +hv +tQ +Qs +Iq +xG +SL +yt +hv cB cB cB @@ -29472,14 +30146,14 @@ Eb Nv Nv Eb -Eb -cB -cB -cB -cB -cB -cB -cB +hv +Aw +hv +hv +Ax +hv +Aw +hv cB cB cB @@ -29618,7 +30292,7 @@ Nv Nv Nv QD -QD +ri QD QD QD @@ -29760,7 +30434,7 @@ Nv Nv Nv Nv -QD +ri QD cB QD @@ -29902,7 +30576,7 @@ Dt Dt Eb Eb -Eb +Kp Eb cB cB @@ -30044,7 +30718,7 @@ lq Dt rD fP -Uj +IL Uj Uj Uj @@ -33005,7 +33679,7 @@ vi Yx hr pi -hv +Pb vP ye CD @@ -33431,7 +34105,7 @@ hr hr hr bL -hv +Pb rG BS zj @@ -33715,7 +34389,7 @@ qE qE dk Vb -hv +Pb ll ye CD diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index d596a553a5..254efd5cfe 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -11373,6 +11373,12 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) +"FZ" = ( +/turf/simulated/floor{ + edge_blending_priority = -1; + outdoors = 1 + }, +/area/groundbase/level2/westspur) "Ga" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -25506,7 +25512,7 @@ bY bY bY bY -eN +FZ eN eN eN @@ -25641,14 +25647,14 @@ eN eN eN eN -eN -eN -eN -eN -eN -eN -eN -eN +FZ +FZ +FZ +FZ +FZ +FZ +FZ +FZ eN eN eN diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm index 9c72324057..4831ef8750 100644 --- a/maps/groundbase/groundbase_areas.dm +++ b/maps/groundbase/groundbase_areas.dm @@ -429,6 +429,17 @@ lightswitch = 1 forbid_events = TRUE +/area/groundbase/civilian/entrepreneur + name = "\improper Shared Office" + icon_state = "entertainment" + +/area/groundbase/civilian/entrepreneur/session + name = "\improper Shared Office Session Room" + +/area/groundbase/civilian/entrepreneur/meeting + name = "\improper Shared Office Meeting Room" + + /area/groundbase/exploration name = "Exploration" holomap_color = HOLOMAP_AREACOLOR_SCIENCE diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index 8f972f0d41..aa62de3042 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -8124,6 +8124,9 @@ pixel_x = -10; pixel_y = -22 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/talon_v2/medical) "BV" = ( @@ -8144,9 +8147,6 @@ pixel_x = 2; pixel_y = 5 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/closet/walllocker_double/medical/south, /turf/simulated/floor/tiled/white, /area/talon_v2/medical) diff --git a/maps/stellar_delight/stellar_delight1.dmm b/maps/stellar_delight/stellar_delight1.dmm index 15f67ee6a0..afafa0fa2f 100644 --- a/maps/stellar_delight/stellar_delight1.dmm +++ b/maps/stellar_delight/stellar_delight1.dmm @@ -247,13 +247,21 @@ /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "ay" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/table/standard, -/obj/item/device/multitool/station_buffered{ - pixel_y = 2 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "az" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -372,16 +380,8 @@ /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/shuttlebay) "aJ" = ( -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/camera/network/command{ - dir = 4 - }, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/aft) "aK" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -2324,26 +2324,13 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology) "em" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/table/standard, -/obj/item/device/gps{ - pixel_x = 6; - pixel_y = 5 - }, -/obj/item/device/gps{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/device/gps{ - pixel_x = -6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = 6; - pixel_y = -4 +/obj/structure/table/woodentable, +/obj/item/weapon/paper_bin, +/obj/machinery/alarm/angled{ + dir = 8 }, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "en" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -2410,29 +2397,17 @@ /turf/space, /area/space) "eu" = ( -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24; - pixel_y = 32 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 +/obj/structure/table/woodentable, +/obj/structure/closet/walllocker_double/misc_civ/east{ + name = "supernatural supplies" }, +/obj/item/weapon/entrepreneur/spirit_board, +/obj/item/weapon/entrepreneur/emf, +/obj/item/weapon/entrepreneur/crystal_ball, +/obj/item/weapon/entrepreneur/horoscope, +/obj/item/weapon/deck/tarot, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "ev" = ( /obj/machinery/computer/transhuman/resleeving{ dir = 8 @@ -2560,25 +2535,12 @@ /turf/simulated/floor/carpet, /area/library) "eJ" = ( -/obj/structure/table/rack/shelf, -/obj/item/device/radio{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/device/radio{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/item/device/radio{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/device/radio{ - pixel_x = 4; - pixel_y = 5 - }, +/obj/structure/table/woodentable, +/obj/item/weapon/paper_bin, +/obj/item/weapon/storage/briefcase, +/obj/machinery/light, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "eK" = ( /obj/structure/closet/walllocker_double/generic_civ/west, /turf/simulated/floor/carpet/purcarpet, @@ -4201,14 +4163,19 @@ color = "#42038a"; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) @@ -5066,7 +5033,20 @@ /turf/simulated/floor/tiled/steel_grid, /area/assembly/robotics) "jR" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "2-8" + }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) "jT" = ( @@ -5076,6 +5056,19 @@ /obj/effect/landmark/vines, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) +"jU" = ( +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, +/obj/machinery/door/window/brigdoor/eastright{ + req_access = list(5) + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "jV" = ( /obj/machinery/power/terminal{ dir = 4 @@ -5590,6 +5583,23 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/stellardelight/deck1/dorms/dorm6) +"lj" = ( +/obj/structure/table/rack, +/obj/random/contraband, +/obj/random/contraband, +/obj/random/contraband, +/obj/random/maintenance, +/obj/random/maintenance, +/obj/random/maintenance, +/obj/random/maintenance, +/obj/random/maintenance, +/obj/random/maintenance, +/obj/random/maintenance, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck1/exploration) +"lk" = ( +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/entrepreneur) "ll" = ( /obj/machinery/light/small{ dir = 4 @@ -5888,29 +5898,11 @@ /turf/simulated/floor/tiled, /area/rnd/storage) "lO" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "4-8" +/turf/simulated/wall/bay/r_wall{ + desc = "It has a steel stripe! A huge chunk of metal used to seperate rooms."; + stripe_color = "#3d5e80" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock/angled_bay/standard/glass{ - dir = 4; - door_color = "#333333"; - name = "Auxiliary EVA Equipment Room"; - req_one_access = list(18,19,43); - stripe_color = "#5a19a8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "lP" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -6567,18 +6559,19 @@ /turf/simulated/floor/airless, /area/stellardelight/deck1/exterior) "nd" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/expedition_medical, -/obj/item/clothing/head/helmet/space/void/expedition_medical, -/obj/machinery/door/window/brigdoor/eastright{ - req_access = list(5) +/obj/structure/table/woodentable, +/obj/structure/closet/walllocker_double/misc_civ/west{ + name = "personality supplies" }, +/obj/item/device/camera/selfie, +/obj/item/device/tvcamera/streamer, +/obj/item/weapon/makeover, +/obj/item/weapon/nailpolish, +/obj/item/weapon/nailpolish_remover, +/obj/item/weapon/lipstick/random, +/obj/item/weapon/lipstick/random, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "ne" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Exploration Substation Bypass" @@ -7116,12 +7109,10 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "oq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_x = -32 - }, +/obj/machinery/door/airlock/angled_bay/standard/glass, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/explobriefing) +/area/stellardelight/deck1/entrepreneur) "or" = ( /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ @@ -7417,6 +7408,23 @@ }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) +"oV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "oW" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -7463,14 +7471,11 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "pd" = ( -/obj/structure/closet, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor, -/area/maintenance/stellardelight/deck1/exploration) +/obj/effect/landmark{ + name = "lightsout" + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "pe" = ( /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/stellardelight/deck1/miningshuttle) @@ -8024,8 +8029,12 @@ /area/stellardelight/deck1/explobriefing) "ql" = ( /obj/structure/table/woodentable, -/obj/machinery/microwave{ - pixel_y = 7 +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/camera/network/command{ + dir = 4 }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) @@ -8589,6 +8598,15 @@ /turf/simulated/floor/tiled/steel_ridged, /area/maintenance/stellardelight/substation/civilian) "rB" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/window/bay/reinforced, +/obj/structure/low_wall/bay/reinforced/purple, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /obj/structure/cable/green{ color = "#42038a"; icon_state = "4-8" @@ -8596,21 +8614,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock/angled_bay/hatch{ - dir = 4; - door_color = "#ffffff"; - name = "maintenance access"; - req_one_access = null; - stripe_color = "#5a19a8" - }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck1/exploration) +/area/stellardelight/deck1/entrepreneur) "rC" = ( /obj/machinery/power/terminal{ dir = 8 @@ -9230,8 +9235,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/light, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "sP" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Security Substation Bypass" @@ -9268,16 +9274,15 @@ /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/mining) "sT" = ( -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "1-2" +/obj/machinery/camera/network/command{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm/angled{ - dir = 8 +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -25 }, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/explobriefing) +/area/stellardelight/deck1/entrepreneur) "sU" = ( /obj/structure/closet/coffin, /obj/structure/cable/green{ @@ -9370,10 +9375,22 @@ /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck1/portcent) "te" = ( -/obj/machinery/firealarm/angled, -/obj/machinery/chemical_analyzer, +/obj/structure/closet/walllocker_double/misc_civ/north{ + name = "health and wellbeing supplies" + }, +/obj/item/weapon/entrepreneur/dumbbell, +/obj/item/weapon/entrepreneur/dumbbell, +/obj/item/weapon/entrepreneur/crystal, +/obj/item/weapon/entrepreneur/crystal, +/obj/item/weapon/entrepreneur/crystal, +/obj/item/weapon/entrepreneur/crystal, +/obj/item/weapon/entrepreneur/crystal, +/obj/item/weapon/reagent_containers/glass/bottle/essential_oil, +/obj/item/weapon/bedsheet/pillow/exercise, +/obj/item/weapon/bedsheet/pillow/exercise, +/obj/item/roller/massage, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "tf" = ( /obj/structure/closet/wardrobe/robotics_black, /turf/simulated/floor/tiled/dark, @@ -9701,18 +9718,12 @@ /turf/simulated/floor/tiled/dark, /area/security/tactical) "tW" = ( -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/woodentable, +/obj/item/weapon/paper_bin, +/obj/item/weapon/folder, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "tX" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -9765,21 +9776,12 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "uc" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, -/obj/machinery/door/window/brigdoor/eastright{ - req_access = list(43) +/obj/structure/table/woodentable, +/obj/machinery/microwave{ + pixel_y = 7 }, -/obj/item/device/bluespaceradio/sd_prelinked, -/obj/item/device/cataloguer/compact, -/obj/item/device/cataloguer/compact, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "ue" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10217,9 +10219,12 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "ve" = ( -/obj/structure/closet/emcloset, -/turf/simulated/floor, -/area/maintenance/stellardelight/deck1/exploration) +/obj/machinery/light, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "vf" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/yellow{ @@ -10360,19 +10365,12 @@ /turf/simulated/floor/tiled/eris, /area/stellardelight/deck1/researchequip) "vw" = ( -/obj/machinery/hologram/holopad, -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/bed/chair/office/dark{ dir = 4 }, +/obj/effect/landmark/start/entrepreneur, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "vx" = ( /turf/simulated/wall/bay/r_wall/red, /area/security/armoury) @@ -10566,6 +10564,11 @@ }, /turf/simulated/floor/tiled/eris/white/gray_platform, /area/gateway) +"vS" = ( +/obj/structure/dogbed, +/mob/living/simple_mob/animal/passive/tindalos/twigs, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/explobriefing) "vT" = ( /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) @@ -10702,24 +10705,24 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "wk" = ( -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "0-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/power/apc/angled{ - dir = 8 - }, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/explobriefing) -"wm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ color = "#42038a"; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) +"wm" = ( +/obj/machinery/power/apc/angled{ + dir = 4; + name = "night shift APC"; + nightshift_setting = 2 + }, +/obj/structure/cable/green{ + color = "#42038a" + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) "wn" = ( @@ -10743,13 +10746,11 @@ /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/mining) "wq" = ( -/obj/structure/table/rack, -/obj/random/maintenance/cargo, -/obj/random/maintenance/cargo, -/obj/random/maintenance/cargo, -/obj/random/maintenance/clean, -/turf/simulated/floor, -/area/maintenance/stellardelight/deck1/exploration) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/woodentable, +/obj/item/weapon/paper_bin, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/entrepreneur) "ws" = ( /obj/structure/cable/pink{ icon_state = "4-8" @@ -10894,6 +10895,27 @@ "wG" = ( /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck1/starboardfore) +"wH" = ( +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/explobriefing) "wI" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/seed_storage/xenobotany, @@ -11152,12 +11174,17 @@ /turf/simulated/floor/tiled/eris, /area/rnd/xenobiology/xenoflora) "xk" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/structure/table/woodentable, +/obj/structure/closet/walllocker_double/misc_civ/south{ + name = "dentistry tools" }, -/obj/structure/dispenser/oxygen, +/obj/item/weapon/entrepreneur/dentist_mirror, +/obj/item/weapon/entrepreneur/dentist_probe, +/obj/item/weapon/entrepreneur/dentist_scaler, +/obj/item/weapon/entrepreneur/dentist_sickle, +/obj/item/device/flashlight/pen, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "xl" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/steel, @@ -11584,9 +11611,7 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/starboard) "yj" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 9 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) "yk" = ( @@ -12276,9 +12301,15 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology) "zK" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck1/exploration) "zL" = ( /obj/machinery/firealarm/angled, /obj/effect/landmark{ @@ -12435,44 +12466,19 @@ /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "Aa" = ( -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 4; - pixel_y = -6 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -4; - pixel_y = -6 - }, -/obj/structure/table/rack/shelf, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 4; - pixel_y = -6 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -4; - pixel_y = -6 - }, -/obj/machinery/alarm/angled{ - dir = 4 +/obj/structure/table/woodentable, +/obj/structure/closet/walllocker_double/misc_civ/west{ + name = "investigation tools" }, +/obj/item/weapon/entrepreneur/magnifying_glass, +/obj/item/sticky_pad/random, +/obj/item/sticky_pad/random, +/obj/item/device/camera, +/obj/item/device/tape, +/obj/item/device/tape, +/obj/item/device/taperecorder, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "Ab" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/tiled/steel_grid, @@ -12520,9 +12526,6 @@ color = "#42038a"; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ color = "#42038a"; icon_state = "1-8" @@ -12629,9 +12632,19 @@ /turf/simulated/floor/tiled/eris, /area/rnd/xenobiology/xenoflora) "At" = ( -/obj/effect/landmark{ - name = "lightsout" +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/obj/machinery/door/window/brigdoor/eastright{ + req_access = list(43) }, +/obj/item/device/bluespaceradio/sd_prelinked, +/obj/item/device/cataloguer/compact, +/obj/item/device/cataloguer/compact, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "Au" = ( @@ -12699,18 +12712,13 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/starboardcent) "AD" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/wall{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/computer/shuttle_control/explore/stellardelight/exploration{ - dir = 8 +/obj/machinery/photocopier, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 24 }, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "AF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12975,6 +12983,23 @@ }, /turf/simulated/floor, /area/maintenance/security_port) +"Bg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/entrepreneur) +"Bh" = ( +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/firealarm/angled{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/explobriefing) "Bi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -13057,6 +13082,10 @@ /obj/item/device/mmi, /turf/simulated/floor/tiled/steel_dirty, /area/assembly/robotics) +"Bq" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck1/exploration) "Br" = ( /obj/structure/closet/secure_closet/personal, /obj/machinery/firealarm/angled{ @@ -13170,23 +13199,19 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/research) "BC" = ( -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) "BD" = ( @@ -13496,13 +13521,17 @@ /turf/simulated/floor/wood, /area/library) "Cl" = ( -/obj/structure/table/rack/shelf, -/obj/random/contraband, -/obj/random/maintenance/research, -/obj/random/maintenance, -/obj/random/maintenance, -/turf/simulated/floor, -/area/maintenance/stellardelight/deck1/exploration) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "Cm" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/disposalpipe/up{ @@ -13763,11 +13792,13 @@ /turf/simulated/wall/bay/r_wall/purple, /area/rnd/xenobiology) "CT" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/status_display{ - pixel_y = 32 +/obj/machinery/mineral/equipment_vendor/survey, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 }, -/obj/structure/table/standard, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "CU" = ( @@ -14194,9 +14225,51 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) +"DR" = ( +/turf/simulated/wall/bay/r_wall/purple, +/area/stellardelight/deck1/entrepreneur) "DS" = ( /turf/simulated/wall/bay/red, /area/prison/cell_block) +"DT" = ( +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/structure/table/rack/shelf, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/machinery/alarm/angled{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "DV" = ( /obj/machinery/suit_cycler/pilot, /obj/machinery/light, @@ -14302,6 +14375,12 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) +"Ej" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/window/bay/reinforced, +/obj/structure/low_wall/bay/reinforced/purple, +/turf/simulated/floor, +/area/stellardelight/deck1/entrepreneur) "Ek" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/floor_decal/industrial/warning{ @@ -14532,6 +14611,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) +"EL" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/dispenser/oxygen, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "EM" = ( /obj/structure/table/rack, /obj/item/device/defib_kit/compact/loaded, @@ -15270,9 +15356,18 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/portcent) "Gy" = ( -/obj/structure/closet/firecloset, -/turf/simulated/floor, -/area/maintenance/stellardelight/deck1/exploration) +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, +/obj/machinery/door/window/brigdoor/eastleft{ + req_access = list(5) + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "GA" = ( /obj/machinery/light, /obj/structure/cable/green{ @@ -15281,18 +15376,9 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/fore) "GB" = ( -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "GC" = ( /obj/structure/stairs/spawner/north, /obj/structure/railing/grey{ @@ -15389,6 +15475,23 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/portcent) +"GO" = ( +/obj/machinery/hologram/holopad, +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "GP" = ( /obj/structure/cable/pink{ icon_state = "2-4" @@ -15553,11 +15656,23 @@ /turf/simulated/floor, /area/stellardelight/deck1/explobriefing) "Hf" = ( -/obj/structure/table/rack/shelf, -/obj/random/maintenance/research, -/obj/random/maintenance, +/obj/machinery/door/airlock/angled_bay/standard/glass{ + dir = 4; + door_color = "#333333"; + name = "Auxiliary EVA Equipment Room"; + req_one_access = list(18,19,43); + stripe_color = "#5a19a8" + }, +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor, -/area/maintenance/stellardelight/deck1/exploration) +/area/stellardelight/deck1/exploequipment) "Hg" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15795,16 +15910,13 @@ /turf/simulated/floor/tiled/dark, /area/security/lobby) "HG" = ( -/obj/structure/table/woodentable, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/camera/network/command{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/status_display{ + pixel_y = 32 }, +/obj/machinery/chemical_analyzer, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/explobriefing) +/area/stellardelight/deck1/exploequipment) "HH" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -15830,6 +15942,19 @@ /obj/machinery/vending/nifsoft_shop, /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck1/starboard) +"HM" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/wall{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/computer/shuttle_control/explore/stellardelight/exploration{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "HN" = ( /obj/structure/cable/pink{ icon_state = "4-8" @@ -15872,6 +15997,11 @@ }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) +"HQ" = ( +/obj/structure/flora/pottedplant/orientaltree, +/obj/machinery/light, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/explobriefing) "HR" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet/medical, @@ -15881,26 +16011,8 @@ /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/exam_room) "HS" = ( -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = 32 }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) @@ -16145,16 +16257,6 @@ color = "#42038a"; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/cable/green{ color = "#42038a"; icon_state = "2-8" @@ -16956,21 +17058,14 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "Ke" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, -/obj/machinery/door/window/brigdoor/eastleft{ - req_access = list(43) +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/wall{ + dir = 4 }, -/obj/item/device/mapping_unit, -/obj/item/device/cataloguer, -/obj/item/device/cataloguer, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "Kf" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/alarm/angled, @@ -17489,16 +17584,21 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/starboard) "Lp" = ( -/obj/structure/closet, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance/cargo, -/obj/random/maintenance/research, -/turf/simulated/floor, -/area/maintenance/stellardelight/deck1/exploration) +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/obj/machinery/door/window/brigdoor/eastleft{ + req_access = list(43) + }, +/obj/item/device/mapping_unit, +/obj/item/device/cataloguer, +/obj/item/device/cataloguer, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "Lq" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -17590,23 +17690,15 @@ /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/shuttlebay) "Ly" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ color = "#42038a"; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc/angled{ - dir = 4; - name = "night shift APC"; - nightshift_setting = 2 - }, -/obj/structure/cable/green{ - color = "#42038a" - }, -/turf/simulated/floor, -/area/maintenance/stellardelight/deck1/exploration) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "LA" = ( /obj/structure/cable/pink{ icon_state = "1-8" @@ -17743,11 +17835,13 @@ /turf/simulated/floor/tiled/dark, /area/security/security_cell_hallway) "LO" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/standard, +/obj/item/device/multitool/station_buffered{ + pixel_y = 2 }, -/turf/simulated/floor, -/area/maintenance/stellardelight/deck1/exploration) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "LP" = ( /obj/structure/table/standard, /obj/machinery/cell_charger, @@ -18430,22 +18524,9 @@ /turf/simulated/floor/carpet/purcarpet, /area/stellardelight/deck1/dorms/dorm2) "Np" = ( -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor, -/area/maintenance/stellardelight/deck1/exploration) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/explobriefing) "Nq" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -18560,18 +18641,12 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "Nx" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/expedition_medical, -/obj/item/clothing/head/helmet/space/void/expedition_medical, -/obj/machinery/door/window/brigdoor/eastleft{ - req_access = list(5) +/obj/structure/bed/chair/office/dark{ + dir = 1 }, +/obj/effect/landmark/start/entrepreneur, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "Nz" = ( /obj/effect/floor_decal/chapel{ dir = 8 @@ -18608,6 +18683,10 @@ /obj/structure/cable/pink, /turf/simulated/floor/airless, /area/stellardelight/deck1/exterior) +"NE" = ( +/obj/random/maintenance, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck1/exploration) "NF" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight/lamp/green{ @@ -18754,15 +18833,21 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology) "NY" = ( -/obj/machinery/door/airlock/angled_bay/hatch{ - dir = 4; - door_color = "#e6ab22"; - name = "Exploration Substation"; - req_one_access = list(10); - stripe_color = "#e6ab22" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "1-2" }, -/turf/simulated/floor, -/area/maintenance/stellardelight/deck1/exploration) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/machinery/power/apc/angled{ + dir = 8 + }, +/obj/structure/cable/green{ + color = "#42038a" + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "NZ" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 @@ -19141,6 +19226,29 @@ }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/starboard) +"OP" = ( +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24; + pixel_y = 32 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "OQ" = ( /turf/simulated/wall/bay/brown, /area/security/detectives_office) @@ -20765,15 +20873,39 @@ /turf/simulated/floor, /area/maintenance/stellardelight/substation/security) "Sn" = ( -/obj/structure/dogbed, -/mob/living/simple_mob/animal/passive/tindalos/twigs, +/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ color = "#42038a"; - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/explobriefing) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/angled_bay/standard/glass{ + dir = 4; + door_color = "#333333"; + name = "Auxiliary EVA Equipment Room"; + req_one_access = list(18,19,43); + stripe_color = "#5a19a8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/stellardelight/deck1/exploequipment) "Sq" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -21282,11 +21414,20 @@ "Tr" = ( /obj/structure/cable/green{ color = "#42038a"; - icon_state = "1-2" + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/start/entrepreneur, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "Ts" = ( /obj/machinery/door/blast/angled{ id = "xenobiodiv2"; @@ -21356,10 +21497,26 @@ /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "TD" = ( -/obj/structure/flora/pottedplant/orientaltree, -/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/standard, +/obj/item/device/gps{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/device/gps{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/device/gps{ + pixel_x = -6; + pixel_y = -4 + }, +/obj/item/device/gps{ + pixel_x = 6; + pixel_y = -4 + }, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/explobriefing) +/area/stellardelight/deck1/exploequipment) "TE" = ( /obj/effect/floor_decal/milspec/color/orange/half, /turf/simulated/floor/tiled/dark, @@ -21478,13 +21635,12 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/starboardcent) "TR" = ( -/obj/structure/table/rack, -/obj/random/maintenance/cargo, -/obj/random/maintenance/cargo, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor, -/area/maintenance/stellardelight/deck1/exploration) +/obj/machinery/firealarm/angled{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "TS" = ( /obj/random/maintenance/security, /obj/random/maintenance/security, @@ -21733,12 +21889,16 @@ /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "Up" = ( -/obj/structure/table/rack/shelf, -/obj/random/medical, -/obj/random/medical, -/obj/random/maintenance, -/turf/simulated/floor, -/area/maintenance/stellardelight/deck1/exploration) +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/power/apc/angled{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/explobriefing) "Uq" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -21989,14 +22149,10 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) "UR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = 24 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/bed/chair/office/dark, +/obj/effect/landmark/start/entrepreneur, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "US" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/glasses/hud/security, @@ -22192,8 +22348,10 @@ icon_state = "0-2" }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/table/woodentable, +/obj/item/weapon/book/manual/security_space_law, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "Vp" = ( /obj/structure/bookcase{ name = "bookcase (Reference)" @@ -22915,6 +23073,26 @@ }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) +"WI" = ( +/obj/structure/table/rack/shelf, +/obj/item/device/radio{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/radio{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/device/radio{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/device/radio{ + pixel_x = 4; + pixel_y = 5 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "WJ" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -23338,29 +23516,14 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/fore) "XD" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/airlock/angled_bay/hatch{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/item/device/radio/intercom{ dir = 4; - door_color = "#ffffff"; - name = "maintenance access"; - req_one_access = null; - stripe_color = "#5a19a8" + pixel_x = 24 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/stellardelight/deck1/explobriefing) +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "XE" = ( /obj/structure/table/reinforced, /obj/item/roller, @@ -24362,18 +24525,35 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/portfore) +"ZL" = ( +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/explobriefing) "ZM" = ( /obj/machinery/seed_extractor, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/eris, /area/rnd/xenobiology/xenoflora) "ZN" = ( +/obj/structure/reagent_dispensers/water_cooler/full, /obj/machinery/light{ dir = 1 }, -/obj/machinery/mineral/equipment_vendor/survey, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) +/area/stellardelight/deck1/entrepreneur) "ZO" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -30704,15 +30884,15 @@ um um um In -wm +iU Ag +iU +iU wm -Ly -wm -wm -wm -Np vT +vT +vT +lj ra RF vF @@ -30845,17 +31025,17 @@ Ql KD KP um -if +Ec RS -RS -NY -RS -RS -RS -RS -rB -RS -ra +pC +pC +pC +pC +pC +pC +pC +pC +pC RF vF bD @@ -30987,17 +31167,17 @@ jm ng cC um -if -RS -Cl -vT -mP +Ec +Bq +pC +At Lp -RS -wq -if +pC +DT +pC +jU Gy -ra +pC bD hE JE @@ -31130,16 +31310,16 @@ um Jp um if -RS +zK Hf -vT -vT -Jz -RS +Cl +Ly +NY +oV TR -if +ZQ ve -ra +pC RF vF uq @@ -31272,16 +31452,16 @@ Mn PL DQ XM -RS -Up -vT -vT +NE +pC +CT +tY pd -RS -LO -if -pd -ra +GO +tY +tY +WI +pC bD vF uq @@ -31414,16 +31594,16 @@ Ua Ua Ua Ec -RS -tm -WM -WM -WM -WM -WM +vT +pC +HG +LO +TD +OP +HM XD -WM -nk +EL +pC uq vF uq @@ -31557,15 +31737,15 @@ Pu Ua Ec Jz -tm -HG -oq -wk +pC +tu +tu +pC Sn -sT -HS -TD -nk +pC +tu +tu +pC bD vF uq @@ -31701,12 +31881,12 @@ gt Oz tm ql -Rz -Rz -Rz -Rz -sN -Rz +Np +Up +wH +Bh +ZL +HQ ny bD vF @@ -31833,16 +32013,16 @@ Vh wF Xq yS -pC -pC -pC -pC -pC -pC -pC -pC -pC -Rz +lO +lO +lO +lO +lO +lO +lO +lO +DR +HS Uo kg kg @@ -31975,22 +32155,22 @@ Vh Pd Xq ma -pC +lO uc Ke -pC +sT Aa -pC +Nx nd Nx -pC +DR XH TC zZ yP zZ OB -Rz +vS nk bD hE @@ -32117,15 +32297,15 @@ Vh fO vf fO -pC +lO Vo Tr -aJ +Bg tW -ZQ -ZQ +Bg +wq sO -pC +DR CK TC oZ @@ -32259,15 +32439,15 @@ Aj vj vU uu -pC +lO ZN -tY -tY +ay +lk GB -tY -tY -zK -pC +lk +lk +lk +oq Rz NA An @@ -32401,15 +32581,15 @@ Aj gn OZ Bl -pC +lO te -tY -At +ay +lk vw -tY -tY +lk +lk eJ -pC +DR PE jZ Fx @@ -32542,16 +32722,16 @@ mK Aj rk OZ -Bl -pC -CT +aJ +oq +lk ay em eu AD UR xk -pC +DR vy mW WM @@ -32685,15 +32865,15 @@ Aj Dm Gh Bl -pC -tu -tu -pC -lO -pC -tu -tu -pC +DR +Ej +rB +DR +DR +DR +Ej +Ej +DR zL SE Dt @@ -32830,7 +33010,7 @@ cI sC yj jR -Dt +wk BC Pr YB diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm index f9d20b291c..577393b28b 100644 --- a/maps/stellar_delight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -3785,13 +3785,6 @@ /obj/structure/low_wall/bay/reinforced/steel, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portfore) -"hP" = ( -/obj/structure/bed/chair/bay/comfy/brown{ - dir = 1 - }, -/obj/effect/landmark/start/entrepreneur, -/turf/simulated/floor/carpet, -/area/crew_quarters/recreation_area) "hQ" = ( /obj/structure/table/standard, /obj/item/weapon/storage/firstaid/surgery, @@ -3879,7 +3872,6 @@ pixel_y = -32 }, /obj/structure/table/bench/steel, -/obj/effect/landmark/start/entrepreneur, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "ib" = ( @@ -3898,7 +3890,6 @@ /area/crew_quarters/bar) "id" = ( /obj/structure/table/bench/steel, -/obj/effect/landmark/start/entrepreneur, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "ie" = ( @@ -33100,7 +33091,7 @@ Dl UX UX UX -hP +vS mt mt mt @@ -33668,7 +33659,7 @@ Dl UX UX UX -hP +vS mt mt mt diff --git a/maps/stellar_delight/stellar_delight_areas.dm b/maps/stellar_delight/stellar_delight_areas.dm index 53bbffb08f..8af4a0b4b6 100644 --- a/maps/stellar_delight/stellar_delight_areas.dm +++ b/maps/stellar_delight/stellar_delight_areas.dm @@ -307,3 +307,7 @@ name = "Deck Two Exterior" /area/stellardelight/deck3/exterior name = "Deck Three Exterior" + +/area/stellardelight/deck1/entrepreneur + name = "\improper Shared Office" + icon_state = "entertainment" diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 91e9a59443..54059d1f70 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -16586,12 +16586,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) -"aCc" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/grey/border, -/obj/effect/landmark/start/entrepreneur, -/turf/simulated/floor/tiled, -/area/crew_quarters/visitor_laundry) "aCd" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -17479,7 +17473,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/start/entrepreneur, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aDL" = ( @@ -17558,7 +17551,6 @@ /obj/structure/table/bench/standard, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/grey/border, -/obj/effect/landmark/start/entrepreneur, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aDU" = ( @@ -17982,7 +17974,6 @@ /obj/effect/floor_decal/corner/grey/border, /obj/machinery/light/small, /obj/structure/table/bench/standard, -/obj/effect/landmark/start/entrepreneur, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aEO" = ( @@ -53733,7 +53724,7 @@ aSX aTG aSo arm -aCc +bcT aVf aUs aUu diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 41089c2585..54e52a1b93 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -32953,7 +32953,6 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgu" = ( -/obj/structure/bed/chair, /obj/machinery/light/small{ dir = 8 }, @@ -33278,7 +33277,9 @@ /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) "bhg" = ( -/obj/structure/bed/chair, +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/shuttle_pad) "bhi" = ( @@ -33321,14 +33322,10 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) "bhl" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/southhall) +/obj/item/weapon/entrepreneur/dumbbell, +/obj/item/weapon/entrepreneur/dumbbell, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "bhm" = ( /obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled/monotile, @@ -33374,7 +33371,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/tether/surfacebase/southhall) +/area/tether/surfacebase/entrepreneur) "bhs" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 @@ -36368,6 +36365,23 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) +"bvM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock{ + id_tag = "meeting_room"; + name = "Meeting Room" + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur/meeting) "bxa" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -36386,6 +36400,17 @@ "bzK" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) +"bCj" = ( +/obj/structure/closet/walllocker_double/misc_civ/south{ + name = "dentist supplies" + }, +/obj/item/weapon/entrepreneur/dentist_mirror, +/obj/item/weapon/entrepreneur/dentist_probe, +/obj/item/weapon/entrepreneur/dentist_scaler, +/obj/item/weapon/entrepreneur/dentist_sickle, +/obj/item/device/flashlight/pen, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) "bCV" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -36432,6 +36457,15 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) +"bJC" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/white/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) "bJF" = ( /obj/structure/toilet{ dir = 8 @@ -36580,6 +36614,14 @@ /obj/item/weapon/storage/secure/briefcase, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) +"ccu" = ( +/obj/structure/table/hardwoodtable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/item/weapon/paper_bin, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "ccN" = ( /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "tourbus"; @@ -36679,6 +36721,22 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"crz" = ( +/obj/structure/bookcase, +/obj/item/weapon/book/manual/security_space_law, +/obj/item/weapon/book/manual/security_space_law, +/obj/item/weapon/book/manual/engineering_construction, +/obj/item/weapon/book/manual/detective, +/obj/item/weapon/book/manual/standard_operating_procedure, +/obj/item/weapon/book/codex/lore/vir, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur/meeting) +"csD" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur/meeting) "cta" = ( /obj/machinery/shipsensors/fancy_shuttle, /turf/simulated/wall/fancy_shuttle/nondense{ @@ -36786,6 +36844,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) +"cIL" = ( +/turf/simulated/wall, +/area/tether/surfacebase/entrepreneur) "cJL" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -36798,6 +36859,24 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"cLR" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "cMO" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -37007,6 +37086,9 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +"dkV" = ( +/turf/simulated/wall, +/area/tether/surfacebase/entrepreneur/meeting) "dmH" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -37150,6 +37232,15 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"dBg" = ( +/obj/structure/table/hardwoodtable, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/device/flashlight/lamp/green, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur/meeting) "dDl" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -37252,6 +37343,30 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) +"dNe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/bed/chair/office/light{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur/meeting) +"dQa" = ( +/obj/structure/table/hardwoodtable, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24; + pixel_y = -10 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "dQY" = ( /obj/structure/table/bench/sifwooden/padded, /turf/simulated/floor/wood, @@ -37309,6 +37424,17 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) +"dYE" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/cable/orange{ + icon_state = "0-2" + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur/meeting) "eaj" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -37427,6 +37553,13 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) +"eye" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) "eyH" = ( /obj/structure/closet/crate, /obj/random/maintenance/engineering, @@ -37583,6 +37716,51 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"eSh" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/white/border{ + dir = 4 + }, +/obj/structure/closet{ + name = "session equipment" + }, +/obj/item/weapon/bedsheet/pillow/exercise, +/obj/item/weapon/bedsheet/pillow/exercise, +/obj/item/weapon/entrepreneur/dumbbell, +/obj/item/weapon/entrepreneur/dumbbell, +/obj/item/weapon/storage/box/dentist, +/obj/item/roller/massage, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) +"eSQ" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/entrepreneur/session) +"eUZ" = ( +/obj/structure/closet{ + name = "entrepreneur equipment" + }, +/obj/item/device/tape, +/obj/item/device/tape, +/obj/item/device/taperecorder, +/obj/item/weapon/entrepreneur/magnifying_glass, +/obj/item/weapon/entrepreneur/emf, +/obj/item/weapon/entrepreneur/spirit_board, +/obj/item/weapon/entrepreneur/crystal_ball, +/obj/item/device/tvcamera/streamer, +/obj/item/weapon/deck/tarot, +/obj/item/weapon/entrepreneur/horoscope, +/obj/item/device/camera, +/obj/item/device/camera_film, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur/meeting) "eWw" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -37595,6 +37773,9 @@ /area/crew_quarters/pool) "eWS" = ( /obj/machinery/vending/sovietsoda, +/obj/structure/closet/hydrant{ + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "eYm" = ( @@ -37773,6 +37954,10 @@ /area/shuttle/tether{ base_turf = /turf/simulated/floor/reinforced }) +"fzK" = ( +/obj/structure/filingcabinet/chestdrawer, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur/meeting) "fCR" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -38052,6 +38237,13 @@ fancy_shuttle_tag = "tourbus" }, /area/shuttle/tourbus/general) +"glm" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur/meeting) "gnE" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -38090,6 +38282,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +"guy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "gvp" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -38103,6 +38307,10 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) +"gxf" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/wood, +/area/tether/surfacebase/cafeteria) "gym" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -38283,6 +38491,30 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) +"gPA" = ( +/obj/structure/closet/walllocker_double/misc_civ/north{ + name = "office supplies" + }, +/obj/item/weapon/folder, +/obj/item/weapon/folder, +/obj/item/weapon/folder, +/obj/item/weapon/folder, +/obj/item/weapon/folder, +/obj/item/weapon/folder, +/obj/item/weapon/folder, +/obj/item/weapon/pen, +/obj/item/weapon/pen, +/obj/item/weapon/pen, +/obj/item/weapon/pen, +/obj/item/weapon/pen, +/obj/item/weapon/stamp/accepted, +/obj/item/weapon/stamp/denied, +/obj/item/weapon/clipboard, +/obj/item/weapon/clipboard, +/obj/item/weapon/clipboard, +/obj/item/sticky_pad, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "gRG" = ( /obj/structure/closet/hydrant{ pixel_x = -32 @@ -38335,6 +38567,11 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"gVY" = ( +/obj/structure/table/steel, +/obj/random/tech_supply, +/turf/simulated/floor/tiled/techfloor, +/area/tether/surfacebase/shuttle_pad) "gWX" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -38374,6 +38611,14 @@ /obj/item/weapon/storage/box/donut, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) +"gZq" = ( +/obj/structure/bed/chair/office/light, +/obj/structure/sign/painting/public{ + pixel_x = -30 + }, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "gZR" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -38413,6 +38658,17 @@ /obj/machinery/computer/operating, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) +"hfv" = ( +/obj/effect/floor_decal/spline/plain, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/carpet/purcarpet, +/area/tether/surfacebase/entrepreneur) "hfN" = ( /obj/machinery/camera/network/civilian{ dir = 4 @@ -38494,6 +38750,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"hsp" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "hth" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light{ @@ -38657,6 +38919,11 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall/west) +"hTB" = ( +/obj/structure/table/hardwoodtable, +/obj/item/weapon/paper_bin, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "hVc" = ( /obj/structure/table/woodentable, /obj/machinery/photocopier/faxmachine{ @@ -38768,6 +39035,10 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/barrestroom) +"ioo" = ( +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "ioG" = ( /obj/effect/floor_decal/techfloor, /obj/structure/cable/green{ @@ -38973,6 +39244,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) +"jei" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/entrepreneur) "jkW" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -39028,6 +39306,18 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"jpq" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/purcarpet, +/area/tether/surfacebase/entrepreneur) "jpB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 6 @@ -39125,8 +39415,20 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 8 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/southhall) +"jCU" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/purcarpet, +/area/tether/surfacebase/entrepreneur) "jDF" = ( /obj/machinery/light{ dir = 8 @@ -39257,6 +39559,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"jLb" = ( +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "jPW" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -39278,6 +39583,16 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) +"jRn" = ( +/obj/structure/table/hardwoodtable, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur/meeting) "jRO" = ( /obj/effect/floor_decal/spline/plain, /obj/item/weapon/stool/padded{ @@ -39888,6 +40203,13 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) +"lnV" = ( +/obj/structure/table/hardwoodtable, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "lpg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -39960,6 +40282,19 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) +"lto" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/orange{ + icon_state = "1-4" + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "ltu" = ( /obj/structure/railing{ dir = 8 @@ -40055,6 +40390,9 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) +"lHq" = ( +/turf/simulated/wall, +/area/tether/surfacebase/entrepreneur/session) "lHr" = ( /obj/structure/table/woodentable, /obj/random/paicard, @@ -40121,6 +40459,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +"lVA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock{ + id_tag = "session_room"; + name = "Session Room" + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) "lVB" = ( /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "tourbus"; @@ -40337,6 +40692,34 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) +"mEW" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/white/border{ + dir = 4 + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/closet/walllocker_double/misc_civ/south{ + name = "vanity supplies" + }, +/obj/item/weapon/entrepreneur/crystal, +/obj/item/weapon/entrepreneur/crystal, +/obj/item/weapon/entrepreneur/crystal, +/obj/item/weapon/entrepreneur/crystal, +/obj/item/weapon/entrepreneur/crystal, +/obj/item/weapon/lipstick/random, +/obj/item/weapon/lipstick/random, +/obj/item/weapon/lipstick/random, +/obj/item/weapon/reagent_containers/glass/bottle/essential_oil, +/obj/item/weapon/makeover, +/obj/item/weapon/nailpolish, +/obj/item/weapon/nailpolish_remover, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) "mFq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -40396,6 +40779,13 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"mTG" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "mUv" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -40497,6 +40887,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"ngT" = ( +/obj/structure/table/standard, +/obj/item/weapon/bedsheet/pillow/exercise, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) "ngV" = ( /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "tourbus"; @@ -40595,6 +40990,15 @@ /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) +"npz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) "nrN" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ @@ -40647,6 +41051,10 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) +"ntK" = ( +/obj/structure/bed/chair/office/light, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) "nue" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -40723,6 +41131,16 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall/west) +"nDH" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/mirror{ + dir = 1; + pixel_y = -26 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) "nKy" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -40793,6 +41211,18 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) +"nVQ" = ( +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/southhall) "nXZ" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -40916,6 +41346,16 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall/nwest) +"oAA" = ( +/obj/machinery/photocopier, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/wall{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "oBJ" = ( /obj/structure/sign/painting/public{ pixel_x = 30 @@ -40987,6 +41427,12 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"oJe" = ( +/obj/structure/table/hardwoodtable, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/item/weapon/paper_bin, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "oJw" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -41135,6 +41581,9 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, +/obj/structure/cable/orange{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/southhall) "oWP" = ( @@ -41179,6 +41628,9 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) +"pcI" = ( +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) "peS" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -41210,6 +41662,12 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"phg" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "phS" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -41278,6 +41736,17 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) +"prf" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/cable/orange{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) "prD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -41299,6 +41768,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) +"pse" = ( +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur/meeting) "psh" = ( /obj/machinery/door/airlock{ id_tag = "bathroomlock18"; @@ -41334,6 +41806,18 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall/nwest) +"pwR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) "pAh" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -41370,6 +41854,20 @@ /obj/effect/floor_decal/corner/red/bordercorner, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"pFe" = ( +/obj/structure/table/hardwoodtable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/item/weapon/paper_bin, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "pHl" = ( /obj/structure/table/steel, /obj/item/weapon/folder/red, @@ -41573,6 +42071,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"qfc" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur/meeting) "qfz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -41626,6 +42130,18 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) +"qoE" = ( +/obj/machinery/light, +/obj/structure/bed/chair/office/light{ + dir = 1 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "qoL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -41750,12 +42266,24 @@ }, /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside3) +"qDx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "qDF" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/southhall) +"qEs" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "qFL" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -41842,6 +42370,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) +"qSG" = ( +/obj/machinery/newscaster{ + pixel_y = 30 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "qTm" = ( /obj/machinery/door/airlock/maintenance/common, /obj/effect/floor_decal/industrial/warning{ @@ -41902,6 +42436,12 @@ /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"raz" = ( +/obj/structure/reagent_dispensers/water_cooler/full{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "rbR" = ( /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "tourbus"; @@ -42498,6 +43038,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) +"sVx" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/southhall) "sVC" = ( /obj/machinery/door/firedoor/glass/hidden/shuttle, /obj/machinery/door/blast/shuttle/open{ @@ -42677,6 +43229,19 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"tDm" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "meeting_room"; + pixel_x = -25; + specialfunctions = 4 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur/meeting) "tJk" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -42763,6 +43328,14 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall/west) +"tVW" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/bed/chair/office/light, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "tWn" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 @@ -42794,12 +43367,39 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa/officecommon) +"tYV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) "uaN" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +"udb" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/tether/surfacebase/entrepreneur) "uee" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -42918,6 +43518,23 @@ }, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) +"usc" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1; + name = "office space" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/entrepreneur) "ute" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -42963,6 +43580,40 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall/west) +"uxx" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/closet/walllocker_double/misc_civ/east{ + name = "entrepreneur supplies" + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/item/weapon/storage/briefcase{ + pixel_x = -2; + pixel_y = -5 + }, +/obj/item/weapon/storage/briefcase{ + pixel_x = -2; + pixel_y = -5 + }, +/obj/item/device/measuring_tape, +/obj/item/weapon/tape_roll, +/obj/item/weapon/tape_roll, +/obj/item/weapon/wrapping_paper, +/obj/item/weapon/wrapping_paper, +/obj/item/weapon/wrapping_paper, +/obj/item/device/camera/selfie, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "uxT" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central5{ dir = 8 @@ -42987,6 +43638,19 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"uyI" = ( +/obj/effect/floor_decal/spline/plain, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/tether/surfacebase/entrepreneur) "uzl" = ( /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "lifeboat1"; @@ -43034,6 +43698,15 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall/west) +"uKb" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/entrepreneur/meeting) "uLh" = ( /obj/machinery/door/firedoor/glass/hidden/shuttle, /obj/machinery/door/blast/shuttle/open{ @@ -43059,6 +43732,15 @@ "uNt" = ( /turf/simulated/open, /area/tether/surfacebase/security/upperhall) +"uNx" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/purcarpet, +/area/tether/surfacebase/entrepreneur) "uOL" = ( /obj/structure/table/standard, /obj/item/clothing/gloves/sterile/nitrile, @@ -43108,6 +43790,16 @@ /obj/effect/floor_decal/steeldecal/monofloor, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) +"vdl" = ( +/obj/structure/bed/chair/office/light{ + dir = 1 + }, +/obj/structure/sign/painting/public{ + pixel_x = -30 + }, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "viF" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -43359,6 +44051,14 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) +"vQt" = ( +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 24 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "vTf" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -43731,6 +44431,31 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"wHC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur/meeting) +"wIs" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "session_room"; + pixel_x = -25; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) "wIw" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/orange{ @@ -43835,6 +44560,17 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"xac" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/cable/orange{ + icon_state = "0-2" + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entrepreneur) "xan" = ( /obj/structure/window/reinforced{ dir = 1 @@ -44085,6 +44821,16 @@ }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) +"xtz" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/purcarpet, +/area/tether/surfacebase/entrepreneur) "xud" = ( /obj/structure/table/rack/shelf, /obj/item/weapon/storage/backpack/parachute{ @@ -44347,6 +45093,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"xUX" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/bed/chair/office/light, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/entrepreneur/session) "xZw" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -52279,7 +53033,7 @@ kuQ rkn akx gLg -fxh +bhl jBB amv arU @@ -57313,7 +58067,7 @@ aPL bhj cYm oWt -beV +sVx bhj beV pPe @@ -57455,7 +58209,7 @@ aPM ely bhp jCE -hId +nVQ bhq hId cHf @@ -57593,14 +58347,14 @@ aKj aKj aKj aPs -bhl -bhl -aPs -aPs -aPs -aPs -aPs -aPs +cIL +cIL +cIL +jei +usc +cIL +cIL +cIL qDF bhy bhs @@ -57735,14 +58489,14 @@ aKj aac aac aac -aac -aac -aac -aac -aac -aac -aac -aPs +cIL +gZq +dQa +uNx +uyI +ioo +vdl +cIL beU bhx beU @@ -57877,13 +58631,13 @@ aKj aac aac aac -aac -aac -aac -aac -aac -aac -aac +cIL +jLb +hTB +uNx +uyI +hTB +jLb bhr beU bhx @@ -58019,13 +58773,13 @@ aKj aNi aNi aKj -aac -aac -aac -aac -aac -aac -aac +cIL +xac +hsp +jpq +uyI +qEs +jLb bhr beU bhx @@ -58161,14 +58915,14 @@ aKj aUu beW aKj -aKj -aac -aac -aac -aac -aac -aac -aPs +cIL +tVW +ioo +uNx +uyI +ioo +qoE +cIL bht bhx beU @@ -58303,21 +59057,21 @@ aKj bde bfh bgu -aPb -aac -aac -aac -aac -aac -aac -aPs +cIL +vQt +oJe +xtz +hfv +ccu +phg +cIL bhv bhz bhC biH dyV bja -han +gxf ieh bju biF @@ -58445,14 +59199,14 @@ hCz beN bfh bhg -aPb -aac -aac -aac -aac -aac -aac -aPs +cIL +gPA +jLb +jCU +udb +jLb +mTG +cIL ieF bhx beU @@ -58586,14 +59340,14 @@ aOP aKj beQ bfh -bhg -aPb -aac -aac -aac -aac -aac -aac +gVY +cIL +qSG +jLb +lnV +pFe +jLb +raz bhr beU bhx @@ -58729,13 +59483,13 @@ aKj beT bfi aKj -aKj -aac -aac -aac -aac -aac -aac +cIL +guy +qDx +cLR +uxx +lto +oAA bhr beU bhx @@ -58870,15 +59624,15 @@ aPt aKj xku xku -aKj -aac -aac -aac -aac -aac -aac -aac -aPs +lHq +lHq +lVA +lHq +dkV +dkV +bvM +dkV +dkV beU bhx iOw @@ -59012,15 +59766,15 @@ aKj aKj aac aac -aac -aac -aac -aac -aac -aac -aac -aac -aPs +lHq +ngT +tYV +wIs +dkV +crz +wHC +tDm +dkV qDF bhy bhs @@ -59154,15 +59908,15 @@ aac aac aac aac -aac -aac -aac -aac -aac -aac -aac -aac -aPs +lHq +prf +pwR +eye +dkV +dYE +dNe +glm +dkV bht bhx beU @@ -59296,15 +60050,15 @@ aac aac aac aac -aac -aac -aac -aac -aac -aac -aac -aac -bhr +lHq +xUX +npz +nDH +dkV +dBg +jRn +csD +dkV beU bhx beU @@ -59438,15 +60192,15 @@ aac aac aac aac -aac -aac -aac -aac -aac -aac -aac -aac -bhr +lHq +ntK +pcI +bCj +dkV +fzK +qfc +pse +dkV beU bhx beU @@ -59580,15 +60334,15 @@ aac aac aac aac -aac -aac -aac -aac -aac -aac -aac -aac -aPs +lHq +eSh +bJC +mEW +dkV +eUZ +pse +pse +dkV beU bhx beU @@ -59722,15 +60476,15 @@ aac aac aac aac -aac -aac -aac -aac -aac -aac -aac -aac -aPs +lHq +lHq +eSQ +lHq +dkV +dkV +uKb +dkV +dkV qQF bhA bhC diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index ff3ecd4e4a..aedc4ef9f7 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -493,6 +493,16 @@ /area/tether/surfacebase/entertainment/stage name = "\improper Entertainment Stage" +/area/tether/surfacebase/entrepreneur + name = "\improper Shared Office" + icon_state = "entertainment" + +/area/tether/surfacebase/entrepreneur/session + name = "\improper Shared Office Session Room" + +/area/tether/surfacebase/entrepreneur/meeting + name = "\improper Shared Office Meeting Room" + /area/tether/surfacebase/funny/clownoffice name = "\improper Clown's Office" icon_state = "library" diff --git a/tgui/packages/tgui/interfaces/VorePanel.jsx b/tgui/packages/tgui/interfaces/VorePanel.jsx index 7a415b55a8..70b114b4d9 100644 --- a/tgui/packages/tgui/interfaces/VorePanel.jsx +++ b/tgui/packages/tgui/interfaces/VorePanel.jsx @@ -1412,6 +1412,7 @@ const VoreUserPreferences = (props) => { slip_vore, throw_vore, food_vore, + digest_pain, nutrition_message_visible, weight_message_visible, eating_privacy_global, @@ -1605,6 +1606,21 @@ const VoreUserPreferences = (props) => { disabled: 'Food Vore Disabled', }, }, + toggle_digest_pain: { + action: 'toggle_digest_pain', + test: digest_pain, + tooltip: { + main: + 'Allows for pain messages to show when being digested. ' + + ' Can be toggled off to disable pain messages.', + enable: 'Click here to allow for digestion pain.', + disable: 'Click here to disable digestion pain.', + }, + content: { + enabled: 'Digestion Pain Enabled', + disabled: 'Digestion Pain Disabled', + }, + }, inbelly_spawning: { action: 'toggle_allow_inbelly_spawning', test: allow_inbelly_spawning, @@ -1830,15 +1846,18 @@ const VoreUserPreferences = (props) => { + + + - + - + { tooltipPosition="top" /> - + - + { - + ",ae+='
',ae+='
',ae+="Addons:
"+x(_)+"

",ae+="== Descriptions ==
",ae+="Vore Verb:
"+b+"

",ae+="Release Verb:
"+O+"

",ae+='Description:
"'+C+'"

',ae+='Absorbed Description:
"'+j+'"

',ae+="
",ae+="== Messages ==
",ae+='
',ae+='
',ae+='
",ae+='
',ae+='
',ae+='
',ve==null||ve.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',be==null||be.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',we==null||we.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',Je==null||Je.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',ze==null||ze.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',Le==null||Le.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',Be==null||Be.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',dt==null||dt.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',xt==null||xt.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',lt==null||lt.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',rt==null||rt.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',Re==null||Re.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',Ke==null||Ke.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',Pe==null||Pe.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',ke==null||ke.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',Me==null||Me.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',Ve==null||Ve.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',We==null||We.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',He==null||He.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',gt==null||gt.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',Mt==null||Mt.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',bt==null||bt.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',Dt==null||Dt.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',ct==null||ct.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',Ge==null||Ge.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',ue==null||ue.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',ce==null||ce.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',me==null||me.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',xe==null||xe.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',je==null||je.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',Qe==null||Qe.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',vt==null||vt.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',Pt==null||Pt.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',zt==null||zt.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',en==null||en.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',Wt==null||Wt.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+='
',fn==null||fn.forEach(function(Se){ae+=Se+"
"}),ae+="
",ae+="
",ae+="
",ae+="
",ae+="
= Idle Messages =

",ae+="

Idle Messages (Hold):

",Fn==null||Fn.forEach(function(Se){ae+=Se+"
"}),ae+="


",ae+="
Idle Messages (Hold Absorbed):

",Vn==null||Vn.forEach(function(Se){ae+=Se+"
"}),ae+="


",ae+="
Idle Messages (Digest):

",Tn==null||Tn.forEach(function(Se){ae+=Se+"
"}),ae+="


",ae+="
Idle Messages (Absorb):

",Eo==null||Eo.forEach(function(Se){ae+=Se+"
"}),ae+="


",ae+="
Idle Messages (Unabsorb):

",bn==null||bn.forEach(function(Se){ae+=Se+"
"}),ae+="


",ae+="
Idle Messages (Drain):

",Io==null||Io.forEach(function(Se){ae+=Se+"
"}),ae+="


",ae+="
Idle Messages (Heal):

",bo==null||bo.forEach(function(Se){ae+=Se+"
"}),ae+="


",ae+="
Idle Messages (Size Steal):

",Xr==null||Xr.forEach(function(Se){ae+=Se+"
"}),ae+="


",ae+="
Idle Messages (Shrink):

",Hr==null||Hr.forEach(function(Se){ae+=Se+"
"}),ae+="


",ae+="
Idle Messages (Grow):

",ta==null||ta.forEach(function(Se){ae+=Se+"
"}),ae+="


",ae+="
Idle Messages (Encase In Egg):

",Gr==null||Gr.forEach(function(Se){ae+=Se+"
"}),ae+="


",ae+="


",ae+="
",ae+='
',ae+='
',ae+='

',ae+='

",ae+='
',ae+='
',ae+='
    ',ae+='
  • Can Taste: '+(k?'Yes':'No')+"
    • ",ae+='
  • Contaminates: '+(V?'Yes':'No')+"
    • ",ae+='
  • Contamination Flavor: '+F+"
    • ",ae+='
  • Contamination Color: '+J+"
    • ",ae+='
  • Nutritional Gain: '+H+"%
    • ",ae+='
  • Required Examine Size: '+Q*100+"%
    • ",ae+='
  • Display Absorbed Examines: '+(Z?'True':'False')+"
    • ",ae+='
  • Save Digest Mode: '+(X?'True':'False')+"
    • ",ae+='
  • Idle Emotes: '+(z?'Active':'Inactive')+"
    • ",ae+='
  • Idle Emote Delay: '+Y+" seconds
    • ",ae+='
  • Shrink/Grow Size: '+ee*100+"%
    • ",ae+='
  • Egg Type: '+oe+"
    • ",ae+='
  • Selective Mode Preference: '+ne+"
    • ",ae+="
",ae+="
",ae+='
',ae+='

',ae+='

",ae+='
',ae+='
',ae+='
    ',ae+='
  • Fleshy Belly: '+(Oo?'Yes':'No')+"
    • ",ae+='
  • Internal Loop: '+(br?'Yes':'No')+"
    • ",ae+='
  • Use Fancy Sounds: '+(xn?'Yes':'No')+"
    • ",ae+='
  • Vore Sound: '+pn+"
    • ",ae+='
  • Release Sound: '+sr+"
    • ",ae+="
",ae+="
",ae+='
',ae+='

',ae+='

",ae+='
",ae+='
',ae+="Vore FX",ae+='
    ',ae+='
  • Disable Prey HUD: '+(Ir?'Yes':'No')+"
    • ",ae+="
",ae+="
",ae+='
',ae+='

',ae+='

",ae+='
',ae+='
',ae+="Belly Interactions ("+(_o?'Enabled':'Disabled')+")",ae+='
    ',ae+='
  • Escape Chance: '+ni+"%
    • ",ae+='
  • Escape Chance: '+ri+"%
    • ",ae+='
  • Escape Time: '+oi/10+"s
    • ",ae+='
  • Transfer Chance: '+An+"%
    • ",ae+='
  • Transfer Location: '+na+"
    • ",ae+='
  • Secondary Transfer Chance: '+ra+"%
    • ",ae+='
  • Secondary Transfer Location: '+ai+"
    • ",ae+='
  • Absorb Chance: '+oa+"%
    • ",ae+='
  • Digest Chance: '+aa+"%
    • ",ae+="
",ae+="
",ae+="
",ae},h=function(){var c=new Date,d=String(c.getHours());d.length<2&&(d="0"+d);var p=String(c.getMinutes());p.length<2&&(p="0"+p);var C=String(c.getDate());C.length<2&&(C="0"+C);var j=String(c.getMonth()+1);j.length<2&&(j="0"+j);var b=String(c.getFullYear());return" "+b+"-"+j+"-"+C+" ("+d+" "+p+")"},v=function(c){var d=(0,s.Oc)(),p=d.act,C=d.data,j=C.db_version,b=C.db_repo,O=C.mob_name,I=C.bellies,_=h(),M=O+_+c,D;if(c===".html"){var A="";D=new Blob([''+I.length+" Exported Bellies (DB_VER: "+b+"-"+j+')'+A+'

Bellies of '+O+'

Generated on: '+_+'

'],{type:"text/html;charset=utf8"}),I.forEach(function(R,K){D=new Blob([D,f(R,K)],{type:"text/html;charset=utf8"})}),D=new Blob([D,"
",'