From 9d327854b84aa3c501cac9a4287c89d330f99070 Mon Sep 17 00:00:00 2001 From: TheDavestDave <30513964+TheDavestDave@users.noreply.github.com> Date: Sun, 9 Jan 2022 18:26:17 +0000 Subject: [PATCH 01/15] adds medical colours of explo crusader adds a medical sprite for the explo knight amour to load out --- .../loadout/loadout_suit_vr.dm | 5 +++++ code/modules/clothing/suits/armor_vr.dm | 7 ++++++- icons/obj/clothing/knights_vr.dmi | Bin 4926 -> 5175 bytes 3 files changed, 11 insertions(+), 1 deletion(-) 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..defe86b383 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/crusader_FM + display_name = "knight, Field Medic" + path = /obj/item/clothing/suit/armor/combat/crusader_explo + allowed_roles ="Field Medic" \ No newline at end of file diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index 084813b2d1..50fbb4f1ce 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -163,4 +163,9 @@ /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/crusader_FM + name = "feild medic low tech suit" + icon_state = "crusader_FM" + icon = 'icons/obj/clothing/knights_vr.dmi' diff --git a/icons/obj/clothing/knights_vr.dmi b/icons/obj/clothing/knights_vr.dmi index 395319fbff7f0f9ffe25d7f7dbcb5bc50ea01756..8162d0f4cdbfe6eb36a91c65bc84ea3dc2cb2974 100644 GIT binary patch delta 5061 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 delta 4810 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 IYtNYf17RNZmjD0& From 7ef340a39c11c3f57db8bb9dd457a980ad1de192 Mon Sep 17 00:00:00 2001 From: TheDavestDave <30513964+TheDavestDave@users.noreply.github.com> Date: Sun, 9 Jan 2022 18:35:49 +0000 Subject: [PATCH 02/15] updates --- code/modules/clothing/suits/armor_vr.dm | 1 + icons/obj/clothing/knights_vr.dmi | Bin 5175 -> 5166 bytes 2 files changed, 1 insertion(+) diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index 50fbb4f1ce..0211219ab5 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -169,3 +169,4 @@ obj/item/clothing/suit/armor/combat/crusader_explo/crusader_FM name = "feild medic low tech suit" icon_state = "crusader_FM" icon = 'icons/obj/clothing/knights_vr.dmi' + icon_override = 'icons/obj/clothing/knights_vr.dmi' diff --git a/icons/obj/clothing/knights_vr.dmi b/icons/obj/clothing/knights_vr.dmi index 8162d0f4cdbfe6eb36a91c65bc84ea3dc2cb2974..2f8aa1bd64219c2ed92f9844a235de1541362f54 100644 GIT binary patch delta 4285 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 La&ag<=%4sMg@weE From ffe6f05b341ab32e86c4a15a8d71419807e2ad3b Mon Sep 17 00:00:00 2001 From: TheDavestDave <30513964+TheDavestDave@users.noreply.github.com> Date: Sun, 9 Jan 2022 18:48:07 +0000 Subject: [PATCH 03/15] more trying to get the spirtes to work --- code/modules/clothing/suits/armor_vr.dm | 2 -- icons/obj/clothing/knights_vr.dmi | Bin 5166 -> 5174 bytes 2 files changed, 2 deletions(-) diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index 0211219ab5..72376aa702 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -168,5 +168,3 @@ obj/item/clothing/suit/armor/combat/crusader_explo/crusader_FM name = "feild medic low tech suit" icon_state = "crusader_FM" - icon = 'icons/obj/clothing/knights_vr.dmi' - icon_override = 'icons/obj/clothing/knights_vr.dmi' diff --git a/icons/obj/clothing/knights_vr.dmi b/icons/obj/clothing/knights_vr.dmi index 2f8aa1bd64219c2ed92f9844a235de1541362f54..95904bc622f34587aabf48deb6339fb986804d72 100644 GIT binary patch delta 4661 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 delta 4653 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 Date: Sun, 9 Jan 2022 18:57:43 +0000 Subject: [PATCH 04/15] more attempts to get things to work --- .../loadout/loadout_suit_vr.dm | 4 ++-- code/modules/clothing/suits/armor_vr.dm | 6 +++--- icons/obj/clothing/knights_vr.dmi | Bin 5174 -> 5175 bytes 3 files changed, 5 insertions(+), 5 deletions(-) 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 defe86b383..8e399e75bf 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -115,7 +115,7 @@ Talon winter coat path = /obj/item/clothing/suit/armor/combat/crusader_explo allowed_roles = list("Explorer","Field Medic","Pathfinder") -/datum/gear/suit/armor/combat/crusader_explo/crusader_FM +/datum/gear/suit/armor/combat/crusader_explo/FM display_name = "knight, Field Medic" - path = /obj/item/clothing/suit/armor/combat/crusader_explo + path = /obj/item/clothing/suit/armor/combat/crusader_explo/FM allowed_roles ="Field Medic" \ No newline at end of file diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index 72376aa702..46702d3137 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -165,6 +165,6 @@ /obj/item/weapon/pickaxe ) -obj/item/clothing/suit/armor/combat/crusader_explo/crusader_FM - name = "feild medic low tech suit" - icon_state = "crusader_FM" +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 95904bc622f34587aabf48deb6339fb986804d72..8dd98e9e498c6883d5158b240eb017f759167b60 100644 GIT binary patch delta 201 zcmV;)05<=&D7PrEQ~?3alT`sAe^*hjUW{l+gjXPg62Huy+0`gZ^l z9->F$@3fHoU~)2F_)RBthB@3XO5^ckS56h5@6%rsA&ax!^Fba&>F?4;tvS`RDFO`= DSma$m delta 200 zcmV;(05|`)D7GlDQ~?3ZlT`sAe>b9Dy%^At2(Lf}E3i13*@pV~4h_b{DCO2BU;p<1 zlZI@U9MYV{SxT>9tkfObvdv;i$xRB^`ewbNqy^cu?$ubw9r!Y6xZ*7r0VP5jJB(3M z8-9kNj=s3UO_C)D@K?YjsCZX_($k6~h*)lPDLWj6P^(ODxd4OqT+~_#HTXy~`gZ^l z9-~L%@3fHoXmU1R`b{Tvh6UU&O5^ckU(FETXTR8xC3*aOjR%Sr?R%bE6|1u<0u2)W C&|i!I From 9206834c799412614969af799ba2603b41a75c40 Mon Sep 17 00:00:00 2001 From: TheDavestDave <30513964+TheDavestDave@users.noreply.github.com> Date: Sun, 9 Jan 2022 19:11:23 +0000 Subject: [PATCH 05/15] I fixed the sprite problem please don't ask me how I have no idea --- code/modules/client/preference_setup/loadout/loadout_suit_vr.dm | 2 +- code/modules/clothing/suits/armor_vr.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 8e399e75bf..b11905385a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -118,4 +118,4 @@ Talon winter coat /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 ="Field Medic" \ No newline at end of file + allowed_roles = list ("Field Medic") diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index 46702d3137..9d1800baa3 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -165,6 +165,6 @@ /obj/item/weapon/pickaxe ) -obj/item/clothing/suit/armor/combat/crusader_explo/FM +/obj/item/clothing/suit/armor/combat/crusader_explo/FM name = "field medic low tech suit" icon_state = "crusader_explo/FM" From ada55608bbd5092e37c435766ad7b785c167c5a5 Mon Sep 17 00:00:00 2001 From: TheDavestDave <30513964+TheDavestDave@users.noreply.github.com> Date: Sun, 9 Jan 2022 20:05:34 +0000 Subject: [PATCH 06/15] fix explo dnd amour haveing slow down --- code/modules/clothing/suits/armor_vr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index 084813b2d1..0bc5c60563 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( From a6b97320b97e1d3de3a4d0a8cb72a77893060720 Mon Sep 17 00:00:00 2001 From: TheDavestDave <30513964+TheDavestDave@users.noreply.github.com> Date: Sun, 9 Jan 2022 21:03:39 +0000 Subject: [PATCH 07/15] I don't know why I need to set a name for the crate three times but I only did it twice sword crate should spawn now --- code/datums/supplypacks/misc_vr.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm index 7e17009cc3..8e5ae55125 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 From cb4b848052ed9a25fdacefdddbf2f1fab086a32b Mon Sep 17 00:00:00 2001 From: Heroman Date: Tue, 11 Jan 2022 05:10:26 +1000 Subject: [PATCH 08/15] Falloutdog3 --- config/alienwhitelist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index fe8c2b7422..7fa313f655 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -24,6 +24,7 @@ detectivegoogle - Protean digitalsquirrel95 - Black-Eyed Shadekin digitalsquirrel95 - Protean draycu - Vox +falloutdog3 - Black-Eyed Shadekin flaktual - Vox flurriee - Protean funnyman2003 - Xenochimera From 3992250aee557de03d54d718efda25c6dca007ad Mon Sep 17 00:00:00 2001 From: VerySoft Date: Tue, 11 Jan 2022 12:23:12 -0500 Subject: [PATCH 09/15] Removes the announcement for main pred and morph spawns The announcement only really encourages people to go hunting for it, and usually not in the good way, which can in general ruin the surprise that these roles can employ. So! I think it would be better if we just didn't announce them publicly, since they aren't a thing we ever want people to go and respond to mechanically, and, I think that announcements like these ought to be reserved for things we want people responding to. --- code/game/objects/structures/ghost_pods/event_vr.dm | 10 ---------- 1 file changed, 10 deletions(-) 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 From c41461c7e42a7439718caaa1f335033ecfdffec5 Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 11 Jan 2022 23:23:18 +0200 Subject: [PATCH 10/15] Fixes runtime spam caused by altclicking tiles Fixes every unarmed altclick on turfs runtiming because nothing bothered to check whether the person was actually holding anything to engrave with. --- code/game/turfs/turf.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From ebf4ff9cc32a59cab8f16858b076962c97fc420a Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 12 Jan 2022 17:14:25 +1000 Subject: [PATCH 11/15] Updates starting settings of engine smes --- maps/stellardelight/stellar_delight2.dmm | 105 +++++++++++++---------- 1 file changed, 59 insertions(+), 46 deletions(-) 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 From 7bff9cc9741ed39b163942a4dc1f59d6b3d5086f Mon Sep 17 00:00:00 2001 From: Heroman Date: Thu, 13 Jan 2022 20:19:12 +1000 Subject: [PATCH 12/15] Adjusts mech vertical movement bugs --- code/game/mecha/mecha.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From 0b4a543749ecad5f81413fbe62f325cfa4ea14a7 Mon Sep 17 00:00:00 2001 From: Heroman Date: Thu, 13 Jan 2022 21:02:47 +1000 Subject: [PATCH 13/15] Fixes mech jetpack allowing breaking time and space --- code/game/mecha/equipment/tools/jetpack.dm | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) 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) From 940241b8a2a1aa6c5916241f981644dce1b51455 Mon Sep 17 00:00:00 2001 From: liache <76535603+liache@users.noreply.github.com> Date: Thu, 13 Jan 2022 19:18:06 -0500 Subject: [PATCH 14/15] Update alienwhitelist.txt Transfer this application from ckey: liache to ckey: auraribbon , original application at https://forum.vore-station.net/viewtopic.php?f=46&t=1879 --- config/alienwhitelist.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index 7fa313f655..de650d4105 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -8,6 +8,7 @@ arokha - Protean aruis - Diona aruis - Protean aruis - Xenochimera +auraribbon - Black-Eyed Shadekin azmodan412 - Xenochimera beyondmylife - Protean bothnevarbackwards - Diona @@ -44,7 +45,6 @@ joltze - Black-Eyed Shadekin khanivore - Protean killjaden - Protean ktccd - Diona -liache - Black-Eyed Shadekin lillianfyre - Xenochimera lizehrd - Xenochimera lordlag - Black-Eyed Shadekin From fc2a0cea20eb699e7f9ef652c94682c19a21a22e Mon Sep 17 00:00:00 2001 From: VerySoft Date: Fri, 14 Jan 2022 13:58:05 -0500 Subject: [PATCH 15/15] Map Updates Puts the Starstuff SMES on the master grid instead of the civillian grid Also un-nerfs the main shield generator. --- maps/stellardelight/stellar_delight3.dmm | 260 +++++++++++++----- maps/stellardelight/stellar_delight_things.dm | 2 +- 2 files changed, 198 insertions(+), 64 deletions(-) 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"