shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Should fix the rest of the requested changes

Browse Source 
Title
This commit is contained in:
keronshb
2020-02-09 17:30:22 -05:00
parent 9609eb64e0
commit 60a3b134a3
6 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/shuttles/pirate_default.dmm
+11 -11
View File
@@ -89,7 +89,7 @@
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"aj" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal/pirate,
/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
/area/shuttle/pirate)
"ak" = (
/obj/machinery/airalarm/all_access{
@@ -464,19 +464,19 @@
/turf/open/floor/plating,
/area/shuttle/pirate)
"aQ" = (
/obj/machinery/porta_turret/syndicate/energy{
/obj/machinery/porta_turret/syndicate/energy/pirate{
dir = 1;
faction = list("pirate");
icon_state = "standard_lethal"
},
/turf/closed/wall/mineral/plastitanium/nodiagonal/pirate,
/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
/area/shuttle/pirate)
"aR" = (
/obj/machinery/porta_turret/syndicate/energy{
/obj/machinery/porta_turret/syndicate/energy/pirate{
faction = list("pirate");
icon_state = "standard_lethal"
},
/turf/closed/wall/mineral/plastitanium/pirate,
/turf/closed/wall/r_wall/syndicate/pirate,
/area/shuttle/pirate)
"aS" = (
/obj/effect/turf_decal/stripes/line,
@@ -485,7 +485,7 @@
/area/shuttle/pirate)
"aU" = (
/obj/structure/sign/departments/engineering,
/turf/closed/wall/mineral/plastitanium/nodiagonal/pirate,
/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
/area/shuttle/pirate)
"aV" = (
/obj/effect/mob_spawn/human/pirate{
@@ -890,12 +890,12 @@
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"df" = (
/obj/machinery/porta_turret/syndicate/energy{
/obj/machinery/porta_turret/syndicate/energy/pirate{
dir = 4;
faction = list("pirate");
icon_state = "standard_lethal"
},
/turf/closed/wall/mineral/plastitanium/pirate,
/turf/closed/wall/r_wall/syndicate/pirate,
/area/shuttle/pirate)
"dy" = (
/obj/structure/chair/wood/normal,
@@ -1014,7 +1014,7 @@
/turf/open/floor/plasteel,
/area/shuttle/pirate)
"fW" = (
/turf/closed/wall/mineral/plastitanium/pirate,
/turf/closed/wall/r_wall/syndicate/pirate,
/area/shuttle/pirate)
"fY" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -1082,12 +1082,12 @@
/turf/open/floor/plasteel/showroomfloor,
/area/shuttle/pirate)
"wR" = (
/obj/machinery/porta_turret/syndicate/energy{
/obj/machinery/porta_turret/syndicate/energy/pirate{
dir = 8;
faction = list("pirate");
icon_state = "standard_lethal"
},
/turf/closed/wall/mineral/plastitanium/pirate,
/turf/closed/wall/r_wall/syndicate/pirate,
/area/shuttle/pirate)
"yi" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
code/game/machinery/porta_turret/portable_turret.dm
+5 -4
View File
@@ -27,7 +27,7 @@
max_integrity = 160 //the turret's health
integrity_failure = 80
armor = list("melee" = 50, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
armor = list("melee" = 50, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
var/locked = TRUE //if the turret's behaviour control access is locked
var/controllock = FALSE //if the turret responds to control panels
@@ -687,9 +687,6 @@
lethal_projectile = /obj/item/projectile/beam/laser
lethal_projectile_sound = 'sound/weapons/laser.ogg'
desc = "An energy blaster auto-turret. Use a welder to fix."
explosion_block = 50
max_integrity = 260
integrity_failure = 20
/obj/machinery/porta_turret/syndicate/energy/heavy
@@ -703,6 +700,10 @@
lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
desc = "An energy blaster auto-turret."
/obj/machinery/porta_turret/syndicate/energy/pirate
max_integrity = 260
integrity_failure = 20
/obj/machinery/porta_turret/syndicate/setup()
return
code/game/objects/effects/spawners/structure.dm
-2
View File
@@ -166,8 +166,6 @@ again.
//plastitanium pirate window
/obj/effect/spawner/structure/window/plastitanium/pirate
explosion_block = 50
spawn_list = list(/obj/structure/grille, /obj/structure/window/plastitanium/pirate)
//ice window
code/game/objects/structures/window.dm
+1 -1
View File
@@ -598,7 +598,7 @@
//pirate ship windows
/obj/structure/window/plastitanium/pirate
desc = "Yarr this window be explosion proof!"
explosion_block = 50
explosion_block = 30
/obj/structure/window/plastitanium/pirate/unanchored
anchored = FALSE
code/game/turfs/simulated/wall/mineral_walls.dm
+1 -17
View File
@@ -302,20 +302,4 @@
/turf/closed/wall/mineral/plastitanium/copyTurf(turf/T)
. = ..()
T.transform = transform
/////////////////////Pirate Plastitanium walls/////////////////////
/turf/closed/wall/mineral/plastitanium/pirate
desc = "Yarr just try to blow this to smithereens!"
explosion_block = 50
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/plastitanium/nodiagonal/pirate/
explosion_block = 50
/turf/closed/wall/mineral/plastitanium/nosmooth/pirate/
explosion_block = 50
/turf/closed/wall/mineral/plastitanium/overspace/pirate/
explosion_block = 50
T.transform = transform
code/game/turfs/simulated/wall/reinf_walls.dm
+22
View File
@@ -258,3 +258,25 @@
/turf/closed/wall/r_wall/syndicate/overspace
icon_state = "map-overspace"
fixed_underlay = list("space"=1)
/////////////////////Pirate Ship walls/////////////////////
/turf/closed/wall/r_wall/syndicate/pirate
desc = "Yarr just try to blow this to smithereens!"
explosion_block = 30
canSmoothWith = list(/turf/closed/wall/r_wall/syndicate/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/r_wall/syndicate/pirate/nodiagonal/
smooth = SMOOTH_MORE
icon_state = "map-shuttle_nd"
explosion_block = 30
/turf/closed/wall/r_wall/syndicate/pirate/nosmooth/
icon = 'icons/turf/shuttle.dmi'
icon_state = "wall"
explosion_block = 30
/turf/closed/wall/r_wall/syndicate/pirate/overspace/
icon_state = "map-overspace"
fixed_underlay = list("space"=1)
explosion_block = 30