Skip to content

Commit

Permalink
TGS Test Merge (#5959)
Browse files Browse the repository at this point in the history
  • Loading branch information
cm13-github committed Mar 31, 2024
2 parents 857d527 + 8d85238 commit 1da8f19
Show file tree
Hide file tree
Showing 6 changed files with 51,467 additions and 1 deletion.
1 change: 1 addition & 0 deletions code/__DEFINES/__game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim" // Highpop Only
#define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
#define MAP_CHINOOK "Chinook 91 GSO" //admin level
#define MAP_FOP_V1_CLASSIC "Prison Station Classic"

#define GAMEMODE_WHISKEY_OUTPOST "Whiskey Outpost"
#define GAMEMODE_HIVE_WARS "Hive Wars"
Expand Down
3 changes: 2 additions & 1 deletion code/modules/cm_marines/equipment/maps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ GLOBAL_LIST_INIT_TYPED(map_type_list, /obj/item/map, setup_all_maps())
MAP_CORSAT = new /obj/item/map/corsat(),
MAP_KUTJEVO = new /obj/item/map/kutjevo_map(),
MAP_LV522_CHANCES_CLAIM = new /obj/item/map/lv522_map(),
MAP_NEW_VARADERO = new /obj/item/map/new_varadero()
MAP_NEW_VARADERO = new /obj/item/map/new_varadero(),
MAP_FOP_V1_CLASSIC = new /obj/item/map/FOP_map_v3()
)

//used by marine equipment machines to spawn the correct map.
Expand Down
41 changes: 41 additions & 0 deletions code/modules/shuttle/shuttles/dropship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -326,3 +326,44 @@
/datum/map_template/shuttle/normandy
name = "Normandy"
shuttle_id = DROPSHIP_NORMANDY

/obj/docking_port/stationary/marine_dropship/airlock
name = "Generic Airlock Landing Zone"
var/airlock_area
var/airlock_id

/obj/docking_port/stationary/marine_dropship/airlock/proc/get_doors()
var/list/door_list = list()

for(var/area/target_area in world)
if(!istype(target_area, airlock_area))
continue

for(var/obj/structure/machinery/door/door in target_area)
if(airlock_id && airlock_id == door.id)
door_list += list(door)

return door_list

/obj/docking_port/stationary/marine_dropship/airlock/on_arrival(obj/docking_port/mobile/arriving_shuttle)
. = ..()

var/datum/door_controller/single/door_control = new()
door_control.doors = get_doors()
door_control.control_doors("open", FALSE, FALSE)
qdel(door_control)

/obj/docking_port/stationary/marine_dropship/airlock/on_departure(obj/docking_port/mobile/departing_shuttle)
. = ..()

var/datum/door_controller/single/door_control = new()
door_control.doors = get_doors()
door_control.control_doors("force-lock-launch", TRUE)
qdel(door_control)

/obj/docking_port/stationary/marine_dropship/airlock/lz1
name = "LZ1 Airlock Landing Zone"
id = DROPSHIP_LZ1
auto_open = TRUE
airlock_area = /area/fiorina/lz/near_lzI
airlock_id = "LZ1_Lockdown_Classic"
3 changes: 3 additions & 0 deletions map_config/maps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,6 @@ endmap

map whiskey_outpost_v2
endmap

map fop_v1_classic
endmap
35 changes: 35 additions & 0 deletions maps/fop_v1_classic.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"map_name": "Prison Station Classic",
"map_path": "map_files/FOP_v1_Classic",
"map_file": "FOP_V1_CLASSIC.dmm",
"webmap_url": "Fiorina",
"survivor_types": [
"/datum/equipment_preset/survivor/prisoner",
"/datum/equipment_preset/survivor/prisoner"
],
"defcon_triggers": [
3750,
2600,
1450,
875,
0.0
],
"survivor_message": "You are a survivor of the attack on Fiorina Orbital Penitentiary. You worked or lived on the prison station, and managed to avoid the alien attacks... until now.",
"map_item_type": "/obj/item/map/FOP_map_v3",
"announce_text": "An automated distress signal has been received from maximum-security prison \"Fiorina Orbital Penitentiary\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.",
"environment_traits": { "InSpace": true },
"traits": [{ "Ground": true }],
"xvx_hives": {
"xeno_hive_alpha": 0,
"xeno_hive_bravo": 0,
"xeno_hive_charlie": 0
},
"camouflage": "classic",
"gamemodes": [
"Distress Signal",
"Hunter Games",
"Hive Wars",
"Faction Clash",
"Infection"
]
}
Loading

0 comments on commit 1da8f19

Please sign in to comment.