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

Fixes some files and pathings for this

Browse Source 
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
This commit is contained in:
keronshb
2020-02-09 15:18:15 -05:00
parent 5d1d652ea4
commit 9609eb64e0
5 changed files with 53 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/shuttles/pirate_default.dmm
+26 -33
View File
@@ -89,7 +89,7 @@
/turf/open/floor/pod/dark, /turf/open/floor/pod/dark,
/area/shuttle/pirate) /area/shuttle/pirate)
"aj" = ( "aj" = (
/turf/closed/wall/mineral/plastitaniumpirate/nodiagonal, /turf/closed/wall/mineral/plastitanium/nodiagonal/pirate,
/area/shuttle/pirate) /area/shuttle/pirate)
"ak" = ( "ak" = (
/obj/machinery/airalarm/all_access{ /obj/machinery/airalarm/all_access{
@@ -419,6 +419,7 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{ /obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1 dir = 1
}, },
/obj/structure/fans/tiny,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/shuttle/pirate) /area/shuttle/pirate)
"aK" = ( "aK" = (
@@ -466,18 +467,16 @@
/obj/machinery/porta_turret/syndicate/energy{ /obj/machinery/porta_turret/syndicate/energy{
dir = 1; dir = 1;
faction = list("pirate"); faction = list("pirate");
icon_state = "standard_lethal"; icon_state = "standard_lethal"
mode = 1
}, },
/turf/closed/wall/mineral/plastitaniumpirate/nodiagonal, /turf/closed/wall/mineral/plastitanium/nodiagonal/pirate,
/area/shuttle/pirate) /area/shuttle/pirate)
"aR" = ( "aR" = (
/obj/machinery/porta_turret/syndicate/energy{ /obj/machinery/porta_turret/syndicate/energy{
faction = list("pirate"); faction = list("pirate");
icon_state = "standard_lethal"; icon_state = "standard_lethal"
mode = 1
}, },
/turf/closed/wall/mineral/plastitaniumpirate, /turf/closed/wall/mineral/plastitanium/pirate,
/area/shuttle/pirate) /area/shuttle/pirate)
"aS" = ( "aS" = (
/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line,
@@ -486,7 +485,7 @@
/area/shuttle/pirate) /area/shuttle/pirate)
"aU" = ( "aU" = (
/obj/structure/sign/departments/engineering, /obj/structure/sign/departments/engineering,
/turf/closed/wall/mineral/plastitaniumpirate/nodiagonal, /turf/closed/wall/mineral/plastitanium/nodiagonal/pirate,
/area/shuttle/pirate) /area/shuttle/pirate)
"aV" = ( "aV" = (
/obj/effect/mob_spawn/human/pirate{ /obj/effect/mob_spawn/human/pirate{
@@ -867,37 +866,36 @@
dir = 1 dir = 1
}, },
/obj/docking_port/mobile/pirate{ /obj/docking_port/mobile/pirate{
callTime = 100;
dheight = 0;
dir = 1;
dwidth = 11; dwidth = 11;
height = 16; height = 16;
id = "pirateship";
launch_status = 0; launch_status = 0;
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
name = "Pirate Ship"; name = "Pirate Ship";
port_direction = 2; port_direction = 2;
preferred_direction = 1;
width = 17 width = 17
}, },
/obj/docking_port/stationary{ /obj/docking_port/stationary{
dir = 1;
dwidth = 11; dwidth = 11;
height = 16; height = 16;
id = "pirateship_home"; id = "pirateship_home";
name = "Deep Space"; name = "Deep Space";
width = 17 width = 17
}, },
/obj/structure/fans/tiny,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/shuttle/pirate) /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" = ( "df" = (
/obj/machinery/porta_turret/syndicate/energy{ /obj/machinery/porta_turret/syndicate/energy{
dir = 4; dir = 4;
faction = list("pirate"); faction = list("pirate");
icon_state = "standard_lethal"; icon_state = "standard_lethal"
mode = 1
}, },
/turf/closed/wall/mineral/plastitaniumpirate, /turf/closed/wall/mineral/plastitanium/pirate,
/area/shuttle/pirate) /area/shuttle/pirate)
"dy" = ( "dy" = (
/obj/structure/chair/wood/normal, /obj/structure/chair/wood/normal,
@@ -948,8 +946,7 @@
/turf/open/floor/pod/light, /turf/open/floor/pod/light,
/area/shuttle/pirate) /area/shuttle/pirate)
"ep" = ( "ep" = (
/obj/structure/window/plastitaniumpirate{ /obj/structure/window/reinforced{
//obj/structure/window/reinforced{
dir = 1; dir = 1;
pixel_y = 1 pixel_y = 1
}, },
@@ -979,8 +976,7 @@
/turf/open/floor/plating/airless, /turf/open/floor/plating/airless,
/area/shuttle/pirate) /area/shuttle/pirate)
"ex" = ( "ex" = (
/obj/structure/window/plastitaniumpirate /obj/structure/window/reinforced,
//obj/structure/window/reinforced,
/obj/structure/frame/machine, /obj/structure/frame/machine,
/obj/item/wrench, /obj/item/wrench,
/turf/open/floor/plating/airless, /turf/open/floor/plating/airless,
@@ -990,19 +986,17 @@
id = "piratebridge" id = "piratebridge"
}, },
/obj/structure/grille, /obj/structure/grille,
/obj/structure/window/plastitaniumpirate, /obj/structure/window/plastitanium/pirate,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/shuttle/pirate) /area/shuttle/pirate)
"ez" = ( "ez" = (
/obj/structure/window/plastitaniumpirate /obj/structure/window/reinforced,
//obj/structure/window/reinforced,
/obj/structure/frame/machine, /obj/structure/frame/machine,
/obj/item/stack/cable_coil/cut/red, /obj/item/stack/cable_coil/cut/red,
/turf/open/floor/plating/airless, /turf/open/floor/plating/airless,
/area/shuttle/pirate) /area/shuttle/pirate)
"eA" = ( "eA" = (
/obj/structure/window/plastitaniumpirate /obj/structure/window/reinforced{
//obj/structure/window/reinforced{
dir = 1; dir = 1;
pixel_y = 1 pixel_y = 1
}, },
@@ -1020,7 +1014,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/shuttle/pirate) /area/shuttle/pirate)
"fW" = ( "fW" = (
/turf/closed/wall/mineral/plastitaniumpirate, /turf/closed/wall/mineral/plastitanium/pirate,
/area/shuttle/pirate) /area/shuttle/pirate)
"fY" = ( "fY" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -1091,10 +1085,9 @@
/obj/machinery/porta_turret/syndicate/energy{ /obj/machinery/porta_turret/syndicate/energy{
dir = 8; dir = 8;
faction = list("pirate"); faction = list("pirate");
icon_state = "standard_lethal"; icon_state = "standard_lethal"
mode = 1
}, },
/turf/closed/wall/mineral/plastitaniumpirate, /turf/closed/wall/mineral/plastitanium/pirate,
/area/shuttle/pirate) /area/shuttle/pirate)
"yi" = ( "yi" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -1330,7 +1323,7 @@ aU
be be
aD aD
aG aG
ep db
aH aH
"} "}
(9,1,1) = {" (9,1,1) = {"
@@ -1348,7 +1341,7 @@ mU
aL aL
bP bP
bX bX
ep db
aK aK
"} "}
(10,1,1) = {" (10,1,1) = {"
@@ -1366,7 +1359,7 @@ aj
bO bO
bQ bQ
bk bk
ep db
er er
"} "}
(11,1,1) = {" (11,1,1) = {"
code/game/machinery/porta_turret/portable_turret.dm
+16 -16
View File
@@ -349,21 +349,21 @@
qdel(cover) //deletes the cover - no need on keeping it there! qdel(cover) //deletes the cover - no need on keeping it there!
//turret healing //turret healing
/obj/machinery/porta_turret/attackby(obj/item/I, mob/living/user, params) /obj/machinery/porta_turret/welder_act(mob/living/user, obj/item/I)
if(istype(I, /obj/item/weldingtool) && user.a_intent == INTENT_HELP) if(obj_integrity < max_integrity)
if(obj_integrity < max_integrity) if(!I.tool_start_check(user, amount=0))
if(!I.tool_start_check(user, amount=0)) return
return user.visible_message("[user] is welding the turret.", \
user.visible_message("[user] is welding the turret.", \ "<span class='notice'>You begin repairing the turret...</span>", \
"<span class='notice'>You begin repairing the turret...</span>", \ "<span class='italics'>You hear welding.</span>")
"<span class='italics'>You hear welding.</span>") if(I.use_tool(src, user, 40, volume=50))
if(I.use_tool(src, user, 40, volume=50)) obj_integrity = max_integrity
obj_integrity = max_integrity user.visible_message("[user.name] has repaired [src].", \
user.visible_message("[user.name] has repaired [src].", \ "<span class='notice'>You finish repairing the turret.</span>")
"<span class='notice'>You finish repairing the turret.</span>") return TRUE
else else
to_chat(user, "<span class='notice'>The turret doesn't need repairing.</span>") to_chat(user, "<span class='notice'>The turret doesn't need repairing.</span>")
return return
/obj/machinery/porta_turret/process() /obj/machinery/porta_turret/process()
@@ -688,7 +688,7 @@
lethal_projectile_sound = 'sound/weapons/laser.ogg' lethal_projectile_sound = 'sound/weapons/laser.ogg'
desc = "An energy blaster auto-turret. Use a welder to fix." desc = "An energy blaster auto-turret. Use a welder to fix."
explosion_block = 50 explosion_block = 50
max_integrity = 350 max_integrity = 260
integrity_failure = 20 integrity_failure = 20
code/game/objects/effects/spawners/structure.dm
+3 -5
View File
@@ -163,13 +163,11 @@ again.
icon_state = "plastitaniumwindow_spawner" icon_state = "plastitaniumwindow_spawner"
spawn_list = list(/obj/structure/grille, /obj/structure/window/plastitanium) spawn_list = list(/obj/structure/grille, /obj/structure/window/plastitanium)
//plastitaniumpirate window //plastitanium pirate window
/obj/effect/spawner/structure/window/plastitaniumpirate /obj/effect/spawner/structure/window/plastitanium/pirate
name = "plastitanium window spawner"
icon_state = "plastitaniumwindow_spawner"
explosion_block = 50 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 //ice window
code/game/objects/structures/window.dm
+2 -18
View File
@@ -596,27 +596,11 @@
anchored = FALSE anchored = FALSE
//pirate ship windows //pirate ship windows
/obj/structure/window/plastitaniumpirate /obj/structure/window/plastitanium/pirate
name = "plastitanium window"
desc = "Yarr this window be explosion proof!" 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 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 anchored = FALSE
/obj/structure/window/reinforced/clockwork /obj/structure/window/reinforced/clockwork
code/game/turfs/simulated/wall/mineral_walls.dm
+6 -51
View File
@@ -306,61 +306,16 @@
/////////////////////Pirate Plastitanium walls///////////////////// /////////////////////Pirate Plastitanium walls/////////////////////
/turf/closed/wall/mineral/plastitaniumpirate /turf/closed/wall/mineral/plastitanium/pirate
name = "wall"
desc = "Yarr just try to blow this to smithereens!" desc = "Yarr just try to blow this to smithereens!"
icon = 'icons/turf/walls/plastitanium_wall.dmi'
icon_state = "map-shuttle"
explosion_block = 50 explosion_block = 50
sheet_type = /obj/item/stack/sheet/mineral/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)
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)
/turf/closed/wall/mineral/plastitaniumpirate/nodiagonal /turf/closed/wall/mineral/plastitanium/nodiagonal/pirate/
smooth = SMOOTH_MORE
icon_state = "map-shuttle_nd"
explosion_block = 50 explosion_block = 50
/turf/closed/wall/mineral/plastitaniumpirate/nosmooth /turf/closed/wall/mineral/plastitanium/nosmooth/pirate/
icon = 'icons/turf/shuttle.dmi'
icon_state = "wall"
smooth = SMOOTH_FALSE
explosion_block = 50 explosion_block = 50
/turf/closed/wall/mineral/plastitaniumpirate/overspace /turf/closed/wall/mineral/plastitanium/overspace/pirate/
icon_state = "map-overspace" explosion_block = 50
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