From e570838e460373fd133573659c01fb4b3ca7e875 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 20 Mar 2020 00:17:58 -0400 Subject: [PATCH 1/2] Shield Generator for Cruiser --- maps/tether/submaps/om_ships/cruiser.dmm | 123 ++++++++++++++++------- 1 file changed, 88 insertions(+), 35 deletions(-) diff --git a/maps/tether/submaps/om_ships/cruiser.dmm b/maps/tether/submaps/om_ships/cruiser.dmm index a2765963e51..3a00dfe21c3 100644 --- a/maps/tether/submaps/om_ships/cruiser.dmm +++ b/maps/tether/submaps/om_ships/cruiser.dmm @@ -2068,7 +2068,7 @@ pixel_y = 28; req_one_access = list(108) }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "ed" = ( /obj/structure/cable/cyan{ @@ -2083,7 +2083,7 @@ pixel_x = 0; pixel_y = 28 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "ee" = ( /obj/structure/cable/cyan{ @@ -2092,11 +2092,21 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "ef" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "eg" = ( /obj/machinery/firealarm{ @@ -2105,10 +2115,31 @@ pixel_x = 4; pixel_y = 26 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "eh" = ( -/turf/simulated/floor/tiled/techmaint, +/obj/structure/cable/cyan{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/shield_capacitor/advanced{ + anchored = 1 + }, +/obj/structure/cable/cyan{ + d2 = 8; + icon_state = "0-8" + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "ei" = ( /obj/structure/closet/wardrobe/ert, @@ -2299,42 +2330,46 @@ /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "ew" = ( -/obj/effect/floor_decal/industrial/warning/corner, /obj/machinery/light{ dir = 8; icon_state = "tube1"; pixel_y = 0 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "ex" = ( /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "ey" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "ez" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "eA" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - icon_state = "warningcorner"; - dir = 8 +/obj/structure/cable/cyan, +/obj/structure/cable/cyan{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/shield_gen/external/advanced{ + anchored = 1 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "eB" = ( /obj/structure/cable/cyan{ @@ -2520,32 +2555,33 @@ /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "eN" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/mothership/teleporter) -"eO" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/teleport/hub, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, +/area/mothership/teleporter) +"eO" = ( +/obj/machinery/teleport/station, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "eP" = ( -/obj/machinery/teleport/station, -/turf/simulated/floor/tiled/techmaint, -/area/mothership/teleporter) -"eQ" = ( /obj/machinery/computer/teleporter{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) -"eR" = ( +"eQ" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/item/device/perfect_tele_beacon/stationary{ tele_name = "Warship"; tele_network = "centcom" }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/mothership/teleporter) +"eR" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 8 + }, /obj/machinery/alarm{ alarm_id = "pen_nine"; breach_detection = 0; @@ -2553,13 +2589,20 @@ icon_state = "alarm0"; pixel_y = -22 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "eS" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/structure/cable/cyan, +/obj/machinery/shield_capacitor/advanced{ + anchored = 1; + dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "eT" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -10160,6 +10203,16 @@ }, /turf/simulated/floor/wood, /area/mothership/breakroom) +"Hl" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/mothership/teleporter) "Kr" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -20495,7 +20548,7 @@ EK dA dP eg -ex +Hl eR fd fz From a40df7dda7d0bcdff46b103c10b5af9a8f255ffa Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 20 Mar 2020 00:35:55 -0400 Subject: [PATCH 2/2] Earlyports some bugfixes --- code/defines/obj.dm | 2 +- code/game/objects/items/toys.dm | 4 ++-- code/modules/mob/living/carbon/human/life.dm | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 1f3a7257c99..293ea99e7f8 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -124,7 +124,7 @@ var/global/list/PDA_Manifest = list() if(depthead && car.len != 1) car.Swap(1,car.len) - if(SSjob.is_job_in_department(real_rank, DEPARTMENT_CARGO)) + if(SSjob.is_job_in_department(real_rank, DEPARTMENT_CIVILIAN)) civ[++civ.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 if(depthead && civ.len != 1) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index a54c7e5c7bd..9760e2da8ae 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -902,7 +902,7 @@ /obj/structure/plushie/attack_hand(mob/user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - if(stored_item && !searching) + if(stored_item && opened && !searching) searching = TRUE if(do_after(user, 10)) to_chat(user, "You find \icon[stored_item] [stored_item] in [src]!") @@ -999,7 +999,7 @@ to_chat(user, "You can see something in there...") /obj/item/toy/plushie/attack_self(mob/user as mob) - if(stored_item && !searching) + if(stored_item && opened && !searching) searching = TRUE if(do_after(user, 10)) to_chat(user, "You find \icon[stored_item] [stored_item] in [src]!") diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 537f83002da..e4127c9a025 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1523,7 +1523,6 @@ else shock_stage = min(shock_stage, 160) shock_stage = max(shock_stage-1, 0) - return if(stat) return 0