mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 03:02:54 +00:00
Map Staging things and Runtime fixing.
This commit is contained in:
@@ -61,9 +61,10 @@ datum
|
|||||||
desc = "You probably shouldn't swallow this."
|
desc = "You probably shouldn't swallow this."
|
||||||
icon_state = "pill2"
|
icon_state = "pill2"
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/pill/benzilate/New()
|
/obj/item/weapon/reagent_containers/pill/benzilate/Initialize()
|
||||||
..()
|
. = ..()
|
||||||
reagents.add_reagent("benzilate", 50)
|
reagents.add_reagent("benzilate", 50)
|
||||||
|
color = reagents.get_color()
|
||||||
|
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/pill/phenethylamine
|
/obj/item/weapon/reagent_containers/pill/phenethylamine
|
||||||
@@ -71,9 +72,10 @@ datum
|
|||||||
desc = "Smells like... lilacs?"
|
desc = "Smells like... lilacs?"
|
||||||
icon_state = "pill5"
|
icon_state = "pill5"
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/pill/phenethylamine/New()
|
/obj/item/weapon/reagent_containers/pill/phenethylamine/Initialize()
|
||||||
..()
|
. = ..()
|
||||||
reagents.add_reagent("phenethylamine", 50)
|
reagents.add_reagent("phenethylamine", 50)
|
||||||
|
color = reagents.get_color()
|
||||||
|
|
||||||
|
|
||||||
// PILLS THAT WE PROBABLY SHOULDN'T HAVE AAAAAAAAAA. The below is only so they can be included through mapping or "spawn " command. -Carl
|
// PILLS THAT WE PROBABLY SHOULDN'T HAVE AAAAAAAAAA. The below is only so they can be included through mapping or "spawn " command. -Carl
|
||||||
|
|||||||
472591
maps/yw/cryogaia-01-mining.dmm
Normal file
472591
maps/yw/cryogaia-01-mining.dmm
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,9 +1,4 @@
|
|||||||
#if !defined(USING_MAP_DATUM)
|
#if !defined(USING_MAP_DATUM)
|
||||||
#include "cryogaia-1.dmm" //mining
|
|
||||||
#include "cryogaia-2.dmm" //lowerlevel
|
|
||||||
#include "cryogaia-3.dmm" //main level
|
|
||||||
#include "cryogaia-4.dmm" //centcom
|
|
||||||
|
|
||||||
#include "cryogaia_defines.dm"
|
#include "cryogaia_defines.dm"
|
||||||
#include "cryogaia_turfs.dm"
|
#include "cryogaia_turfs.dm"
|
||||||
#include "cryogaia_things.dm"
|
#include "cryogaia_things.dm"
|
||||||
@@ -15,6 +10,12 @@
|
|||||||
#include "cryogaia_borealismajoris.dm"
|
#include "cryogaia_borealismajoris.dm"
|
||||||
#include "elevator_areas.dm"
|
#include "elevator_areas.dm"
|
||||||
#include "service_elevator_things.dm"
|
#include "service_elevator_things.dm"
|
||||||
|
|
||||||
|
#include "cryogaia-01-mining.dmm" //mining
|
||||||
|
#include "cryogaia-02-maintenance.dmm" //lowerlevel
|
||||||
|
#include "cryogaia-03-main.dmm" //main level
|
||||||
|
#include "cryogaia-04-centcomm.dmm" //centcom
|
||||||
|
|
||||||
#include "submaps/_tether_submaps.dm"
|
#include "submaps/_tether_submaps.dm"
|
||||||
|
|
||||||
#define USING_MAP_DATUM /datum/map/cryogaia
|
#define USING_MAP_DATUM /datum/map/cryogaia
|
||||||
|
|||||||
@@ -27,12 +27,12 @@
|
|||||||
#define Z_LEVEL_CRYOGAIA_LOWER 2
|
#define Z_LEVEL_CRYOGAIA_LOWER 2
|
||||||
#define Z_LEVEL_CRYOGAIA_MAIN 3
|
#define Z_LEVEL_CRYOGAIA_MAIN 3
|
||||||
#define Z_LEVEL_CRYOGAIA_CENTCOM 4
|
#define Z_LEVEL_CRYOGAIA_CENTCOM 4
|
||||||
#define Z_LEVEL_ALIENSHIP 15
|
#define Z_LEVEL_ALIENSHIP 5
|
||||||
#define Z_LEVEL_BEACH 16
|
#define Z_LEVEL_BEACH 6
|
||||||
#define Z_LEVEL_BEACH_CAVE 17
|
#define Z_LEVEL_BEACH_CAVE 7
|
||||||
#define Z_LEVEL_AEROSTAT 18
|
#define Z_LEVEL_AEROSTAT 8
|
||||||
#define Z_LEVEL_AEROSTAT_SURFACE 19
|
#define Z_LEVEL_AEROSTAT_SURFACE 9
|
||||||
#define Z_LEVEL_DEBRISFIELD 20
|
#define Z_LEVEL_DEBRISFIELD 10
|
||||||
|
|
||||||
/datum/map/cryogaia
|
/datum/map/cryogaia
|
||||||
name = "Cryogaia"
|
name = "Cryogaia"
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
//Special map objects
|
//Special map objects
|
||||||
/obj/effect/landmark/map_data/borealis1
|
/obj/effect/landmark/map_data/borealis1
|
||||||
height = 4 //Height marker. Provides the map with knowledge of how many z levels connecting below.
|
height = 3 //Height marker. Provides the map with knowledge of how many z levels connecting below.
|
||||||
|
|
||||||
|
|
||||||
/datum/turbolift
|
/datum/turbolift
|
||||||
|
|||||||
Reference in New Issue
Block a user