From 86edafb132a933a9447ca2fdf2f0bfa63fa3ce81 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 9 Oct 2017 01:06:50 -0500 Subject: [PATCH] lol --- code/game/area/areas/shuttles.dm | 32 +++++++++++++++--- code/game/objects/structures/false_walls.dm | 7 ++-- code/game/objects/structures/window.dm | 24 +++++++++++-- .../turfs/simulated/wall/mineral_walls.dm | 24 +++++++++++-- .../smooth_structures/plastitanium_window.dmi | Bin 0 -> 2401 bytes icons/turf/walls/plastitanium_wall.dmi | Bin 0 -> 2914 bytes 6 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 icons/obj/smooth_structures/plastitanium_window.dmi create mode 100644 icons/turf/walls/plastitanium_wall.dmi diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index d008f36e29..68ab30478d 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -1,5 +1,6 @@ //These are shuttle areas; all subtypes are only used as teleportation markers, they have no actual function beyond that. +//Multi area shuttles are a thing now, use subtypes! ~ninjanomnom /area/shuttle name = "Shuttle" @@ -10,6 +11,33 @@ valid_territory = FALSE icon_state = "shuttle" +////////////////////////////Multi-area shuttles//////////////////////////// + +////////////////////////////Syndicate infiltrator//////////////////////////// + +/area/shuttle/syndicate + name = "Syndicate Infiltrator" + blob_allowed = FALSE + +/area/shuttle/syndicate/bridge + name = "Syndicate Infiltrator Control" + +/area/shuttle/syndicate/medical + name = "Syndicate Infiltrator Medbay" + +/area/shuttle/syndicate/armory + name = "Syndicate Infiltrator Armory" + +/area/shuttle/syndicate/eva + name = "Syndicate Infiltrator EVA" + +/area/shuttle/syndicate/hallway + +/area/shuttle/syndicate/airlock + name = "Syndicate Infiltrator Airlock" + +////////////////////////////Single-area shuttles//////////////////////////// + /area/shuttle/transit name = "Hyperspace" desc = "Weeeeee" @@ -48,10 +76,6 @@ name = "Transport Shuttle" blob_allowed = FALSE -/area/shuttle/syndicate - name = "Syndicate Infiltrator" - blob_allowed = FALSE - /area/shuttle/assault_pod name = "Steel Rain" blob_allowed = FALSE diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index b81aa7d4d8..460fc62bec 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -321,11 +321,12 @@ /obj/structure/falsewall/plastitanium name = "wall" desc = "An evil wall of plasma and titanium." - icon = 'icons/turf/shuttle.dmi' - icon_state = "wall3" + icon = 'icons/turf/walls/plastitanium_wall.dmi' + icon_state = "shuttle" mineral = /obj/item/stack/sheet/mineral/plastitanium walltype = /turf/closed/wall/mineral/plastitanium - smooth = SMOOTH_FALSE + smooth = SMOOTH_MORE + canSmoothWith = list(/turf/closed/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater) /obj/structure/falsewall/brass name = "clockwork wall" diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 170a651315..59db363399 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -588,10 +588,10 @@ flags_1 = PREVENT_CLICK_UNDER_1 reinf = TRUE heat_resistance = 1600 - armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100) + armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100) smooth = SMOOTH_TRUE canSmoothWith = null - explosion_block = 1 + explosion_block = 3 level = 3 glass_type = /obj/item/stack/sheet/rglass glass_amount = 2 @@ -602,6 +602,26 @@ /obj/structure/window/shuttle/tinted opacity = TRUE +/obj/structure/window/plastitanium + name = "plastitanium window" + desc = "An evil looking window of plasma and titanium." + icon = 'icons/obj/smooth_structures/plastitanium_window.dmi' + icon_state = "plastitanium_window" + dir = FULLTILE_WINDOW_DIR + max_integrity = 100 + wtype = "shuttle" + fulltile = TRUE + flags_1 = PREVENT_CLICK_UNDER_1 + reinf = TRUE + heat_resistance = 1600 + armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100) + smooth = SMOOTH_TRUE + canSmoothWith = null + explosion_block = 3 + level = 3 + glass_type = /obj/item/stack/sheet/rglass + glass_amount = 2 + /obj/structure/window/reinforced/clockwork name = "brass window" desc = "A paper-thin pane of translucent yet reinforced brass." diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm index 05d6de5ca6..6ae60a6e49 100644 --- a/code/game/turfs/simulated/wall/mineral_walls.dm +++ b/code/game/turfs/simulated/wall/mineral_walls.dm @@ -170,11 +170,14 @@ explosion_block = 3 canSmoothWith = list(/turf/closed/wall/mineral/abductor, /obj/structure/falsewall/abductor) +/////////////////////Titanium walls///////////////////// + /turf/closed/wall/mineral/titanium //has to use this path due to how building walls works name = "wall" desc = "A light-weight titanium wall used in shuttles." icon = 'icons/turf/walls/shuttle_wall.dmi' icon_state = "map-shuttle" + explosion_block = 3 flags_1 = CAN_BE_DIRTY_1 | CHECK_RICOCHET_1 sheet_type = /obj/item/stack/sheet/mineral/titanium smooth = SMOOTH_MORE|SMOOTH_DIAGONAL @@ -230,14 +233,31 @@ /turf/closed/wall/mineral/titanium/survival/pod canSmoothWith = list(/turf/closed/wall/mineral/titanium/survival, /obj/machinery/door/airlock, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/shuttle, /obj/structure/shuttle/engine) +/////////////////////Plastitanium walls///////////////////// + /turf/closed/wall/mineral/plastitanium name = "wall" desc = "An evil wall of plasma and titanium." - icon = 'icons/turf/shuttle.dmi' - icon_state = "wall3" + icon = 'icons/turf/walls/plastitanium_wall.dmi' + icon_state = "map-shuttle" + explosion_block = 4 sheet_type = /obj/item/stack/sheet/mineral/plastitanium + smooth = SMOOTH_MORE|SMOOTH_DIAGONAL + canSmoothWith = list(/turf/closed/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/plastitanium, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium) + +/turf/closed/wall/mineral/plastitanium/nodiagonal + smooth = SMOOTH_MORE + icon_state = "map-shuttle_nd" + +/turf/closed/wall/mineral/plastitanium/nosmooth + icon = 'icons/turf/shuttle.dmi' + icon_state = "wall" smooth = SMOOTH_FALSE +/turf/closed/wall/mineral/plastitanium/overspace + icon_state = "map-overspace" + fixed_underlay = list("space"=1) + //have to copypaste this code /turf/closed/wall/mineral/plastitanium/interior/copyTurf(turf/T) if(T.type != type) diff --git a/icons/obj/smooth_structures/plastitanium_window.dmi b/icons/obj/smooth_structures/plastitanium_window.dmi new file mode 100644 index 0000000000000000000000000000000000000000..82ac0306159d66e6909de1123a3407ad645b5bea GIT binary patch literal 2401 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 M07*qoM6N<$f>BV5VE_OC literal 0 HcmV?d00001