diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm
index d09f2394a5..c27d43a107 100644
--- a/code/datums/supplypacks/misc_vr.dm
+++ b/code/datums/supplypacks/misc_vr.dm
@@ -168,4 +168,5 @@
access = list(access_explorer,
access_security,)
- one_access = TRUE
\ No newline at end of file
+ one_access = TRUE
+ containername = "sword crate"
\ No newline at end of file
diff --git a/code/game/mecha/equipment/tools/jetpack.dm b/code/game/mecha/equipment/tools/jetpack.dm
index 5f2fc153a2..9b6de6121f 100644
--- a/code/game/mecha/equipment/tools/jetpack.dm
+++ b/code/game/mecha/equipment/tools/jetpack.dm
@@ -48,6 +48,43 @@
if(!action_checks())
return chassis.dyndomove(direction)
var/move_result = 0
+ if(direction == UP || direction == DOWN)
+ if(!chassis.can_ztravel())
+ chassis.occupant_message("Your vehicle lacks the capacity to move in that direction!")
+ return FALSE
+
+ //We're using locs because some mecha are 2x2 turfs. So thicc!
+ var/result = TRUE
+
+ for(var/turf/T in chassis.locs)
+ if(!T.CanZPass(chassis,direction))
+ chassis.occupant_message("You can't move that direction from here!")
+ result = FALSE
+ break
+ var/turf/dest = (direction == UP) ? GetAbove(chassis) : GetBelow(chassis)
+ if(!dest)
+ chassis.occupant_message("There is nothing of interest in this direction.")
+ result = FALSE
+ break
+ if(!dest.CanZPass(chassis,direction))
+ chassis.occupant_message("There's something blocking your movement in that direction!")
+ result = FALSE
+ break
+ if(result)
+ move_result = chassis.mechstep(direction)
+
+ if(move_result)
+ chassis.can_move = 0
+ chassis.use_power(chassis.step_energy_drain)
+ if(istype(chassis.loc, /turf/space))
+ if(!chassis.check_for_support())
+ chassis.float_direction = direction
+ chassis.start_process(MECHA_PROC_MOVEMENT)
+ chassis.log_message("Movement control lost. Inertial movement started.")
+ if(chassis.do_after(get_step_delay()))
+ chassis.can_move = 1
+ return 1
+ return 0
if(chassis.hasInternalDamage(MECHA_INT_CONTROL_LOST))
move_result = step_rand(chassis)
else if(chassis.dir!=direction)
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index c83fb398b2..4ea091553b 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -101,7 +101,7 @@
var/list/equipment = new //This lists holds what stuff you bolted onto your baby ride
var/obj/item/mecha_parts/mecha_equipment/selected
var/max_equip = 2
-
+
// What direction to float in, if inertial movement is active.
var/float_direction = 0
// Process() iterator count.
@@ -833,7 +833,7 @@
if(hasInternalDamage(MECHA_INT_CONTROL_LOST))
move_result = mechsteprand()
//Up/down zmove
- else if(direction & UP || direction & DOWN)
+ else if(direction == UP || direction == DOWN)
if(!can_ztravel())
occupant_message("Your vehicle lacks the capacity to move in that direction!")
return FALSE
@@ -846,7 +846,7 @@
occupant_message("You can't move that direction from here!")
result = FALSE
break
- var/turf/dest = direction & UP ? GetAbove(T) : GetBelow(T)
+ var/turf/dest = (direction == UP) ? GetAbove(src) : GetBelow(src)
if(!dest)
occupant_message("There is nothing of interest in this direction.")
result = FALSE
diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm
index 171a5f5941..cc7cf8379a 100644
--- a/code/game/objects/structures/ghost_pods/event_vr.dm
+++ b/code/game/objects/structures/ghost_pods/event_vr.dm
@@ -80,11 +80,6 @@
to_chat(M, "You may be a spooky space monster, but your role is to facilitate spooky space monster roleplay, not to fight the station and kill people. You can of course eat and/or digest people as you like if OOC prefs align, but this should be done as part of roleplay. If you intend to fight the station and kill people and such, you need permission from the staff team. GENERALLY, this role should avoid well populated areas. You’re a weird spooky space monster, so the bar is probably not where you’d want to go if you intend to survive. Of course, you’re welcome to try to make friends and roleplay how you will in this regard, but something to keep in mind.")
newPred.ckey = M.ckey
newPred.visible_message("[newPred] emerges from somewhere!")
-
- if(prob(announce_prob))
- spawn(2 MINUTES)
- command_announcement.Announce("Unexpected biosignature detected in the maintenance tunnels of [station_name()].", "Lifesign Alert")
-
qdel(src)
/obj/structure/ghost_pod/ghost_activated/maintpred/no_announce
@@ -119,11 +114,6 @@
newMorph.ckey = M.ckey
newMorph.visible_message("A morph appears to crawl out of somewhere.")
-
- if(prob(announce_prob))
- spawn(2 MINUTES)
- command_announcement.Announce("Unexpected biosignature detected in the maintenance tunnels of [station_name()].", "Lifesign Alert")
-
qdel(src)
/obj/structure/ghost_pod/ghost_activated/morphspawn/no_announce
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index bcd53322b8..9a4039cb1c 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -310,7 +310,7 @@
/turf/proc/try_graffiti(var/mob/vandal, var/obj/item/tool)
- if(!tool.sharp || !can_engrave())
+ if(!tool || !tool.sharp || !can_engrave())
return FALSE
if(jobban_isbanned(vandal, "Graffiti"))
@@ -407,4 +407,4 @@
return
// We were the the B-side in a turf translation
/turf/proc/post_translate_B(var/turf/A)
- return
\ No newline at end of file
+ return
diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
index 3542aadda0..b11905385a 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
@@ -114,3 +114,8 @@ Talon winter coat
display_name = "knight, explo"
path = /obj/item/clothing/suit/armor/combat/crusader_explo
allowed_roles = list("Explorer","Field Medic","Pathfinder")
+
+/datum/gear/suit/armor/combat/crusader_explo/FM
+ display_name = "knight, Field Medic"
+ path = /obj/item/clothing/suit/armor/combat/crusader_explo/FM
+ allowed_roles = list ("Field Medic")
diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm
index 04cdf610c2..e86cc5d1b0 100644
--- a/code/modules/clothing/suits/armor_vr.dm
+++ b/code/modules/clothing/suits/armor_vr.dm
@@ -152,6 +152,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ slowdown=0
siemens_coefficient = 0.9
armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) // Inferior to sec vests in bullet/laser but better for environmental protection.
allowed = list(
@@ -163,4 +164,8 @@
/obj/item/weapon/tank,
/obj/item/device/radio,
/obj/item/weapon/pickaxe
- )
\ No newline at end of file
+ )
+
+/obj/item/clothing/suit/armor/combat/crusader_explo/FM
+ name = "field medic low tech suit"
+ icon_state = "crusader_explo/FM"
diff --git a/icons/obj/clothing/knights_vr.dmi b/icons/obj/clothing/knights_vr.dmi
index 395319fbff..8dd98e9e49 100644
Binary files a/icons/obj/clothing/knights_vr.dmi and b/icons/obj/clothing/knights_vr.dmi differ
diff --git a/maps/stellardelight/stellar_delight2.dmm b/maps/stellardelight/stellar_delight2.dmm
index 115f679088..8597ce7e45 100644
--- a/maps/stellardelight/stellar_delight2.dmm
+++ b/maps/stellardelight/stellar_delight2.dmm
@@ -1055,6 +1055,27 @@
/obj/structure/table/fancyblack,
/turf/simulated/floor/carpet/sblucarpet,
/area/stellardelight/deck2/briefingroom)
+"cc" = (
+/obj/machinery/power/smes/buildable{
+ charge = 2e+006;
+ input_attempt = 1;
+ input_level = 200000;
+ name = "Engine";
+ output_level = 250000;
+ RCon_tag = "Engine - Core"
+ },
+/obj/structure/cable/cyan{
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/plating,
+/area/engineering/storage)
+"cd" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/machinery/floodlight,
+/turf/simulated/floor/plating,
+/area/engineering/storage)
"ce" = (
/obj/machinery/vending/wardrobe/cargodrobe,
/obj/machinery/status_display/supply_display{
@@ -1138,6 +1159,13 @@
/obj/effect/floor_decal/steeldecal/steel_decals_central5,
/turf/simulated/floor/tiled,
/area/stellardelight/deck2/fore)
+"cp" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/machinery/power/thermoregulator,
+/turf/simulated/floor/plating,
+/area/engineering/storage)
"cq" = (
/obj/machinery/air_sensor{
frequency = 1438;
@@ -1475,6 +1503,19 @@
},
/turf/simulated/floor/tiled/eris/dark/orangecorner,
/area/engineering/locker_room)
+"db" = (
+/obj/structure/table/reinforced,
+/obj/item/weapon/paper{
+ info = "For those who didn't know yet, the big blue box in here is a 'grid checker' which will shut off the power if a dangerous power spike erupts into the powernet, shutting everything down protects everything from electrical damage, however the outages can be disruptive to ship operations, so it is designed to restore power after a somewhat significant delay, up to fifteen minutes or so. The grid checker can be manually hacked in order to end the outage sooner. To do that, you must cut three specific wires which do not cause a red light to shine, then pulse a fourth wire. Electrical protection is highly recommended when doing maintenance on the grid checker.";
+ name = "grid checker info"
+ },
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/weapon/storage/box/lights/mixed,
+/turf/simulated/floor/plating,
+/area/engineering/storage)
"dc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/structure/cable/white{
@@ -1504,6 +1545,14 @@
},
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/starboardfore)
+"df" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/structure/cable,
+/obj/machinery/power/grid_checker,
+/turf/simulated/floor/plating,
+/area/engineering/storage)
"dg" = (
/obj/structure/cable/white{
icon_state = "4-8"
@@ -1556,6 +1605,10 @@
},
/turf/simulated/floor/airless,
/area/stellardelight/deck2/exterior)
+"dl" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/plating,
+/area/engineering/storage)
"dm" = (
/obj/item/device/radio/intercom{
dir = 1;
@@ -5241,13 +5294,6 @@
},
/turf/simulated/floor/tiled/eris/dark/gray_platform,
/area/bridge)
-"lE" = (
-/obj/machinery/floodlight,
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/engineering/storage)
"lF" = (
/obj/effect/landmark{
name = "lightsout"
@@ -5264,10 +5310,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/carpet/turcarpet,
/area/crew_quarters/recreation_area)
-"lH" = (
-/obj/machinery/power/thermoregulator,
-/turf/simulated/floor/plating,
-/area/engineering/storage)
"lI" = (
/obj/structure/table/steel_reinforced,
/obj/machinery/door/window/westleft{
@@ -8894,14 +8936,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/stellardelight/substation/engineering)
-"tS" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/structure/cable,
-/obj/machinery/power/grid_checker,
-/turf/simulated/floor/plating,
-/area/engineering/storage)
"tT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -12185,13 +12219,6 @@
/obj/effect/floor_decal/steeldecal/steel_decals5,
/turf/simulated/floor/tiled,
/area/stellardelight/deck2/port)
-"By" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/plating,
-/area/engineering/storage)
"BA" = (
/obj/structure/railing/grey{
dir = 8
@@ -13118,20 +13145,6 @@
},
/turf/simulated/floor,
/area/medical/cryo)
-"DK" = (
-/obj/machinery/power/smes/buildable{
- RCon_tag = "Engine - Core";
- charge = 2e+006;
- input_attempt = 1;
- input_level = 100000;
- name = "Engine";
- output_level = 200000
- },
-/obj/structure/cable/cyan{
- icon_state = "0-8"
- },
-/turf/simulated/floor/plating,
-/area/engineering/storage)
"DL" = (
/turf/simulated/floor/carpet/turcarpet,
/area/crew_quarters/recreation_area)
@@ -36103,8 +36116,8 @@ cm
pe
Yr
Hx
-lH
-DK
+db
+cc
HT
qV
Se
@@ -36245,7 +36258,7 @@ zT
cm
Yr
AK
-tS
+df
iG
HT
It
@@ -36670,8 +36683,8 @@ Wb
tK
tK
Li
-By
-oR
+cd
+dl
oR
gV
oR
@@ -36812,7 +36825,7 @@ Jh
Jh
tK
sy
-lE
+cp
px
px
Jb
diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm
index 629b2e2a2a..f3bc83c4ab 100644
--- a/maps/stellardelight/stellar_delight3.dmm
+++ b/maps/stellardelight/stellar_delight3.dmm
@@ -569,10 +569,10 @@
},
/area/tcommsat/chamber)
"cn" = (
-/obj/structure/cable{
+/obj/structure/cable/green{
icon_state = "2-8"
},
-/obj/structure/cable{
+/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/effect/floor_decal/fancy_shuttle{
@@ -663,6 +663,12 @@
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/starboarddock)
+"cz" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/simulated/wall/bay/r_wall/blue,
+/area/ai_cyborg_station)
"cA" = (
/obj/structure/bed/chair{
dir = 8
@@ -1052,6 +1058,9 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/portdock)
"el" = (
@@ -1808,6 +1817,9 @@
/obj/machinery/door/airlock/angled_bay/double/glass{
name = "glass airlock"
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled/steel_ridged,
/area/stellardelight/deck3/aft)
"gW" = (
@@ -2023,7 +2035,7 @@
/turf/simulated/wall/bay/r_wall/steel,
/area/maintenance/stellardelight/deck3/aftstarroom)
"hR" = (
-/obj/structure/cable{
+/obj/structure/cable/green{
icon_state = "1-8"
},
/obj/effect/floor_decal/fancy_shuttle{
@@ -2149,10 +2161,10 @@
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/portaft)
"iw" = (
-/obj/structure/cable/green{
+/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/cable{
+/obj/structure/cable/green{
icon_state = "1-2"
},
/obj/effect/floor_decal/fancy_shuttle{
@@ -2677,9 +2689,6 @@
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hop)
"kz" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
/obj/machinery/airlock_sensor/airlock_exterior/shuttle{
dir = 6;
pixel_x = 7;
@@ -2695,6 +2704,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 10
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/shuttle/sdboat/aft{
base_turf = /turf/simulated/floor/reinforced/airless
@@ -2982,13 +2994,13 @@
/area/maintenance/stellardelight/deck3/forestarroomb)
"lB" = (
/obj/machinery/door/firedoor/glass,
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/door/airlock/glass,
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "sdboat"
},
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/shuttle/sdboat/aft{
base_turf = /turf/simulated/floor/reinforced/airless
@@ -3135,9 +3147,6 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/structure/cable/green{
- icon_state = "1-8"
- },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/portdock)
"md" = (
@@ -3396,6 +3405,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/portdock)
"na" = (
@@ -3919,6 +3931,9 @@
/area/ai_cyborg_station)
"oO" = (
/obj/machinery/door/firedoor/glass,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled/steel_ridged,
/area/stellardelight/deck3/portdock)
"oP" = (
@@ -4826,7 +4841,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/structure/cable{
+/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/effect/floor_decal/fancy_shuttle{
@@ -4843,9 +4858,6 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/ai)
"sa" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
/obj/effect/map_helper/airlock/door/int_door,
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/glass_external,
@@ -4855,6 +4867,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/shuttle/sdboat/aft{
base_turf = /turf/simulated/floor/reinforced/airless
@@ -4951,9 +4966,6 @@
/area/ai)
"ss" = (
/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
/obj/machinery/door/airlock/angled_bay/external/glass{
dir = 4;
frequency = 1380;
@@ -4973,6 +4985,9 @@
pixel_y = 32;
req_one_access = list(13)
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/steel_ridged,
/area/stellardelight/deck3/portdock)
"st" = (
@@ -5121,6 +5136,12 @@
/obj/random/drinkbottle,
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/portfore)
+"sZ" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/wall/bay/r_wall/blue,
+/area/maintenance/stellardelight/deck3/portaft)
"tb" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
@@ -5237,6 +5258,9 @@
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"tH" = (
@@ -5409,6 +5433,9 @@
dir = 8;
pixel_x = -24
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/portdock)
"ul" = (
@@ -5777,6 +5804,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"vI" = (
@@ -5861,7 +5891,7 @@
/turf/simulated/floor/bluegrid,
/area/ai_cyborg_station)
"vX" = (
-/obj/structure/cable/green{
+/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/map_helper/airlock/atmos/chamber_pump,
@@ -6287,6 +6317,9 @@
pixel_y = -32
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"xB" = (
@@ -6352,6 +6385,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"xP" = (
@@ -6405,7 +6441,7 @@
pixel_x = 17;
pixel_y = 27
},
-/obj/structure/cable{
+/obj/structure/cable/green{
icon_state = "2-8"
},
/obj/effect/floor_decal/fancy_shuttle{
@@ -6579,6 +6615,12 @@
},
/turf/simulated/floor/tiled/steel_ridged,
/area/stellardelight/deck3/portdock)
+"yH" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/wall/bay/r_wall/blue,
+/area/ai_cyborg_station)
"yI" = (
/obj/item/weapon/folder{
pixel_x = -4
@@ -6979,9 +7021,11 @@
dir = 1
},
/obj/machinery/power/apc{
- pixel_y = -28
+ pixel_y = -28;
+ req_access = null;
+ req_one_access = list(11, 67)
},
-/obj/structure/cable,
+/obj/structure/cable/green,
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "sdboat"
},
@@ -7092,6 +7136,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor,
/area/stellardelight/deck2/starboard)
"Aq" = (
@@ -7304,7 +7351,7 @@
pixel_x = -29;
pixel_y = 30
},
-/obj/structure/cable{
+/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/effect/floor_decal/fancy_shuttle{
@@ -7475,9 +7522,6 @@
/area/crew_quarters/heads/cmo)
"BA" = (
/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
/obj/machinery/door/airlock/angled_bay/external/glass{
dir = 4;
frequency = 1380;
@@ -7494,6 +7538,9 @@
pixel_y = 32;
req_one_access = list(13)
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/steel_ridged,
/area/stellardelight/deck3/portdock)
"BB" = (
@@ -7641,7 +7688,7 @@
/obj/machinery/power/terminal{
dir = 1
},
-/obj/structure/cable/green{
+/obj/structure/cable{
icon_state = "0-4"
},
/obj/effect/floor_decal/fancy_shuttle{
@@ -7874,6 +7921,9 @@
/obj/machinery/light/small{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor,
/area/stellardelight/deck2/starboard)
"CJ" = (
@@ -7976,6 +8026,12 @@
},
/turf/simulated/open,
/area/crew_quarters/bar)
+"De" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/simulated/wall/bay/r_wall/blue,
+/area/ai_cyborg_station)
"Df" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -8984,6 +9040,9 @@
pixel_x = -32;
plane = -34
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/portdock)
"Hh" = (
@@ -9339,6 +9398,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 5
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"Iu" = (
@@ -9457,6 +9519,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/portdock)
"IS" = (
@@ -9505,6 +9570,12 @@
},
/turf/simulated/floor/airless,
/area/maintenance/stellardelight/deck3/portcent)
+"IZ" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled,
+/area/stellardelight/deck3/aft)
"Ja" = (
/obj/machinery/door/airlock/angled_bay/external/glass{
frequency = 1379;
@@ -9766,6 +9837,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/portdock)
"JS" = (
@@ -9838,6 +9912,9 @@
/obj/machinery/camera/network/halls{
dir = 1
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"Kg" = (
@@ -9856,9 +9933,7 @@
/obj/machinery/computer/ship/navigation/telescreen{
pixel_x = 32
},
-/obj/machinery/power/shield_generator/charged{
- power_coefficient = 0.33
- },
+/obj/machinery/power/shield_generator/charged,
/obj/structure/cable,
/turf/simulated/floor,
/area/stellardelight/deck2/central)
@@ -9870,9 +9945,11 @@
dir = 8
},
/obj/machinery/power/apc{
- pixel_y = -28
+ pixel_y = -28;
+ req_access = null;
+ req_one_access = list(11, 67)
},
-/obj/structure/cable{
+/obj/structure/cable/green{
icon_state = "0-4"
},
/obj/effect/floor_decal/fancy_shuttle{
@@ -10025,6 +10102,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/portdock)
"KM" = (
@@ -10058,6 +10138,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/portdock)
"KU" = (
@@ -10101,6 +10184,9 @@
"Le" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/structure/flora/pottedplant/minitree,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"Lf" = (
@@ -10248,7 +10334,7 @@
/turf/simulated/floor/wood,
/area/stellardelight/deck3/cafe)
"LO" = (
-/obj/structure/cable{
+/obj/structure/cable/green{
icon_state = "1-2"
},
/obj/effect/floor_decal/fancy_shuttle{
@@ -10398,7 +10484,7 @@
/turf/simulated/floor/tiled/dark,
/area/lawoffice)
"Mo" = (
-/obj/structure/cable/green{
+/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
@@ -10481,6 +10567,9 @@
/area/maintenance/stellardelight/deck3/starboardcent)
"Mx" = (
/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"My" = (
@@ -10489,6 +10578,12 @@
},
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/portcent)
+"MA" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/simulated/wall/bay/r_wall/blue,
+/area/maintenance/stellardelight/deck3/portaft)
"MB" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 10
@@ -10620,6 +10715,9 @@
dir = 4
},
/obj/effect/floor_decal/arrivals,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"MV" = (
@@ -10642,7 +10740,7 @@
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/portaft)
"MX" = (
-/obj/structure/cable/green{
+/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/floor_decal/fancy_shuttle{
@@ -10745,6 +10843,9 @@
/obj/structure/sign/nanotrasen{
pixel_x = -32
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/portdock)
"Nm" = (
@@ -11100,6 +11201,9 @@
"Ou" = (
/obj/item/device/radio/beacon,
/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"Ov" = (
@@ -11151,6 +11255,12 @@
/obj/structure/low_wall/bay/reinforced/steel,
/turf/simulated/floor,
/area/stellardelight/deck3/cafe)
+"OA" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/wall/bay/r_wall/blue,
+/area/ai_cyborg_station)
"OC" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/door/airlock/angled_bay/hatch{
@@ -11397,9 +11507,6 @@
/area/ai_upload)
"Pl" = (
/obj/machinery/door/firedoor/glass,
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/door/airlock/glass{
name = "Starstuff Cockpit";
req_one_access = list(67)
@@ -11407,6 +11514,9 @@
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "sdboat"
},
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/shuttle/sdboat/fore{
base_turf = /turf/simulated/floor/reinforced/airless
@@ -11469,6 +11579,9 @@
/obj/machinery/camera/network/halls{
dir = 1
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"PB" = (
@@ -11589,7 +11702,7 @@
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"Qe" = (
-/obj/structure/cable/green{
+/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden{
@@ -11700,6 +11813,9 @@
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"QB" = (
@@ -12163,6 +12279,9 @@
pixel_y = -32
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"Sm" = (
@@ -12177,9 +12296,6 @@
},
/area/tcommsat/chamber)
"Sn" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
@@ -12189,6 +12305,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals_central5{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/portdock)
"Sp" = (
@@ -12522,6 +12641,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"TE" = (
@@ -13243,12 +13365,12 @@
/obj/machinery/power/smes/buildable{
charge = 500000
},
-/obj/structure/cable{
- icon_state = "0-4"
- },
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "sdboat"
},
+/obj/structure/cable/green{
+ icon_state = "0-4"
+ },
/turf/simulated/floor/tiled,
/area/shuttle/sdboat/aft{
base_turf = /turf/simulated/floor/reinforced/airless
@@ -13599,6 +13721,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/portdock)
"XD" = (
@@ -13896,6 +14021,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 9
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"YB" = (
@@ -14005,6 +14133,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"YS" = (
@@ -14049,6 +14180,9 @@
dir = 4
},
/obj/effect/floor_decal/shuttles/right,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/portdock)
"Zj" = (
@@ -25559,13 +25693,13 @@ th
th
ct
th
-th
+De
Le
TB
-pc
-pc
-pc
-pc
+IZ
+IZ
+IZ
+IZ
YR
YR
xO
@@ -25701,7 +25835,7 @@ Gk
sQ
uT
wo
-th
+yH
jP
BC
en
@@ -25843,7 +25977,7 @@ Gk
Ge
vb
xj
-th
+yH
WZ
LP
zy
@@ -25985,7 +26119,7 @@ Gk
tQ
Vt
wd
-th
+yH
Ed
Cc
Ed
@@ -26121,13 +26255,13 @@ Gk
Gk
Gk
Gk
-Gk
-Gk
-Gk
-th
-th
-th
-th
+MA
+sZ
+sZ
+OA
+OA
+OA
+cz
ow
ok
ow
diff --git a/maps/stellardelight/stellar_delight_things.dm b/maps/stellardelight/stellar_delight_things.dm
index 1b2e056ee6..90c50ddf4f 100644
--- a/maps/stellardelight/stellar_delight_things.dm
+++ b/maps/stellardelight/stellar_delight_things.dm
@@ -34,7 +34,7 @@
/obj/item/weapon/paper/sdshield
name = "ABOUT THE SHIELD GENERATOR"
- info = "ABOUT THE SHIELD GENERATOR
If you're up here you are more than likely worried about hitting rocks or some other such thing. It is good to worry about such things as that is an inevitability.
The Stellar Delight is a rather compact vessel, so a setting of 55 to the range will just barely cover her aft.
It is recommended that you turn off all of the different protection types except multi dimensional warp and whatever it is you're worried about running into. (probably meteors (hyperkinetic)).
With only those two and all the other default settings, the shield uses more than 2 MW to run, which is more than the ship can ordinarily produce. AS SUCH, it is also recommended that you reduce the input cap to whatever you find reasonable (being as it defaults to 1 MW, which is the entirety of the stock power supply) and activate and configure the shield BEFORE you need it.
The shield takes some time to expand its range to the desired specifications, and on top of that, under the default low power setting, takes around 40 seconds to spool up. Once it is active, the fully charged internal capacitors will last for a few minutes before depleting fully. You can increase the passive energy use to decrease the spool up time, but it also uses the stored energy much faster, so, that is not recommended except in dire emergencies.
So, this shield is not intended to be run indefinitely, unless you seriously beef up the ship's engine and power supply.
Fortunately, if you've got a good pilot, you shouldn't really need the shield generator except in rare cases and only for short distances. Still, it is a good idea to configure the shield to be ready before you need it.
Good luck out there - Budly Gregington"
+ info = "ABOUT THE SHIELD GENERATOR
If you're up here you are more than likely worried about hitting rocks or some other such thing. It is good to worry about such things as that is an inevitability.
The Stellar Delight is a rather compact vessel, so a setting of 55 to the range will just barely cover her aft.
It is recommended that you turn off all of the different protection types except multi dimensional warp and whatever it is you're worried about running into. (probably meteors (hyperkinetic)).
With only those two and all the other default settings, the shield uses more than 6 MW to run, which is more than the ship can ordinarily produce. AS SUCH, it is also recommended that you reduce the input cap to whatever you find reasonable (being as it defaults to 1 MW, which is the entirety of the stock power supply) and activate and configure the shield BEFORE you need it.
The shield takes some time to expand its range to the desired specifications, and on top of that, under the default low power setting, takes around 40 seconds to spool up. Once it is active, the fully charged internal capacitors will last for a few minutes before depleting fully. You can increase the passive energy use to decrease the spool up time, but it also uses the stored energy much faster, so, that is not recommended except in dire emergencies.
So, this shield is not intended to be run indefinitely, unless you seriously beef up the ship's engine and power supply.
Fortunately, if you've got a good pilot, you shouldn't really need the shield generator except in rare cases and only for short distances. Still, it is a good idea to configure the shield to be ready before you need it.
Good luck out there - Budly Gregington"
/obj/item/weapon/book/manual/sd_guide
name = "Stellar Delight User's Guide"