shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

Browse Source 
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
This commit is contained in:
kevinz000
2017-08-24 21:07:58 -07:00
committed by GitHub
parent 188193eb61
commit c638386507
219 changed files with 40493 additions and 56328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/Space_Station_13_areas.dm
+47 -23
View File
@@ -264,21 +264,44 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Central Asteroid Maintenance"
icon_state = "maintcentral"
/area/maintenance/asteroid/disposal/east
name = "Eastern External Waste Belt"
/area/maintenance/asteroid/disposal
icon_state = "disposal"
/area/maintenance/asteroid/disposal/north
name = "Northern External Waste Belt"
icon_state = "disposal"
name = "Northern Disposal"
/area/maintenance/asteroid/disposal/southeast
name = "South-Eastern Disposal"
icon_state = "disposal"
/area/maintenance/asteroid/disposal/north/east
name = "North-Eastern Disposal"
/area/maintenance/asteroid/disposal/southwest
/area/maintenance/asteroid/disposal/north/west
name = "North-Western Disposal"
/area/maintenance/asteroid/disposal/east
name = "Eastern Disposal"
/area/maintenance/asteroid/disposal/west
name = "Western Disposal"
/area/maintenance/asteroid/disposal/west/secondary
name = "Secondary Western Disposal"
/area/maintenance/asteroid/disposal/south
name = "Southern Disposal"
/area/maintenance/asteroid/disposal/south/west
name = "South-Western Disposal"
icon_state = "disposal"
/area/maintenance/asteroid/disposal/external/east
name = "Eastern External Waste Belt"
/area/maintenance/asteroid/disposal/external/north
name = "Northern External Waste Belt"
/area/maintenance/asteroid/disposal/external/southeast
name = "South-Eastern External Waste Belt"
/area/maintenance/asteroid/disposal/external/southwest
name = "South-Western External Waste Belt"
/area/maintenance/asteroid/fore/cargo_west
name = "Fore Asteroid Maintenance"
@@ -531,15 +554,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/crew_quarters/toilet/locker
name = "Locker Toilets"
icon_state = "toilet"
/area/crew_quarters/toilet/fitness
name = "Fitness Toilets"
icon_state = "toilet"
/area/crew_quarters/toilet/female
name = "Female Toilets"
icon_state = "toilet"
/area/crew_quarters/toilet/male
name = "Male Toilets"
icon_state = "toilet"
/area/crew_quarters/toilet/restrooms
name = "Restrooms"
icon_state = "toilet"
@@ -817,13 +844,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Starboard Bow Auxiliary Solar Maintenance"
icon_state = "SolarcontrolA"
/area/assembly/assembly_line //Derelict Assembly Line
name = "Assembly Line"
icon_state = "ass_line"
power_equip = FALSE
power_light = FALSE
power_environ = FALSE
//Teleporter
/area/teleporter
@@ -1007,10 +1027,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Firing Range"
icon_state = "firingrange"
/area/security/transfer
name = "Transfer Centre"
/area/security/execution
icon_state = "execution_room"
/area/security/execution/transfer
name = "Transfer Centre"
/area/security/execution/education
name = "Prisoner Education Chamber"
/area/security/nuke_storage
name = "Vault"
icon_state = "nuke_storage"
@@ -1463,7 +1488,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
//SPACE STATION 13
GLOBAL_LIST_INIT(the_station_areas, list (
/area/assembly,
/area/bridge,
/area/chapel,
/area/construction,
@@ -1490,4 +1514,4 @@ GLOBAL_LIST_INIT(the_station_areas, list (
/area/ai_monitored/turret_protected/ai_upload, //do not try to simplify to "/area/ai_monitored/turret_protected" --rastaf0
/area/ai_monitored/turret_protected/ai_upload_foyer,
/area/ai_monitored/turret_protected/ai,
))
))
code/game/area/areas.dm
+6
View File
@@ -477,3 +477,9 @@ GLOBAL_LIST_EMPTY(teleportlocs)
valid_territory = FALSE
blob_allowed = FALSE
addSorted()
/area/AllowDrop()
CRASH("Bad op: area/AllowDrop() called")
/area/drop_location()
CRASH("Bad op: area/drop_location() called")
code/game/area/areas/misc.dm
-16
View File
@@ -22,22 +22,6 @@
//Misc
/area/wreck/ai
name = "AI Chamber"
icon_state = "ai"
/area/wreck/main
name = "Wreck"
icon_state = "storage"
/area/wreck/engineering
name = "Power Room"
icon_state = "engine"
/area/wreck/bridge
name = "Bridge"
icon_state = "bridge"
/area/generic
name = "Unknown"
icon_state = "storage"
code/game/area/areas/ruins/_ruins.dm
+19
View File
@@ -0,0 +1,19 @@
//Parent types
/area/ruin
name = "\improper Unexplored Location"
icon_state = "away"
has_gravity = TRUE
hidden = TRUE
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
/area/ruin/unpowered
always_unpowered = FALSE
/area/ruin/unpowered/no_grav
has_gravity = FALSE
/area/ruin/powered
requires_power = FALSE
code/game/area/areas/ruins/lavaland.dm
+51
View File
@@ -0,0 +1,51 @@
//Lavaland Ruins
/area/ruin/powered/beach
icon_state = "dk_yellow"
/area/ruin/powered/clownplanet
icon_state = "dk_yellow"
/area/ruin/powered/animal_hospital
icon_state = "dk_yellow"
/area/ruin/powered/snow_biodome
icon_state = "dk_yellow"
/area/ruin/powered/gluttony
icon_state = "dk_yellow"
/area/ruin/powered/golem_ship
name = "Free Golem Ship"
icon_state = "dk_yellow"
/area/ruin/powered/greed
icon_state = "dk_yellow"
/area/ruin/unpowered/hierophant
name = "Hierophant's Arena"
icon_state = "dk_yellow"
/area/ruin/powered/pride
icon_state = "dk_yellow"
/area/ruin/powered/seedvault
icon_state = "dk_yellow"
/area/ruin/powered/syndicate_lava_base
name = "Secret Base"
icon_state = "dk_yellow"
//Xeno Nest
/area/ruin/unpowered/xenonest
name = "The Hive"
always_unpowered = TRUE
power_environ = FALSE
power_equip = FALSE
power_light = FALSE
poweralm = FALSE
//ash walker nest
/area/ruin/unpowered/ash_walkers
icon_state = "red"
code/game/area/areas/ruins/space.dm
+429
View File
@@ -0,0 +1,429 @@
//Space Ruin Parents
/area/ruin/space
has_gravity = FALSE
blob_allowed = FALSE //Nope, no winning in space as a blob. Gotta eat the station.
/area/ruin/space/has_grav
has_gravity = TRUE
/area/ruin/space/has_grav/powered
requires_power = FALSE
/area/ruin/fakespace
icon_state = "space"
requires_power = TRUE
always_unpowered = TRUE
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
has_gravity = FALSE
power_light = FALSE
power_equip = FALSE
power_environ = FALSE
valid_territory = FALSE
outdoors = TRUE
ambientsounds = list('sound/ambience/ambispace.ogg','sound/ambience/title2.ogg')
blob_allowed = FALSE
/////////////
/area/ruin/space/way_home
name = "\improper Salvation"
icon_state = "away"
always_unpowered = FALSE
// Ruins of "onehalf" ship
/area/ruin/space/has_grav/onehalf/hallway
name = "Hallway"
icon_state = "hallC"
/area/ruin/space/has_grav/onehalf/drone_bay
name = "Mining Drone Bay"
icon_state = "engine"
/area/ruin/space/has_grav/onehalf/dorms_med
name = "Crew Quarters"
icon_state = "Sleep"
/area/ruin/space/has_grav/onehalf/bridge
name = "Bridge"
icon_state = "bridge"
/area/ruin/space/has_grav/powered/dinner_for_two
name = "Dinner for Two"
/area/ruin/space/has_grav/powered/authorship
name = "Authorship"
/area/ruin/space/has_grav/powered/aesthetic
name = "Aesthetic"
ambientsounds = list('sound/ambience/ambivapor1.ogg')
//Ruin of Hotel
/area/ruin/space/has_grav/hotel
name = "Hotel"
/area/ruin/space/has_grav/hotel/guestroom
name = "Hotel Guest Room"
icon_state = "Sleep"
/area/ruin/space/has_grav/hotel/security
name = "Hotel Security Post"
icon_state = "security"
/area/ruin/space/has_grav/hotel/pool
name = "Hotel Pool Room"
icon_state = "fitness"
/area/ruin/space/has_grav/hotel/bar
name = "Hotel Bar"
icon_state = "cafeteria"
/area/ruin/space/has_grav/hotel/power
name = "Hotel Power Room"
icon_state = "engine_smes"
/area/ruin/space/has_grav/hotel/custodial
name = "Hotel Custodial Closet"
icon_state = "janitor"
/area/ruin/space/has_grav/hotel/shuttle
name = "Hotel Shuttle"
icon_state = "shuttle"
requires_power = FALSE
/area/ruin/space/has_grav/hotel/dock
name = "Hotel Shuttle Dock"
icon_state = "start"
/area/ruin/space/has_grav/hotel/workroom
name = "Hotel Staff Room"
icon_state = "crew_quarters"
//Ruin of Derelict Oupost
/area/ruin/space/has_grav/derelictoutpost
name = "Derelict Outpost"
icon_state = "green"
/area/ruin/space/has_grav/derelictoutpost/cargostorage
name = "Derelict Outpost Cargo Storage"
icon_state = "storage"
/area/ruin/space/has_grav/derelictoutpost/cargobay
name = "Derelict Outpost Cargo Bay"
icon_state = "quartstorage"
/area/ruin/space/has_grav/derelictoutpost/powerstorage
name = "Derelict Outpost Power Storage"
icon_state = "engine_smes"
/area/ruin/space/has_grav/derelictoutpost/dockedship
name = "Derelict Outpost Docked Ship"
icon_state = "red"
//Ruin of Space Bar
/area/ruin/space/has_grav/powered/spacebar
name = "Space Bar"
icon_state = "bar"
//Ruin of turretedoutpost
/area/ruin/space/has_grav/turretedoutpost
name = "Turreted Outpost"
icon_state = "red"
//Ruin of old teleporter
/area/ruin/space/oldteleporter
name = "Old teleporter"
icon_state = "teleporter"
//Ruin of mech transport
/area/ruin/space/has_grav/powered/mechtransport
name = "Mech Transport"
icon_state = "green"
//Ruin of gas the lizard
/area/ruin/space/has_grav/gasthelizard
name = "Gas the lizard"
//Ruin of Deep Storage
/area/ruin/space/has_grav/deepstorage
name = "Deep Storage"
icon_state = "storage"
/area/ruin/space/has_grav/deepstorage/airlock
name = "Deep Storage Airlock"
icon_state = "quart"
/area/ruin/space/has_grav/deepstorage/power
name = "Deep Storage Power and Atmospherics Room"
icon_state = "engi_storage"
/area/ruin/space/has_grav/deepstorage/hydroponics
name = "Deep Storage Hydroponics"
icon_state = "garden"
/area/ruin/space/has_grav/deepstorage/armory
name = "Deep Storage Secure Storage"
icon_state = "armory"
/area/ruin/space/has_grav/deepstorage/storage
name = "Deep Storage Storage"
icon_state = "storage_wing"
/area/ruin/space/has_grav/deepstorage/dorm
name = "Deep Storage Dormory"
icon_state = "crew_quarters"
/area/ruin/space/has_grav/deepstorage/kitchen
name = "Deep Storage Kitchen"
icon_state = "kitchen"
/area/ruin/space/has_grav/deepstorage/crusher
name = "Deep Storage Recycler"
icon_state = "storage"
//Ruin of Abandoned Zoo
/area/ruin/space/has_grav/abandonedzoo
name = "Abandoned Zoo"
icon_state = "green"
//Ruin of ancient Space Station
/area/ruin/space/has_grav/ancientstation
name = "Charlie Station Main Corridor"
icon_state = "green"
/area/ruin/space/has_grav/ancientstation/powered
name = "Powered Tile"
icon_state = "teleporter"
requires_power = FALSE
/area/ruin/space/has_grav/ancientstation/space
name = "Exposed To Space"
icon_state = "teleporter"
has_gravity = FALSE
/area/ruin/space/has_grav/ancientstation/atmo
name = "Beta Station Atmospherics"
icon_state = "red"
has_gravity = FALSE
/area/ruin/space/has_grav/ancientstation/betanorth
name = "Beta Station North Corridor"
icon_state = "blue"
/area/ruin/space/has_grav/ancientstation/solar
name = "Station Solar Array"
icon_state = "panelsAP"
/area/ruin/space/has_grav/ancientstation/engi
name = "Charlie Station Engineering"
icon_state = "engine"
/area/ruin/space/has_grav/ancientstation/comm
name = "Charlie Station Command"
icon_state = "captain"
/area/ruin/space/has_grav/ancientstation/hydroponics
name = "Charlie Station Hydroponics"
icon_state = "garden"
/area/ruin/space/has_grav/ancientstation/kitchen
name = "Charlie Station Kitchen"
icon_state = "kitchen"
/area/ruin/space/has_grav/ancientstation/sec
name = "Charlie Station Security"
icon_state = "red"
/area/ruin/space/has_grav/ancientstation/deltacorridor
name = "Delta Station Main Corridor"
icon_state = "green"
/area/ruin/space/has_grav/ancientstation/proto
name = "Delta Station Prototype Lab"
icon_state = "toxlab"
/area/ruin/space/has_grav/ancientstation/rnd
name = "Delta Station Research and Development"
icon_state = "toxlab"
/area/ruin/space/has_grav/ancientstation/hivebot
name = "Hivebot Mothership"
icon_state = "teleporter"
//DERELICT
/area/ruin/space/derelict
name = "Derelict Station"
icon_state = "storage"
/area/ruin/space/derelict/hallway/primary
name = "Derelict Primary Hallway"
icon_state = "hallP"
/area/ruin/space/derelict/hallway/secondary
name = "Derelict Secondary Hallway"
icon_state = "hallS"
/area/ruin/space/derelict/hallway/primary/port
name = "Derelict Port Hallway"
icon_state = "hallFP"
/area/ruin/space/derelict/arrival
name = "Derelict Arrival Centre"
icon_state = "yellow"
/area/ruin/space/derelict/storage/equipment
name = "Derelict Equipment Storage"
/area/ruin/space/derelict/storage/storage_access
name = "Derelict Storage Access"
/area/ruin/space/derelict/storage/engine_storage
name = "Derelict Engine Storage"
icon_state = "green"
/area/ruin/space/derelict/bridge
name = "Derelict Control Room"
icon_state = "bridge"
/area/ruin/space/derelict/secret
name = "Derelict Secret Room"
icon_state = "library"
/area/ruin/space/derelict/bridge/access
name = "Derelict Control Room Access"
icon_state = "auxstorage"
/area/ruin/space/derelict/bridge/ai_upload
name = "Derelict Computer Core"
icon_state = "ai"
/area/ruin/space/derelict/solar_control
name = "Derelict Solar Control"
icon_state = "engine"
/area/ruin/space/derelict/se_solar
name = "South East Solars"
icon_state = "engine"
/area/ruin/space/derelict/crew_quarters
name = "Derelict Crew Quarters"
icon_state = "fitness"
/area/ruin/space/derelict/medical
name = "Derelict Medbay"
icon_state = "medbay"
/area/ruin/space/derelict/medical/morgue
name = "Derelict Morgue"
icon_state = "morgue"
/area/ruin/space/derelict/medical/chapel
name = "Derelict Chapel"
icon_state = "chapel"
/area/ruin/space/derelict/teleporter
name = "Derelict Teleporter"
icon_state = "teleporter"
/area/ruin/space/derelict/eva
name = "Derelict EVA Storage"
icon_state = "eva"
/area/ruin/space/derelict/ship
name = "Abandoned Ship"
icon_state = "yellow"
/area/solar/derelict_starboard
name = "Derelict Starboard Solar Array"
icon_state = "panelsS"
/area/solar/derelict_aft
name = "Derelict Aft Solar Array"
icon_state = "yellow"
/area/ruin/space/derelict/singularity_engine
name = "Derelict Singularity Engine"
icon_state = "engine"
/area/ruin/space/derelict/gravity_generator
name = "Derelict Gravity Generator Room"
icon_state = "red"
/area/ruin/space/derelict/atmospherics
name = "Derelict Atmospherics"
icon_state = "red"
/area/ruin/space/derelict/assembly_line
name = "Assembly Line"
icon_state = "ass_line"
power_equip = FALSE
power_light = FALSE
power_environ = FALSE
//DJSTATION
/area/ruin/space/djstation
name = "Ruskie DJ Station"
icon_state = "DJ"
has_gravity = TRUE
blob_allowed = FALSE //Nope, no winning on the DJ station as a blob. Gotta eat the main station.
/area/ruin/space/djstation/solars
name = "DJ Station Solars"
icon_state = "DJ"
has_gravity = TRUE
//ABANDONED TELEPORTER
/area/ruin/space/abandoned_tele
name = "Abandoned Teleporter"
icon_state = "teleporter"
music = "signal"
ambientsounds = list('sound/ambience/ambimalf.ogg')
//OLD AI SAT
/area/ruin/space/old_ai_sat/ai
name = "AI Chamber"
icon_state = "ai"
ambientsounds = list('sound/ambience/ambimalf.ogg')
/area/ruin/space/old_ai_sat/main
name = "Wreck"
icon_state = "storage"
/area/ruin/space/old_ai_sat/engineering
name = "Power Room"
icon_state = "engine"
/area/ruin/space/old_ai_sat/bridge
name = "Bridge"
icon_state = "bridge"