From 72980949344e850262d7d54d12aa4c15b915c080 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Thu, 20 Feb 2020 00:45:38 -0500 Subject: [PATCH 1/2] Blue alien ship stuff --- code/game/machinery/doors/airlock_vr.dm | 22 ++++++++++++++++++++- code/game/turfs/simulated/wall_types_vr.dm | 16 +++++++++++++++ icons/obj/doors/Dooralien_blue.dmi | Bin 0 -> 7064 bytes icons/turf/shuttle_alien_blue.dmi | Bin 0 -> 4300 bytes 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 icons/obj/doors/Dooralien_blue.dmi create mode 100644 icons/turf/shuttle_alien_blue.dmi diff --git a/code/game/machinery/doors/airlock_vr.dm b/code/game/machinery/doors/airlock_vr.dm index 8140eb2474..c26bb9187c 100644 --- a/code/game/machinery/doors/airlock_vr.dm +++ b/code/game/machinery/doors/airlock_vr.dm @@ -1,2 +1,22 @@ /obj/machinery/door/airlock/glass_external/public - req_one_access = list() \ No newline at end of file + req_one_access = list() + +/obj/machinery/door/airlock/alien/blue + name = "hybrid airlock" + desc = "You're fairly sure this is a door." + catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_airlock) + icon = 'icons/obj/doors/Dooralien_blue.dmi' + explosion_resistance = 20 + secured_wires = TRUE + hackProof = TRUE + assembly_type = /obj/structure/door_assembly/door_assembly_alien + req_one_access = list() + +/obj/machinery/door/airlock/alien/blue/locked + icon_state = "door_locked" + locked = TRUE + +/obj/machinery/door/airlock/alien/blue/public // Entry to UFO. + req_one_access = list() + normalspeed = FALSE // So it closes faster and hopefully keeps the warm air inside. + hackProof = TRUE //VOREStation Edit - No borgos diff --git a/code/game/turfs/simulated/wall_types_vr.dm b/code/game/turfs/simulated/wall_types_vr.dm index 4d939c2004..0fc6028c88 100644 --- a/code/game/turfs/simulated/wall_types_vr.dm +++ b/code/game/turfs/simulated/wall_types_vr.dm @@ -1,3 +1,19 @@ +/turf/simulated/shuttle/wall/alien/blue + name = "hybrid wall" + desc = "Seems slightly more friendly than if the wall were ominous purple." + icon = 'icons/turf/shuttle_alien_blue.dmi' + light_color = "#1fdbf4" // Cyan-ish + +/turf/simulated/shuttle/wall/alien/blue/hard_corner + name = "hybrid wall" + icon_state = "alien-hc" + hard_corner = 1 + +/turf/simulated/shuttle/wall/alien/blue/no_join + name = "hybrid wall" + icon_state = "alien-nj" + join_group = null + /turf/simulated/flesh name = "flesh wall" desc = "The fleshy surface of this wall squishes nicely under your touch but looks and feels extremly strong" diff --git a/icons/obj/doors/Dooralien_blue.dmi b/icons/obj/doors/Dooralien_blue.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e6e462f6fc34aa415c28f99d2554d18496059a83 GIT binary patch literal 7064 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 literal 0 HcmV?d00001 diff --git a/icons/turf/shuttle_alien_blue.dmi b/icons/turf/shuttle_alien_blue.dmi new file mode 100644 index 0000000000000000000000000000000000000000..203c11756e52a09950ce5c47e87792ff46a8139e GIT binary patch literal 4300 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 Date: Thu, 20 Feb 2020 00:55:45 -0500 Subject: [PATCH 2/2] Update lewdshuttles to hybrid variant --- maps/tether/tether-10-colony.dmm | 392 +++++++++++++++---------------- 1 file changed, 196 insertions(+), 196 deletions(-) diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm index 3e6fad2ade..88e010d175 100644 --- a/maps/tether/tether-10-colony.dmm +++ b/maps/tether/tether-10-colony.dmm @@ -3,15 +3,8 @@ /turf/unsimulated/wall/planetary/virgo3b, /area/space) "ab" = ( -/obj/machinery/power/emitter/gyrotron/anchored{ - desc = "It is a heavy duty pulse laser emitter."; - dir = 1; - icon_state = "emitter-off"; - name = "pulse laser" - }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/mothership/breakroom) +/turf/simulated/shuttle/wall/alien/blue/hard_corner, +/area/unknown/dorm4) "ac" = ( /turf/unsimulated/mineral/virgo3b, /area/space) @@ -2061,13 +2054,8 @@ }, /area/centcom/control) "dx" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_l"; - dir = 8 - }, -/turf/unsimulated/floor/shuttle_ceiling, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/specialops/centcom) +/turf/simulated/shuttle/wall/alien/blue, +/area/unknown/dorm4) "dy" = ( /obj/structure/bed/chair, /obj/item/weapon/handcuffs, @@ -4097,13 +4085,8 @@ /turf/unsimulated/floor/steel, /area/centcom/control) "hx" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "propulsion"; - dir = 8 - }, -/turf/unsimulated/floor/shuttle_ceiling, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/specialops/centcom) +/turf/simulated/shuttle/wall/alien/blue/hard_corner, +/area/unknown/dorm3) "hy" = ( /obj/machinery/button/remote/blast_door{ id = "ArmouryC4"; @@ -4770,13 +4753,8 @@ /turf/unsimulated/floor/steel, /area/centcom/evac) "iQ" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_r"; - dir = 8 - }, -/turf/unsimulated/floor/shuttle_ceiling, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/specialops/centcom) +/turf/simulated/shuttle/wall/alien/blue, +/area/unknown/dorm3) "iR" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/storage/box/gloves, @@ -5043,13 +5021,13 @@ "jm" = ( /obj/machinery/power/emitter/gyrotron/anchored{ desc = "It is a heavy duty pulse laser emitter."; - dir = 8; + dir = 1; icon_state = "emitter-off"; name = "pulse laser" }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/mothership/eva) +/area/mothership/breakroom) "jn" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -5091,15 +5069,9 @@ }, /area/mothership/cryotube) "jr" = ( -/obj/machinery/power/emitter/gyrotron/anchored{ - desc = "It is a heavy duty pulse laser emitter."; - dir = 4; - icon_state = "emitter-off"; - name = "pulse laser" - }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/mothership/eva) +/obj/machinery/door/airlock/alien/blue/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "js" = ( /obj/structure/table/reinforced, /obj/item/weapon/storage/firstaid/clotting, @@ -5145,15 +5117,9 @@ base_turf = /turf/simulated/floor/tiled/steel_dirty/virgo3b }) "jz" = ( -/obj/machinery/power/emitter/gyrotron/anchored{ - desc = "It is a heavy duty pulse laser emitter."; - dir = 8; - icon_state = "emitter-off"; - name = "pulse laser" - }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/mothership/surgery) +/obj/machinery/door/airlock/alien/blue/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "jA" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, @@ -7339,15 +7305,13 @@ /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "nl" = ( -/obj/machinery/power/emitter/gyrotron/anchored{ - desc = "It is a heavy duty pulse laser emitter."; - dir = 4; - icon_state = "emitter-off"; - name = "pulse laser" +/obj/structure/shuttle/engine/propulsion{ + icon_state = "burst_l"; + dir = 8 }, -/turf/space, +/turf/unsimulated/floor/shuttle_ceiling, /turf/simulated/shuttle/plating/airless/carry, -/area/mothership/security) +/area/shuttle/specialops/centcom) "nm" = ( /turf/unsimulated/floor/steel, /area/centcom/evac) @@ -9660,15 +9624,13 @@ /turf/unsimulated/wall, /area/centcom/terminal) "rr" = ( -/obj/machinery/power/emitter/gyrotron/anchored{ - desc = "It is a heavy duty pulse laser emitter."; - dir = 8; - icon_state = "emitter-off"; - name = "pulse laser" +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion"; + dir = 8 }, -/turf/space, +/turf/unsimulated/floor/shuttle_ceiling, /turf/simulated/shuttle/plating/airless/carry, -/area/mothership/resleeving) +/area/shuttle/specialops/centcom) "rs" = ( /turf/unsimulated/wall, /area/centcom/terminal) @@ -16261,15 +16223,13 @@ /turf/simulated/floor/tiled/techmaint, /area/mothership/robotics) "CE" = ( -/obj/machinery/power/emitter/gyrotron/anchored{ - desc = "It is a heavy duty pulse laser emitter."; - dir = 4; - icon_state = "emitter-off"; - name = "pulse laser" +/obj/structure/shuttle/engine/propulsion{ + icon_state = "burst_r"; + dir = 8 }, -/turf/space, +/turf/unsimulated/floor/shuttle_ceiling, /turf/simulated/shuttle/plating/airless/carry, -/area/mothership/warden) +/area/shuttle/specialops/centcom) "CF" = ( /obj/machinery/power/emitter/gyrotron/anchored{ desc = "It is a heavy duty pulse laser emitter."; @@ -16279,7 +16239,7 @@ }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/mothership/rnd) +/area/mothership/eva) "CG" = ( /obj/structure/bed/chair/wood{ icon_state = "wooden_chair"; @@ -16684,7 +16644,7 @@ }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/mothership/armory) +/area/mothership/eva) "Dk" = ( /obj/machinery/power/emitter/gyrotron/anchored{ desc = "It is a heavy duty pulse laser emitter."; @@ -16694,7 +16654,7 @@ }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/mothership/telecomms1) +/area/mothership/surgery) "Dl" = ( /obj/machinery/power/emitter/gyrotron/anchored{ desc = "It is a heavy duty pulse laser emitter."; @@ -16704,7 +16664,7 @@ }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/mothership/telecomms2) +/area/mothership/security) "Dm" = ( /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, @@ -16803,6 +16763,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/mothership/processing) +"Dx" = ( +/obj/machinery/power/emitter/gyrotron/anchored{ + desc = "It is a heavy duty pulse laser emitter."; + dir = 8; + icon_state = "emitter-off"; + name = "pulse laser" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/mothership/resleeving) "Dy" = ( /obj/structure/closet/secure_closet/sar, /turf/simulated/floor/tiled/white, @@ -16930,6 +16900,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/mothership/sechallway) +"DO" = ( +/obj/machinery/power/emitter/gyrotron/anchored{ + desc = "It is a heavy duty pulse laser emitter."; + dir = 4; + icon_state = "emitter-off"; + name = "pulse laser" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/mothership/warden) "DP" = ( /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, @@ -17021,6 +17001,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/mothership/warden) +"Ea" = ( +/obj/machinery/power/emitter/gyrotron/anchored{ + desc = "It is a heavy duty pulse laser emitter."; + dir = 8; + icon_state = "emitter-off"; + name = "pulse laser" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/mothership/rnd) "Eb" = ( /obj/item/modular_computer/telescreen/preset/generic{ pixel_y = 28 @@ -17053,6 +17043,16 @@ }, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm3) +"Ef" = ( +/obj/machinery/power/emitter/gyrotron/anchored{ + desc = "It is a heavy duty pulse laser emitter."; + dir = 4; + icon_state = "emitter-off"; + name = "pulse laser" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/mothership/armory) "Eg" = ( /obj/structure/table/steel_reinforced, /obj/machinery/door/window/westleft, @@ -17113,6 +17113,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/mothership/teleporter) +"Eq" = ( +/obj/machinery/power/emitter/gyrotron/anchored{ + desc = "It is a heavy duty pulse laser emitter."; + dir = 8; + icon_state = "emitter-off"; + name = "pulse laser" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/mothership/telecomms1) "Er" = ( /obj/machinery/shower{ dir = 4; @@ -17262,6 +17272,16 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/mothership/bridge) +"EH" = ( +/obj/machinery/power/emitter/gyrotron/anchored{ + desc = "It is a heavy duty pulse laser emitter."; + dir = 4; + icon_state = "emitter-off"; + name = "pulse laser" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/mothership/telecomms2) "EI" = ( /obj/structure/table/rack, /obj/item/weapon/gun/launcher/rocket, @@ -18332,9 +18352,6 @@ }, /turf/simulated/floor/tiled/white, /area/mothership/kitchen) -"Hq" = ( -/turf/simulated/shuttle/wall/alien/hard_corner, -/area/unknown/dorm4) "Hr" = ( /obj/structure/cable/cyan{ d1 = 4; @@ -21001,10 +21018,6 @@ }, /turf/simulated/floor/tiled/white, /area/mothership/medical) -"Nt" = ( -/obj/machinery/door/airlock/alien/public, -/turf/simulated/shuttle/floor/alienplating, -/area/unknown/dorm4) "Nu" = ( /obj/machinery/telecomms/processor/preset_cent, /turf/simulated/floor/bluegrid, @@ -22690,10 +22703,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/white, /area/mothership/treatment) -"QT" = ( -/obj/machinery/door/airlock/alien/public, -/turf/simulated/shuttle/floor/alienplating, -/area/unknown/dorm3) "QU" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ hard_corner = 1; @@ -23071,9 +23080,6 @@ }, /turf/simulated/floor/tiled/white, /area/mothership/resleeving) -"RM" = ( -/turf/simulated/shuttle/wall/alien, -/area/unknown/dorm3) "RN" = ( /obj/structure/table/alien, /turf/simulated/shuttle/floor/alien, @@ -24701,9 +24707,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/mothership/rnd) -"Vv" = ( -/turf/simulated/shuttle/wall/alien/hard_corner, -/area/unknown/dorm3) "Vw" = ( /obj/structure/closet/wardrobe/ert, /obj/item/weapon/storage/box/survival/comp{ @@ -25465,9 +25468,6 @@ /obj/item/modular_computer/console/preset/mercenary, /turf/simulated/floor/tiled/steel_grid, /area/mothership/bridge) -"Xp" = ( -/turf/simulated/shuttle/wall/alien, -/area/unknown/dorm4) "Xq" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -27760,7 +27760,7 @@ OF ZL XS MJ -jz +Dk MJ XS ZL @@ -27772,7 +27772,7 @@ XS ZL XS PD -rr +Dx PD XS ZL @@ -27784,7 +27784,7 @@ XS ZL XS Ve -CF +Ea Ve XS ZL @@ -27797,7 +27797,7 @@ NJ UE ZL UE -Dk +Eq UE OF OF @@ -28458,7 +28458,7 @@ QU XK XK gX -jm +CF Sh Gw Sh @@ -29156,7 +29156,7 @@ OF OF OF OF -ab +jm IT OR OR @@ -30718,7 +30718,7 @@ OF OF OF OF -ab +jm IT Sx OR @@ -31440,7 +31440,7 @@ Sf OE OE Ki -jr +Dj Sh Di Sh @@ -32162,7 +32162,7 @@ OF ZL XS YF -nl +Dl YF XS ZL @@ -32174,7 +32174,7 @@ XS ZL XS ZM -CE +DO Ow XS ZL @@ -32186,7 +32186,7 @@ XS ZL XS TX -Dj +Ef TX XS ZL @@ -32199,7 +32199,7 @@ OZ Hj ZL Hj -Dl +EH Hj OF OF @@ -34267,19 +34267,19 @@ ac ac ac ac -Hq -Xp -Hq -Xp -Xp -Xp -Xp -Xp -Xp -Hq -Xp -Xp -Hq +ab +dx +ab +dx +dx +dx +dx +dx +dx +ab +dx +dx +ab ac ac ac @@ -34409,19 +34409,19 @@ ac ac ac ac -Xp +dx Ts -Hq +ab UJ mR DU Zn WC WC -Hq +ab DL Es -Xp +dx ac ac ac @@ -34551,19 +34551,19 @@ ac ac ac ac -Xp +dx Mg -Nt +jr DL Mg JF Mg Mg DL -Nt +jr DL ZS -Xp +dx ac ac ac @@ -34693,19 +34693,19 @@ ac ac ac ac -Xp +dx Wi -Hq +ab Qk Mg Mg Mg Mg LX -Hq +ab DL RV -Xp +dx ac ac ac @@ -34835,19 +34835,19 @@ ac ac ac ac -Xp +dx Pw -Xp +dx ZR DL GK Nl EN Ok -Xp +dx DL JY -Xp +dx ac ac ac @@ -34977,19 +34977,19 @@ ac ac ac ac -Hq -Xp -Hq -Xp -Xp -Xp -Xp -Xp -Xp -Hq -Xp -Xp -Hq +ab +dx +ab +dx +dx +dx +dx +dx +dx +ab +dx +dx +ab ac ac ac @@ -35971,19 +35971,19 @@ ac ac ac ac -Vv -RM -Vv -RM -RM -RM -RM -RM -RM -Vv -RM -RM -Vv +hx +iQ +hx +iQ +iQ +iQ +iQ +iQ +iQ +hx +iQ +iQ +hx ac ac ac @@ -36113,19 +36113,19 @@ ac ac ac ac -RM +iQ RW -Vv +hx Sz Yp gh WH Zm Zm -Vv +hx Zy Rb -RM +iQ ac ac ac @@ -36255,19 +36255,19 @@ ac ac ac ac -RM +iQ Rh -QT +jz Zy Rh SF Rh Rh Zy -QT +jz Zy ND -RM +iQ ac ac ac @@ -36397,19 +36397,19 @@ ac ac ac ac -RM +iQ Pn -Vv +hx iI Rh Rh Rh Rh jn -Vv +hx Zy Fy -RM +iQ ac ac ac @@ -36539,19 +36539,19 @@ ac ac ac ac -RM +iQ Ee -RM +iQ Sa Zy Js JK Rw RN -RM +iQ Zy VP -RM +iQ ac ac ac @@ -36681,19 +36681,19 @@ ac ac ac ac -Vv -RM -Vv -RM -RM -RM -RM -RM -RM -Vv -RM -RM -Vv +hx +iQ +hx +iQ +iQ +iQ +iQ +iQ +iQ +hx +iQ +iQ +hx ac ac ac @@ -43363,11 +43363,11 @@ ac ac ac ah -dx -hx -hx -hx -iQ +nl +rr +rr +rr +CE ah av aG