Skip to content

Commit

Permalink
Frontiersman Distillery Ruin (#2907)
Browse files Browse the repository at this point in the history 
## hey look it's a new ruin
<details><summary>The Ruin</summary>



![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/e9b43902-945a-4090-9be9-a0da753ebcff)


![2c5f52abe42891f0bfc41d57205f0e86](https://github.com/shiptest-ss13/Shiptest/assets/118859017/4697ec2b-a78b-46ad-930e-d1ce491295dc)


![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/d05d6996-47da-46ea-8f35-ef35ac5578ca)

</details>

## and another <s>pill</s> subshuttle

![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/39eb60d5-1244-4cc1-9524-96f31438d689)

## About The Pull Request
This PR adds a new ruin to rockplanets featuring a group of New
Frontiersman bootleggers based out of a pre-ICW era Nanotrasen research
facility.
A new type of bottle crate for moonshine bottles has been added, as well
as a new subtype of Frontiersmen, without need for air.
Moonshine now requires a fermenting barrel or distillery to be produced.
Thank you to @FalloutFalcon for providing the code that makes this work,
as well as refactoring bottle crates to make them work with variables.

<details><summary>Threats</summary>

```
- Melee Frontiersman (x3)
- Revolver Frontiersman (x4)
- Rifle Frontiersman Trooper (x4)
- Rifle Frontiersman
- Frontiersman Officer
- Mi-go (Dog)
- Explosive Mines (x5)
```

</details>

<details><summary>Major Loot</summary>

```
- Moonshine Jugs (x31)
- Moonshine Keg
- Moonshine Vat
- Regular Medkit
- Bicaridine Bottles (x2)
- Common Machine Boards (x2)
- Common Computer Board
- Drink Dispenser
- Booze Dispenser
- SRM Distiller
- Autolathe
- Uranium PACMAN Generator
- ~4000 credits
- Hydroponics Trays (x2)
- .357 Revolver (x2)
- HP Shadow
- .45 Speedloader
- .357 Speedloader (x2)
- Commander
- Stetchkin Pistol
- Empty Commander Magazine (x2)
- AP 9mm Ammo Box
- Stetchkin Magazine (x2)
- Mosin Rifle (x3)
- Mosin Clip (x2)
- Armor Vest (x3)
- SWAT helmet (x2)
```

</details>

## Changelog

🆑 goober3, FalloutFalcon
add: A new Frontiersman-themed rockplanet ruin.
add: Frontiersmen now have subtypes with oxygen masks.
tweak: Moonshine can now only be brewed via fermenting barrels &
distillers.
code: Drinks recipes can now have multiple required containers.
/🆑

---------

Signed-off-by: goober3 <[email protected]>
Co-authored-by: Theos <[email protected]>
  • Loading branch information
@goober3 @SomeguyManperson
goober3 and SomeguyManperson authored Jul 11, 2024
1 parent e018ee7 commit f853a7e
Show file tree
Hide file tree
Showing 16 changed files with 7,211 additions and 15 deletions.
6,628 changes: 6,628 additions & 0 deletions _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions _maps/map_catalogue.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
Size = (x = 58)(y = 48)(z = 1)
Tags = "Medium Combat Challenge", "Medium Loot", "Hazardous", "Hospitable"

File Name = "_maps\RandomRuins\RockRuins\rockplanet_distillery.dmm"
Size = (x = 44)(y = 45)(z = 1)
Tags = "Medium Combat Challenge", "Major Loot", "Hazardous", "Hospitable"


SandRuins:
File Name = "_maps\RandomRuins\Ruins\whitesands_surface_camp_saloon.dmm"
Expand Down
5 changes: 5 additions & 0 deletions _maps/shuttles/subshuttles/Subshuttle Catalog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ Size = "12x7"
Purpose = "A multi-role dropship used by almost every group faring space. Its ease of manufacture and high mobility makes it ideal for transport."
File Path = "_maps\shuttles\subshuttles\indepenent_kunai.dmm"

Name = "Tanto-class Drop Pod"
Size = "6x5"
Purpose = "A combat-ready drop pod designed for quick deployment in hectic battles. Its lack of holofields makes it unsuitable for environments without sufficient atmosphere, unless depressurised beforehand."
File Path = "_maps\shuttles\subshuttles\indepenent_kunai.dmm"

Name = "Haste-class Patient Recovery Ship"
Size = "6x4"
Purpose = "A small, nimble ship utilized as an ambulance by Inteq forces."
Expand Down
333 changes: 333 additions & 0 deletions _maps/shuttles/subshuttles/independent_tanto.dmm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,333 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"e" = (
/obj/effect/turf_decal/siding/white,
/obj/effect/turf_decal/siding/white{
dir = 1
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/landmark/ert_shuttle_spawn,
/turf/open/floor/pod,
/area/ship/storage)
"f" = (
/obj/effect/turf_decal/industrial/traffic{
dir = 4
},
/obj/effect/turf_decal/industrial/traffic{
dir = 8
},
/obj/machinery/door/poddoor{
dir = 4;
id = "pod_aft"
},
/obj/structure/cable{
icon_state = "0-4"
},
/obj/docking_port/mobile{
dir = 4;
name = "tanto pod";
port_direction = 2;
preferred_direction = 4
},
/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/storage)
"l" = (
/obj/structure/chair/comfy/shuttle{
dir = 4;
layer = 3.3
},
/obj/effect/turf_decal/techfloor{
dir = 1
},
/obj/effect/turf_decal/industrial/traffic,
/obj/machinery/button/door{
dir = 4;
pixel_y = -6;
pixel_x = -22;
name = "Aft Door";
id = "pod_aft"
},
/obj/machinery/button/door{
dir = 4;
pixel_x = -32;
name = "Window Shutters";
id = "pod_window"
},
/obj/machinery/door/window/brigdoor/northleft,
/obj/machinery/button/door{
dir = 4;
pixel_y = 6;
pixel_x = -22;
name = "Fore Door";
id = "pod_fore"
},
/obj/effect/landmark/ert_shuttle_spawn,
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/storage)
"n" = (
/obj/effect/turf_decal/siding/white,
/obj/effect/turf_decal/siding/white{
dir = 1
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable{
icon_state = "0-8"
},
/obj/item/radio/intercom/directional/south,
/obj/effect/landmark/ert_shuttle_brief_spawn,
/turf/open/floor/pod,
/area/ship/storage)
"p" = (
/obj/structure/grille,
/obj/structure/window/reinforced,
/obj/structure/cable/yellow,
/obj/machinery/door/poddoor/shutters/preopen{
id = "pod_window"
},
/obj/machinery/power/terminal{
dir = 8
},
/turf/open/floor/engine/hull/reinforced,
/area/ship/storage)
"s" = (
/obj/effect/turf_decal/siding/white,
/obj/effect/turf_decal/siding/white{
dir = 1
},
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/pod,
/area/ship/storage)
"w" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/storage)
"x" = (
/obj/effect/turf_decal/industrial/traffic{
dir = 1
},
/obj/structure/railing{
dir = 8
},
/obj/structure/cable,
/obj/structure/cable/yellow{
icon_state = "0-4"
},
/obj/effect/turf_decal/techfloor,
/obj/machinery/power/port_gen/pacman,
/obj/item/stack/sheet/mineral/plasma/twenty,
/obj/item/stack/sheet/mineral/plasma/five,
/obj/item/stack/sheet/mineral/plasma/five,
/obj/item/wrench,
/obj/machinery/door/window/brigdoor/southleft,
/obj/structure/closet/wall/red/directional/west{
secure = 1;
locked = 1
},
/obj/item/pickaxe/mini,
/obj/item/flashlight/flare{
pixel_y = 3
},
/obj/item/flashlight/flare,
/obj/item/flashlight/flare{
pixel_y = -3
},
/obj/item/storage/toolbox/emergency/shuttle/electric,
/obj/item/tank/internals/emergency_oxygen/double,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/double,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/double,
/obj/item/clothing/mask/gas,
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/storage)
"z" = (
/obj/structure/window/reinforced{
dir = 1
},
/obj/machinery/computer/helm{
dir = 8;
layer = 3.3
},
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/effect/turf_decal/techfloor{
dir = 1
},
/obj/effect/turf_decal/industrial/traffic,
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/storage)
"C" = (
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/window/reinforced{
dir = 1
},
/obj/machinery/power/smes/shuttle/micro/precharged{
dir = 4
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "pod_window"
},
/obj/structure/cable/yellow{
icon_state = "0-8"
},
/turf/open/floor/engine/hull/reinforced,
/area/ship/storage)
"E" = (
/obj/structure/grille,
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/cable/yellow{
icon_state = "0-2"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "pod_window"
},
/obj/machinery/power/terminal{
dir = 8
},
/turf/open/floor/engine/hull/reinforced,
/area/ship/storage)
"J" = (
/obj/structure/window/reinforced,
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/effect/turf_decal/industrial/traffic{
dir = 1
},
/obj/structure/railing{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "2-8"
},
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/machinery/light/small/directional/east{
pixel_y = -6
},
/obj/machinery/light_switch{
dir = 8
},
/obj/effect/turf_decal/techfloor,
/obj/machinery/light_switch{
pixel_x = 22;
pixel_y = 5;
dir = 8
},
/obj/effect/landmark/ert_shuttle_spawn,
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/storage)
"K" = (
/obj/effect/turf_decal/siding/white,
/obj/effect/turf_decal/siding/white{
dir = 1
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/pod,
/area/ship/storage)
"L" = (
/obj/effect/turf_decal/industrial/traffic{
dir = 4
},
/obj/effect/turf_decal/industrial/traffic{
dir = 8
},
/obj/machinery/door/poddoor{
dir = 4;
id = "pod_fore"
},
/obj/structure/cable{
icon_state = "0-8"
},
/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/storage)
"S" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/power/smes/shuttle/micro/precharged{
dir = 4
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "pod_window"
},
/obj/structure/cable/yellow{
icon_state = "0-8"
},
/turf/open/floor/engine/hull/reinforced,
/area/ship/storage)
"Y" = (
/obj/machinery/power/shuttle/engine/electric{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "0-4"
},
/turf/open/floor/engine/hull/reinforced,
/area/ship/storage)

(1,1,1) = {"
a
w
f
w
a
"}
(2,1,1) = {"
Y
w
e
w
Y
"}
(3,1,1) = {"
C
l
K
x
S
"}
(4,1,1) = {"
E
z
s
J
p
"}
(5,1,1) = {"
w
w
n
w
w
"}
(6,1,1) = {"
a
w
L
w
a
"}
5 changes: 5 additions & 0 deletions code/datums/ruins/rockplanet.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,8 @@
id = "rockplanet_nomadcrash"
suffix = "rockplanet_nomadcrash.dmm"

/datum/map_template/ruin/rockplanet/distillery
name = "Frontiersman Distillery"
description = "A former pre-ICW era Nanotrasen outpost converted into a moonshine distillery by Frontiersman bootleggers."
id = "rockplanet_distillery"
suffix = "rockplanet_distillery.dmm"
7 changes: 6 additions & 1 deletion code/datums/shuttles.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
name = "Sugarcube Transport"
prefix = "ISV"

//your subshuttle here
//your subshuttle here //why is my subshuttle here
/datum/map_template/shuttle/subshuttles/heron
file_name = "nanotrasen_falcon"
name = "Falcon Dropship"
Expand Down Expand Up @@ -402,6 +402,11 @@
name = "Nail-class Boarding Vessel"
prefix = "PGF"

/datum/map_template/shuttle/subshuttles/tanto
file_name = "independent_tanto"
name = "Tanto-class Drop Pod"
prefix = "SV"

/datum/map_template/shuttle/subshuttles/brawler
file_name = "frontiersmen_brawler"
name = "Brawler-class Dropship"
Expand Down
Loading

0 comments on commit f853a7e

Please sign in to comment.