Skip to content

Commit

Permalink
Nebula Extention + Adds back the Udang and Scoophead trade shuttles (#…
Browse files Browse the repository at this point in the history
…6885)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

This is a simplier, and (I hope) workable version of my Last Nebula PR
(closed Yesterday)
This also adds the new Area format asked by Silicon.

This aims to transform Nebula gas station into a proper space transit
hub in the system, outside of NT, to opfully in the futur, give player
the option to play someone not in NT, with enable spawns.

This doesn't replace anything currently on Nebula, only adds a part to
the station. (IC wise : The under construction part). Its also plan to
make the station a bit more lively (a bit.)

The idea is to have a more civilian part of Nebula, inspired a bit by
Star Trek's DS9 station in its function (before it became the main
landmark of the series) mainly a simple hub for refuelling and
accommodating temporary travellers, or longer uncertain stuck people.

Imagine being playing a wannabe explorer, a corporation employee
enjoying his retirement, or a simple cargo pilot.

This adds :
A Motel with 9 rooms
6 Shuttles low cost shuttle (Arrowhead, Teshari Runabout, Adventurer,
Caravan, Tug, Micro)
2 extra trade shuttles (Udang for cargo/passenger, Scoophead for smaller
traders) with pads and docks on Triumph and Atlas.

Comparated to the last PR :
Doesn't have vendors
Doesn't have new Ids.

Image :
NEW AREA :

