From 6830d65e3e6d68fcebc3c145ffc4147b7f588947 Mon Sep 17 00:00:00 2001 From: monster860 Date: Sun, 1 Dec 2019 01:43:36 -0500 Subject: [PATCH 1/4] Drifting spacepod ruin --- .../SpaceRuins/drifting_spacepod.dmm | 7 +++++++ code/datums/ruins/space.dm | 8 ++++++- yogstation/code/modules/spacepods/prebuilt.dm | 21 +++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 _maps/RandomRuins/SpaceRuins/drifting_spacepod.dmm diff --git a/_maps/RandomRuins/SpaceRuins/drifting_spacepod.dmm b/_maps/RandomRuins/SpaceRuins/drifting_spacepod.dmm new file mode 100644 index 000000000000..9f9564a8e324 --- /dev/null +++ b/_maps/RandomRuins/SpaceRuins/drifting_spacepod.dmm @@ -0,0 +1,7 @@ +"a" = (/turf/template_noop,/area/template_noop) +"b" = (/obj/spacepod/random,/turf/template_noop,/area/template_noop) + +(1,1,1) = {" +aa +ba +"} diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 7af89e5dca64..96cbfc73b755 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -318,4 +318,10 @@ id = "goatresearch" suffix = "goatresearch.dmm" name= "Exotic Goat Transport Vessel" - description = "A ship transporting goats attacked by goats. How ironic..." \ No newline at end of file + description = "A ship transporting goats attacked by goats. How ironic..." + +/datum/map_template/ruin/space/zoo + id = "drifting_spacepod" + suffix = "drifting_spacepod.dmm" + name = "Drifting Spacepod" + description = "An abandoned spacepod, just drifting through space." diff --git a/yogstation/code/modules/spacepods/prebuilt.dm b/yogstation/code/modules/spacepods/prebuilt.dm index fcfc30142db0..c1f7fd51c1eb 100644 --- a/yogstation/code/modules/spacepods/prebuilt.dm +++ b/yogstation/code/modules/spacepods/prebuilt.dm @@ -41,3 +41,24 @@ /obj/spacepod/prebuilt/jousting/red icon_state = "pod_synd" armor_type = /obj/item/pod_parts/armor/security/red + +/obj/spacepod/random + icon = 'goon/icons/obj/spacepods/2x2.dmi' + icon_state = "pod_civ" + construction_state = SPACEPOD_ARMOR_WELDED + +/obj/spacepod/random/Initialize() + ..() + var/armor_type = pick(/obj/item/pod_parts/armor, + /obj/item/pod_parts/armor/syndicate, + /obj/item/pod_parts/armor/black, + /obj/item/pod_parts/armor/gold, + /obj/item/pod_parts/armor/industrial, + /obj/item/pod_parts/armor/security) + add_armor(new armor_type(src)) + cell = new /obj/item/stock_parts/cell/high/empty(src) + internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src) + velocity_x = rand(-5, 5) + velocity_y = rand(-5, 5) + obj_integrity = rand(100, max_integrity) + brakes = FALSE From ca8a0f4ea6adadae2ace5c77133f6a6bbfce7bd8 Mon Sep 17 00:00:00 2001 From: monster860 Date: Sun, 1 Dec 2019 01:45:33 -0500 Subject: [PATCH 2/4] fuck I forgot to make it TGM --- .../SpaceRuins/drifting_spacepod.dmm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/drifting_spacepod.dmm b/_maps/RandomRuins/SpaceRuins/drifting_spacepod.dmm index 9f9564a8e324..a6faffc94fdc 100644 --- a/_maps/RandomRuins/SpaceRuins/drifting_spacepod.dmm +++ b/_maps/RandomRuins/SpaceRuins/drifting_spacepod.dmm @@ -1,7 +1,17 @@ -"a" = (/turf/template_noop,/area/template_noop) -"b" = (/obj/spacepod/random,/turf/template_noop,/area/template_noop) +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/spacepod/random, +/turf/template_noop, +/area/template_noop) (1,1,1) = {" -aa -ba +a +b +"} +(2,1,1) = {" +a +a "} From 3a0a4d131e558a6efdcb7f2c1a38ea0afb0b7fa0 Mon Sep 17 00:00:00 2001 From: monster860 Date: Sun, 1 Dec 2019 01:49:21 -0500 Subject: [PATCH 3/4] Fuck it. LETS INCREASE THE SPEED CAP TO 15 --- yogstation/code/modules/spacepods/prebuilt.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yogstation/code/modules/spacepods/prebuilt.dm b/yogstation/code/modules/spacepods/prebuilt.dm index c1f7fd51c1eb..a533991b5994 100644 --- a/yogstation/code/modules/spacepods/prebuilt.dm +++ b/yogstation/code/modules/spacepods/prebuilt.dm @@ -58,7 +58,7 @@ add_armor(new armor_type(src)) cell = new /obj/item/stock_parts/cell/high/empty(src) internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src) - velocity_x = rand(-5, 5) - velocity_y = rand(-5, 5) + velocity_x = rand(-15, 15) + velocity_y = rand(-15, 15) obj_integrity = rand(100, max_integrity) brakes = FALSE From a46f0e272d84f79a52392fefa53a08f6689add1d Mon Sep 17 00:00:00 2001 From: monster860 Date: Sun, 1 Dec 2019 02:12:49 -0500 Subject: [PATCH 4/4] fuck --- code/datums/ruins/space.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 96cbfc73b755..27674c4717ff 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -320,7 +320,7 @@ name= "Exotic Goat Transport Vessel" description = "A ship transporting goats attacked by goats. How ironic..." -/datum/map_template/ruin/space/zoo +/datum/map_template/ruin/space/drifting_spacepod id = "drifting_spacepod" suffix = "drifting_spacepod.dmm" name = "Drifting Spacepod"