Skip to content

Commit

Permalink
Omega (tgstation#22447)
Browse files Browse the repository at this point in the history
* Fixes omegastation.dm

* adds config/maps and travis yml for omegastation
  • Loading branch information
Okand37 authored and optimumtact committed Dec 27, 2016
1 parent 2d72994 commit 4b6a048
Show file tree
Hide file tree
Showing 6 changed files with 3,741 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
- DM_MAPFILE="birdstation"
- DM_MAPFILE="pubbystation"
- DM_MAPFILE="templates"

- DM_MAPFILE="omegastation"

cache:
directories:
Expand Down
3,539 changes: 3,539 additions & 0 deletions _maps/map_files/OmegaStation/OmegaStation.dmm

Large diffs are not rendered by default.

129 changes: 129 additions & 0 deletions _maps/map_files/OmegaStation/job/job_changes.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@

//custom access for some jobs. pasted together from ministation.

/datum/job/New()
..()
supervisors = "the captain and the head of personnel"

/datum/outfit/job/New()
box = /obj/item/weapon/storage/box/survival/radio

/datum/job/assistant // Here so assistant appears on the top of the select job list.

//Command

/datum/job/captain/New()
..()
supervisors = "Nanotrasen and Central Command"

/datum/job/hop/New()
..()
supervisors = "the captain and Central Command"

/datum/job/hop/get_access()
return get_all_accesses()

//Security

/datum/job/officer/New()
..()
total_positions = 3
spawn_positions = 3
access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers)
minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers)

/datum/outfit/job/officer/New()
box = /obj/item/weapon/storage/box/security/radio

/datum/job/detective/New()
..()
access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers)
minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers)

/datum/outfit/job/detective/New()
box = /obj/item/weapon/storage/box/security/radio

//Medbay

/datum/job/doctor/New()
..()
selection_color = "#ffffff"
total_positions = 3
spawn_positions = 3
access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
minimal_access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)

//Engineering

/datum/job/engineer/New()
..()
total_positions = 2
spawn_positions = 2
access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_tcomsat)
minimal_access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_tcomsat)

/datum/outfit/job/engineer/New()
box = /obj/item/weapon/storage/box/engineer/radio

/datum/job/atmos/New()
..()
total_positions = 2
spawn_positions = 2

//Science

/datum/job/scientist/New()
..()
total_positions = 3
spawn_positions = 3
access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_mineral_storeroom, access_tech_storage)
minimal_access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_mineral_storeroom, access_tech_storage)

//Cargo

/datum/job/cargo_tech/New()
..()
total_positions = 2
spawn_positions = 2
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom)
minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom)

/datum/job/mining/New()
..()
total_positions = 2
spawn_positions = 2
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom)
minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom)

/datum/outfit/job/mining/New()
box = /obj/item/weapon/storage/box/engineer/radio

//Service

/datum/job/bartender/New()
..()
access = list(access_hydroponics, access_bar, access_kitchen, access_morgue, access_weapons)
minimal_access = list(access_hydroponics, access_bar, access_kitchen, access_morgue, access_weapons)

/datum/job/cook/New()
..()
access = list(access_hydroponics, access_bar, access_kitchen, access_morgue, access_weapons)
minimal_access = list(access_hydroponics, access_bar, access_kitchen, access_morgue, access_weapons)

/datum/job/hydro/New()
..()
access = list(access_hydroponics, access_bar, access_kitchen, access_morgue, access_maint_tunnels)
minimal_access = list(access_hydroponics, access_bar, access_kitchen, access_morgue, access_maint_tunnels)
// they get maint access because of all the hydro content in maint

/datum/job/janitor/New()
..()
access = list(access_janitor, access_hydroponics, access_bar, access_kitchen, access_morgue, access_maint_tunnels)
minimal_access = list(access_janitor, access_hydroponics, access_bar, access_kitchen, access_morgue, access_maint_tunnels)


//Civilian

/datum/job/clown/New()
..()
supervisors = "nobody but yourself" //Honk
32 changes: 32 additions & 0 deletions _maps/map_files/OmegaStation/job/removed_jobs.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
//removed jobs. pasted together from MiniStation.


/datum/job/hos/config_check()
return 0

/datum/job/chief_engineer/config_check()
return 0

/datum/job/qm/config_check()
return 0

/datum/job/cmo/config_check()
return 0

/datum/job/geneticist/config_check()
return 0

/datum/job/virologist/config_check()
return 0

/datum/job/rd/config_check()
return 0

/datum/job/chaplain/config_check()
return 0

/datum/job/warden/config_check()
return 0

/datum/job/lawyer/config_check()
return 0
35 changes: 35 additions & 0 deletions _maps/omegastation.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#if !defined(MAP_FILE)

#define TITLESCREEN "title" //Add an image in misc/fullscreen.dmi, and set this define to the icon_state, to set a custom titlescreen for your map

#define MINETYPE "lavaland"

#include "map_files\OmegaStation\OmegaStation.dmm"
#include "map_files\generic\z2.dmm"
#include "map_files\generic\z3.dmm"
#include "map_files\generic\z4.dmm"
#include "map_files\generic\lavaland.dmm"
#include "map_files\generic\z6.dmm"
#include "map_files\generic\z7.dmm"
#include "map_files\generic\z8.dmm"
#include "map_files\generic\z9.dmm"
#include "map_files\generic\z10.dmm"
#include "map_files\generic\z11.dmm"

#define MAP_PATH "map_files/OmegaStation"
#define MAP_FILE "OmegaStation.dmm"
#define MAP_NAME "OmegaStation"

#define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG

#if !defined(MAP_OVERRIDE_FILES)
#define MAP_OVERRIDE_FILES
#include "map_files\OmegaStation\job\job_changes.dm"
#include "map_files\OmegaStation\job\removed_jobs.dm"
#endif

#elif !defined(MAP_OVERRIDE)

#warn a map has already been included, ignoring OmegaStation.

#endif
5 changes: 5 additions & 0 deletions config/maps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,8 @@ endmap
map pubbystation
friendlyname Pubby Station
endmap

map omegastation
friendlyname Omega Station
maxplayers 35
endmap

0 comments on commit 4b6a048

Please sign in to comment.