![image](https://github.com/user-attachments/assets/0a4146c5-160e-4d52-85b3-659e3396a8a2)
RENT DOCK : 

![image](https://github.com/user-attachments/assets/0a186570-f4ea-4323-9681-362e9f8831b8)
ARCADE, FREE ROOM, PUBLIC MEDICAL AND SECURITY

![image](https://github.com/user-attachments/assets/6f4eba20-21c1-46dc-b339-52b9037f3795)
NEW WIDER NECK

![image](https://github.com/user-attachments/assets/abaf63d0-83ce-4e71-94e5-86c5fd05091d)
UDANG SHUTTLE

![image](https://github.com/user-attachments/assets/f86c11ed-ef66-4a0a-bc3f-f0cd4c1619dc)
SCOOPHEAD SHUTTLE

![image](https://github.com/user-attachments/assets/568a6b18-ee84-4444-87a3-f38dbdac9e46)
CAFETERIA, CARGO, CRYO

![image](https://github.com/user-attachments/assets/c9ec1693-64e7-42d6-8179-d892ebcc4c1e)
MOTEL :

![image](https://github.com/user-attachments/assets/718ab8f7-fc5c-4b94-bc74-280b44b537a4)
VIP MOTEL ROOM : 

![image](https://github.com/user-attachments/assets/70c7efe1-98cd-49fe-ab5c-b95c355e050b)

---------

Co-authored-by: silicons <[email protected]>
  • Loading branch information
DeltaDav and silicons authored Dec 1, 2024
1 parent 0ac2231 commit 64b809f
Show file tree
Hide file tree
Showing 21 changed files with 65,892 additions and 52,120 deletions.
5 changes: 3 additions & 2 deletions citadel.dme
Original file line number Diff line number Diff line change
Expand Up @@ -5412,12 +5412,13 @@
#include "maps\sectors\miaphus\miaphus-misc.dm"
#include "maps\sectors\miaphus\miaphus.dm"
#include "maps\sectors\mining_192\mining_192.dm"
#include "maps\sectors\nebula_tradeport\nebula_tradeport-areas.dm"
#include "maps\sectors\nebula_tradeport\nebula_tradeport-shuttles.dm"
#include "maps\sectors\nebula_tradeport\nebula_tradeport.dm"
#include "maps\sectors\piratebase_192\piratebase_192.dm"
#include "maps\sectors\roguemining_192\roguemining_192.dm"
#include "maps\sectors\surt\surt.dm"
#include "maps\sectors\surt\surt_areas.dm"
#include "maps\sectors\tradeport\shuttles.dm"
#include "maps\sectors\tradeport_192\tradeport_192.dm"
#include "maps\sectors\virgo2_140\virgo2_140.dm"
#include "maps\sectors\virgo4_140\virgo4_140.dm"
#include "maps\sectors\wasteland_192\wasteland_192.dm"
Expand Down
6 changes: 3 additions & 3 deletions code/modules/food/food/snacks/meat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
filling_color = "#BBBBAA"

/obj/item/reagent_containers/food/snacks/meat/chicken/Initialize(mapload)
..()
reagents.remove_reagent("triglyceride", INFINITY)
//Chicken is low fat. Less total calories than other meats
. = ..()
reagents.remove_reagent("triglyceride", INFINITY)
//Chicken is low fat. Less total calories than other meats

/obj/item/reagent_containers/food/snacks/meat/chicken/penguin
name = "meat"
Expand Down
2 changes: 2 additions & 0 deletions code/modules/maps/overmap/planets/_lythios43c.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"Civilian Century Shuttle" = list("rift_oldcentury_pad"),
"Dart EMT Shuttle" = list("rift_emt_pad"),
"Beruang Trade Ship" = list("rift_trade_dock"),
"Scoophead trade Shuttle" = list ("rift_scoophead_dock"),
"Udang Transport Shuttle" = list ("rift_udang_dock"),
"NDV Quicksilver" = list("rift_specops_dock"),
"Pirate Skiff" = list("rift_pirate_dock"),
)
Expand Down
67 changes: 66 additions & 1 deletion code/modules/maps/overmap/space/trade_station/trade_station.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,17 @@
)

initial_restricted_waypoints = list(
"Beruang Trade Ship" = list("tradeport_hangar")
"Beruang Trade Ship" = list("tradeport_hangar"),
"Udang Transport Shuttle" = list("tradeport_udang"),
"Scoophead trade Shuttle" = list("tradeport_scoophead"),
"Arrowhead Racing Shuttle" = list("tradeport_arrowhead"),
"Spacena Caravan Shuttle" = list("tradeport_caravan"),
"Spacena Adventurer Shuttle" = list("tradeport_adventurer"),
"Cargo Tug Hauler Shuttle" = list("tradeport_tug"),
"Utility Micro Shuttle" = list("tradeport_utilitymicro"),
"Teshari Runabout Shuttle" = list("tradeport_runabout")
)

/* // Old Restricted list. Leaving commented out for reference - Bloop
initial_restricted_waypoints = list(
"Beruang Trade Ship" = list("tradeport_hangar"),
Expand Down Expand Up @@ -116,6 +125,62 @@
base_turf = /turf/simulated/floor/tiled/techfloor/grid
base_area = /area/tradeport/dock

/obj/effect/shuttle_landmark/triumph/trade/udang
name = "Udang Underconstruction Docking bay"
landmark_tag = "tradeport_udang"
docking_controller = "tradeport_udang_dock"
base_turf = /turf/space
base_area = /area/space

/obj/effect/shuttle_landmark/triumph/trade/scoophead
name = "Scoophead Docking bay"
landmark_tag = "tradeport_scoophead"
docking_controller = "tradeport_scoophead_dock"
base_turf = /turf/space
base_area = /area/space

/obj/effect/shuttle_landmark/triumph/trade/arrowhead
name = "VIP suit docking hatch"
landmark_tag = "tradeport_arrowhead"
docking_controller = "tradeport_arrowhead_dock"
base_turf = /turf/space
base_area = /area/space

/obj/effect/shuttle_landmark/triumph/trade/caravan
name = "Caravan Docking Bay 2 Spot"
landmark_tag = "tradeport_caravan"
docking_controller = "tradeport_caravan_dock"
base_turf = /turf/simulated/floor/reinforced
base_area = /area/sector/nebula_tradeport/dock2

/obj/effect/shuttle_landmark/triumph/trade/adventurer
name = "Adventurer Docking Bay 2 Spot"
landmark_tag = "tradeport_adventurer"
docking_controller = "tradeport_adventurer_dock"
base_turf = /turf/simulated/floor/reinforced
base_area = /area/sector/nebula_tradeport/dock2

/obj/effect/shuttle_landmark/triumph/trade/tug
name = "Tug Hauler Docking Bay 2 Spot"
landmark_tag = "tradeport_tug"
docking_controller = "tradeport_tug_dock"
base_turf = /turf/simulated/floor/reinforced
base_area = /area/sector/nebula_tradeport/dock2

/obj/effect/shuttle_landmark/triumph/trade/utilitymicro
name = "Utility and service Docking Bay 2 Spot"
landmark_tag = "tradeport_utilitymicro"
docking_controller = "tradeport_utilitymicro_dock"
base_turf = /turf/simulated/floor/reinforced
base_area = /area/sector/nebula_tradeport/dock2

/obj/effect/shuttle_landmark/triumph/trade/runabout
name = "Teshari Runabout Docking Bay 2 Spot"
landmark_tag = "tradeport_runabout"
docking_controller = "tradeport_runabout_dock"
base_turf = /turf/simulated/floor/reinforced
base_area = /area/sector/nebula_tradeport/dock2

// Todo
/*
/obj/machinery/camera/network/trade
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Need to turn all of these into proper initializers like this:
/obj/effect/shuttle_landmark/rift/deck3/oldcentury
name = "NSB Atlas - Secondary Civilian Transport Pad"
landmark_tag = "rift_oldcentury_pad"
docking_controller = "rift_oldcentury_dock"
docking_controller = "oldcentury_dock"
base_turf = /turf/simulated/floor/reinforced/lythios43c
base_area = /area/rift/surfacebase/outside/outside3

Expand All @@ -45,6 +45,18 @@ Need to turn all of these into proper initializers like this:
base_turf = /turf/simulated/floor/reinforced/lythios43c
base_area = /area/rift/surfacebase/outside/outside3

/obj/effect/shuttle_landmark/rift/deck3/scoophead
name = "NSB Atlas - Scoophead Pad"
landmark_tag = "rift_scoophead_dock"
base_turf = /turf/simulated/floor/reinforced/lythios43c
base_area = /area/rift/surfacebase/outside/outside3

/obj/effect/shuttle_landmark/rift/deck3/udang
name = "NSB Atlas - Udang Pad"
landmark_tag = "rift_udang_dock"
base_turf = /turf/simulated/floor/reinforced/lythios43c
base_area = /area/rift/surfacebase/outside/outside3

/obj/effect/shuttle_landmark/rift/deck3/specops
name = "NSB Atlas - Special Operations Pad"
landmark_tag = "rift_specops_dock"
Expand Down Expand Up @@ -144,6 +156,14 @@ Need to turn all of these into proper initializers like this:
name = "In transit"
landmark_tag = "nav_transit_trade"

/obj/effect/shuttle_landmark/transit/rift/trade/udang
name = "In transit"
landmark_tag = "nav_transit_udang"

/obj/effect/shuttle_landmark/transit/rift/trade/scoophead
name = "In transit"
landmark_tag = "nav_transit_scoophead"

/obj/effect/shuttle_landmark/transit/rift/emt
name = "In transit"
landmark_tag = "nav_transit_emt"
2 changes: 1 addition & 1 deletion maps/endeavour/endeavour.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/datum/map/sector/gaia_192,
/datum/map/sector/frozen_192,
/datum/map/sector/wasteland_192,
/datum/map/sector/tradeport_192,
/datum/map/sector/nebula_tradeport,
/datum/map/sector/surt,
/datum/map/sector/miaphus,
/datum/map/sector/roguemining_192/one,
Expand Down
2 changes: 1 addition & 1 deletion maps/euthenia/euthenia.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/datum/map/sector/gaia_192,
/datum/map/sector/frozen_192,
/datum/map/sector/wasteland_192,
/datum/map/sector/tradeport_192,
/datum/map/sector/nebula_tradeport,
/datum/map/sector/surt,
/datum/map/sector/miaphus,
/datum/map/sector/roguemining_192/one,
Expand Down
Loading

0 comments on commit 64b809f

Please sign in to comment.