cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix new golem ship docking port dimensions (#29361)

Browse Source 
* fix new golem ship docking port dimensions

* Update shuttle.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
warriorstar-orion
2025-05-21 11:09:19 -04:00
committed by GitHub
parent 45e88ffb71
commit d69f5a2e14
5 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
+1
View File
@@ -153,6 +153,7 @@
/obj/machinery/door/airlock/external,
/obj/docking_port/mobile/free_golem,
/obj/structure/fans/tiny,
/obj/docking_port/stationary/golem/lavaland,
/turf/simulated/floor/plating,
/area/shuttle/freegolem)
"oD" = (
_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm
+1 -8
View File
@@ -9,14 +9,7 @@
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"S" = (
/obj/docking_port/stationary{
dir = 8;
dwidth = 8;
height = 20;
id = "freegolem_space";
name = "The middle of space";
width = 16
},
/obj/docking_port/stationary/golem/space,
/turf/template_noop,
/area/template_noop)
_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
+1 -8
View File
@@ -6786,14 +6786,7 @@
/turf/template_noop,
/area/ruin/space/derelict/solar_control)
"sm" = (
/obj/docking_port/stationary{
dir = 8;
dwidth = 8;
height = 20;
id = "freegolem_ussp";
name = "Near USSP Station";
width = 16
},
/obj/docking_port/stationary/golem/ussp,
/turf/template_noop,
/area/template_noop)
"sn" = (
code/modules/awaymissions/mission_code/ruins/freegolems.dm
+36
View File
@@ -133,3 +133,39 @@
desc = "Used to recall the Golem Ship."
possible_destinations = "freegolem_lavaland"
resistance_flags = INDESTRUCTIBLE
#define FREE_GOLEM_SHIP_WIDTH 18
#define FREE_GOLEM_SHIP_HEIGHT 19
/obj/docking_port/mobile/free_golem
name = "Free Golem Ship"
dir = 8
id = "freegolem"
dwidth = FREE_GOLEM_SHIP_WIDTH / 2
height = FREE_GOLEM_SHIP_HEIGHT
width = FREE_GOLEM_SHIP_WIDTH
preferred_direction = WEST
port_direction = SOUTH
/obj/docking_port/stationary/golem
dir = 8
height = FREE_GOLEM_SHIP_HEIGHT
width = FREE_GOLEM_SHIP_WIDTH
dwidth = FREE_GOLEM_SHIP_WIDTH / 2
/obj/docking_port/stationary/golem/space
name = "The middle of space"
id = "freegolem_space"
/obj/docking_port/stationary/golem/ussp
name = "Near USSP Station"
id = "freegolem_ussp"
/obj/docking_port/stationary/golem/lavaland
name = "Lavaland Surface"
id = "freegolem_lavaland"
area_type = /area/ruin/powered/golem_ship
turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface
#undef FREE_GOLEM_SHIP_WIDTH
#undef FREE_GOLEM_SHIP_HEIGHT
code/modules/shuttle/shuttle.dm
+10 -15
View File
@@ -13,11 +13,16 @@
anchored = TRUE
var/id
dir = NORTH //this should point -away- from the dockingport door, ie towards the ship
var/width = 0 //size of covered area, perpendicular to dir
var/height = 0 //size of covered area, paralell to dir
var/dwidth = 0 //position relative to covered area, perpendicular to dir
var/dheight = 0 //position relative to covered area, parallel to dir
/// This should point *away* from the docking port door, i.e. towards the ship.
dir = NORTH
/// Size of covered area, perpendicular to direction.
var/width = 0
/// Size of covered area, parallel to direction.
var/height = 0
/// Position relative to covered area, perpendicular to direction.
var/dwidth = 0
/// Position relative to covered area, parallel to direction.
var/dheight = 0
// A timid shuttle will not register itself with the shuttle subsystem
// All shuttle templates are timid
@@ -907,16 +912,6 @@
name = "syndicate infiltrator"
width = 18
/obj/docking_port/mobile/free_golem
dir = 8
dwidth = 8
height = 20
id = "freegolem"
name = "Free Golem Ship"
width = 16
preferred_direction = WEST
port_direction = SOUTH
/obj/docking_port/mobile/whiteship
dir = 8
id = "whiteship"