diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index 959e067a9d..73571bc684 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -89,7 +89,7 @@ /turf/open/floor/pod/dark, /area/shuttle/pirate) "aj" = ( -/turf/closed/wall/mineral/plastitaniumpirate/nodiagonal, +/turf/closed/wall/mineral/plastitanium/nodiagonal/pirate, /area/shuttle/pirate) "ak" = ( /obj/machinery/airalarm/all_access{ @@ -419,6 +419,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/shuttle/pirate) "aK" = ( @@ -466,18 +467,16 @@ /obj/machinery/porta_turret/syndicate/energy{ dir = 1; faction = list("pirate"); - icon_state = "standard_lethal"; - mode = 1 + icon_state = "standard_lethal" }, -/turf/closed/wall/mineral/plastitaniumpirate/nodiagonal, +/turf/closed/wall/mineral/plastitanium/nodiagonal/pirate, /area/shuttle/pirate) "aR" = ( /obj/machinery/porta_turret/syndicate/energy{ faction = list("pirate"); - icon_state = "standard_lethal"; - mode = 1 + icon_state = "standard_lethal" }, -/turf/closed/wall/mineral/plastitaniumpirate, +/turf/closed/wall/mineral/plastitanium/pirate, /area/shuttle/pirate) "aS" = ( /obj/effect/turf_decal/stripes/line, @@ -486,7 +485,7 @@ /area/shuttle/pirate) "aU" = ( /obj/structure/sign/departments/engineering, -/turf/closed/wall/mineral/plastitaniumpirate/nodiagonal, +/turf/closed/wall/mineral/plastitanium/nodiagonal/pirate, /area/shuttle/pirate) "aV" = ( /obj/effect/mob_spawn/human/pirate{ @@ -867,37 +866,36 @@ dir = 1 }, /obj/docking_port/mobile/pirate{ - callTime = 100; - dheight = 0; - dir = 1; dwidth = 11; height = 16; - id = "pirateship"; launch_status = 0; movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); name = "Pirate Ship"; port_direction = 2; - preferred_direction = 1; width = 17 }, /obj/docking_port/stationary{ - dir = 1; dwidth = 11; height = 16; id = "pirateship_home"; name = "Deep Space"; width = 17 }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/shuttle/pirate) +"db" = ( +/obj/structure/shuttle/engine/heater, +/obj/effect/spawner/structure/window/plastitanium/pirate, +/turf/open/floor/plating/airless, +/area/shuttle/pirate) "df" = ( /obj/machinery/porta_turret/syndicate/energy{ dir = 4; faction = list("pirate"); - icon_state = "standard_lethal"; - mode = 1 + icon_state = "standard_lethal" }, -/turf/closed/wall/mineral/plastitaniumpirate, +/turf/closed/wall/mineral/plastitanium/pirate, /area/shuttle/pirate) "dy" = ( /obj/structure/chair/wood/normal, @@ -948,8 +946,7 @@ /turf/open/floor/pod/light, /area/shuttle/pirate) "ep" = ( -/obj/structure/window/plastitaniumpirate{ -//obj/structure/window/reinforced{ +/obj/structure/window/reinforced{ dir = 1; pixel_y = 1 }, @@ -979,8 +976,7 @@ /turf/open/floor/plating/airless, /area/shuttle/pirate) "ex" = ( -/obj/structure/window/plastitaniumpirate -//obj/structure/window/reinforced, +/obj/structure/window/reinforced, /obj/structure/frame/machine, /obj/item/wrench, /turf/open/floor/plating/airless, @@ -990,19 +986,17 @@ id = "piratebridge" }, /obj/structure/grille, -/obj/structure/window/plastitaniumpirate, +/obj/structure/window/plastitanium/pirate, /turf/open/floor/plating, /area/shuttle/pirate) "ez" = ( -/obj/structure/window/plastitaniumpirate -//obj/structure/window/reinforced, +/obj/structure/window/reinforced, /obj/structure/frame/machine, /obj/item/stack/cable_coil/cut/red, /turf/open/floor/plating/airless, /area/shuttle/pirate) "eA" = ( -/obj/structure/window/plastitaniumpirate -//obj/structure/window/reinforced{ +/obj/structure/window/reinforced{ dir = 1; pixel_y = 1 }, @@ -1020,7 +1014,7 @@ /turf/open/floor/plasteel, /area/shuttle/pirate) "fW" = ( -/turf/closed/wall/mineral/plastitaniumpirate, +/turf/closed/wall/mineral/plastitanium/pirate, /area/shuttle/pirate) "fY" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -1091,10 +1085,9 @@ /obj/machinery/porta_turret/syndicate/energy{ dir = 8; faction = list("pirate"); - icon_state = "standard_lethal"; - mode = 1 + icon_state = "standard_lethal" }, -/turf/closed/wall/mineral/plastitaniumpirate, +/turf/closed/wall/mineral/plastitanium/pirate, /area/shuttle/pirate) "yi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -1330,7 +1323,7 @@ aU be aD aG -ep +db aH "} (9,1,1) = {" @@ -1348,7 +1341,7 @@ mU aL bP bX -ep +db aK "} (10,1,1) = {" @@ -1366,7 +1359,7 @@ aj bO bQ bk -ep +db er "} (11,1,1) = {" diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 1d0c3b4ead..b68d6ceead 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -349,21 +349,21 @@ qdel(cover) //deletes the cover - no need on keeping it there! //turret healing -/obj/machinery/porta_turret/attackby(obj/item/I, mob/living/user, params) - if(istype(I, /obj/item/weldingtool) && user.a_intent == INTENT_HELP) - if(obj_integrity < max_integrity) - if(!I.tool_start_check(user, amount=0)) - return - user.visible_message("[user] is welding the turret.", \ - "You begin repairing the turret...", \ - "You hear welding.") - if(I.use_tool(src, user, 40, volume=50)) - obj_integrity = max_integrity - user.visible_message("[user.name] has repaired [src].", \ - "You finish repairing the turret.") - else - to_chat(user, "The turret doesn't need repairing.") - return +/obj/machinery/porta_turret/welder_act(mob/living/user, obj/item/I) + if(obj_integrity < max_integrity) + if(!I.tool_start_check(user, amount=0)) + return + user.visible_message("[user] is welding the turret.", \ + "You begin repairing the turret...", \ + "You hear welding.") + if(I.use_tool(src, user, 40, volume=50)) + obj_integrity = max_integrity + user.visible_message("[user.name] has repaired [src].", \ + "You finish repairing the turret.") + return TRUE + else + to_chat(user, "The turret doesn't need repairing.") + return /obj/machinery/porta_turret/process() @@ -688,7 +688,7 @@ lethal_projectile_sound = 'sound/weapons/laser.ogg' desc = "An energy blaster auto-turret. Use a welder to fix." explosion_block = 50 - max_integrity = 350 + max_integrity = 260 integrity_failure = 20 diff --git a/code/game/objects/effects/spawners/structure.dm b/code/game/objects/effects/spawners/structure.dm index 34af40cb07..71615083b6 100644 --- a/code/game/objects/effects/spawners/structure.dm +++ b/code/game/objects/effects/spawners/structure.dm @@ -163,13 +163,11 @@ again. icon_state = "plastitaniumwindow_spawner" spawn_list = list(/obj/structure/grille, /obj/structure/window/plastitanium) -//plastitaniumpirate window +//plastitanium pirate window -/obj/effect/spawner/structure/window/plastitaniumpirate - name = "plastitanium window spawner" - icon_state = "plastitaniumwindow_spawner" +/obj/effect/spawner/structure/window/plastitanium/pirate explosion_block = 50 - spawn_list = list(/obj/structure/grille, /obj/structure/window/plastitaniumpirate) + spawn_list = list(/obj/structure/grille, /obj/structure/window/plastitanium/pirate) //ice window diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 99a8b94c5a..08d013d4da 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -596,27 +596,11 @@ anchored = FALSE //pirate ship windows -/obj/structure/window/plastitaniumpirate - name = "plastitanium window" +/obj/structure/window/plastitanium/pirate desc = "Yarr this window be explosion proof!" - 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 = 50 - level = 3 - glass_type = /obj/item/stack/sheet/plastitaniumglass - glass_amount = 2 -/obj/structure/window/plastitaniumpirate/unanchored +/obj/structure/window/plastitanium/pirate/unanchored anchored = FALSE /obj/structure/window/reinforced/clockwork diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm index 7d82a20b91..ae25ec2d33 100644 --- a/code/game/turfs/simulated/wall/mineral_walls.dm +++ b/code/game/turfs/simulated/wall/mineral_walls.dm @@ -306,61 +306,16 @@ /////////////////////Pirate Plastitanium walls///////////////////// -/turf/closed/wall/mineral/plastitaniumpirate - name = "wall" +/turf/closed/wall/mineral/plastitanium/pirate desc = "Yarr just try to blow this to smithereens!" - icon = 'icons/turf/walls/plastitanium_wall.dmi' - icon_state = "map-shuttle" explosion_block = 50 - sheet_type = /obj/item/stack/sheet/mineral/plastitanium - smooth = SMOOTH_MORE|SMOOTH_DIAGONAL - canSmoothWith = list(/turf/closed/wall/mineral/plastitaniumpirate, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/plastitaniumpirate, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium) + canSmoothWith = list(/turf/closed/wall/mineral/plastitanium/pirate, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/plastitanium/pirate, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium) -/turf/closed/wall/mineral/plastitaniumpirate/nodiagonal - smooth = SMOOTH_MORE - icon_state = "map-shuttle_nd" +/turf/closed/wall/mineral/plastitanium/nodiagonal/pirate/ explosion_block = 50 -/turf/closed/wall/mineral/plastitaniumpirate/nosmooth - icon = 'icons/turf/shuttle.dmi' - icon_state = "wall" - smooth = SMOOTH_FALSE +/turf/closed/wall/mineral/plastitanium/nosmooth/pirate/ explosion_block = 50 -/turf/closed/wall/mineral/plastitaniumpirate/overspace - icon_state = "map-overspace" - fixed_underlay = list("space"=1) - explosion_block = 50 - -/turf/closed/wall/mineral/plastitaniumpirate/explosive/ex_act(severity) - var/datum/explosion/acted_explosion = null - for(var/datum/explosion/E in GLOB.explosions) - if(E.explosion_id == explosion_id) - acted_explosion = E - break - if(acted_explosion && istype(acted_explosion.explosion_source, /obj/item/bombcore)) - var/obj/item/bombcore/large/bombcore = new(get_turf(src)) - bombcore.detonate() - ..() - -//have to copypaste this code -/turf/closed/wall/mineral/plastitaniumpirate/interior/copyTurf(turf/T) - if(T.type != type) - T.ChangeTurf(type) - if(underlays.len) - T.underlays = underlays - if(T.icon_state != icon_state) - T.icon_state = icon_state - if(T.icon != icon) - T.icon = icon - if(color) - T.atom_colours = atom_colours.Copy() - T.update_atom_colour() - if(T.dir != dir) - T.setDir(dir) - T.transform = transform - return T - -/turf/closed/wall/mineral/plastitaniumpirate/copyTurf(turf/T) - . = ..() - T.transform = transform \ No newline at end of file +/turf/closed/wall/mineral/plastitanium/overspace/pirate/ + explosion_block = 50 \ No newline at end of file