[MDB IGNORE] Taipei Station Map Jam

code/__DEFINES/__game.dm

@@ -40,6 +40,7 @@
 #define MAP_NEW_VARADERO_REPAIRED "New Varadero Repaired"
 #define MAP_CHINOOK "Chinook 91 GSO" //admin level
 #define MAP_DERELICT_ALMAYER "Derelict Almayer"
+#define MAP_TAIPEI_STATION "Taipei Station"
 
 #define GAMEMODE_WHISKEY_OUTPOST "Whiskey Outpost"
 #define GAMEMODE_HIVE_WARS "Hive Wars"

code/game/area/Taipei.dm

@@ -0,0 +1,140 @@
+//TAIPEI STATION AREAS//
+
+
+/area/taipei
+	ceiling = CEILING_DEEP_UNDERGROUND_METAL
+	ceiling_muffle = FALSE
+	powernet_name = "ground"
+	can_build_special = TRUE
+	icon_state = "lv-626"
+	ambience_exterior = AMBIENCE_SHIP
+	soundscape_interval = 0
+	//ambience = list('sound/ambience/shipambience.ogg)
+
+/area/taipei/underground
+	always_unpowered = 1
+	name = "\improper Asteroid"
+	icon_state = "caves"
+
+/area/taipei/club
+	name = "\improper Velvet Tassle"
+	icon_state = "blue"
+	sound_environment = SOUND_ENVIRONMENT_ROOM
+
+/area/taipei/maints
+	name = "Maintenance Tunnels"
+	sound_environment = SOUND_ENVIRONMENT_HALLWAY
+	soundscape_interval = 0
+
+/area/taipei/maints/south
+	name = "\improper Southern Maintenance Tunnels"
+	icon_state = "south"
+
+/area/taipei/maints/north
+	name = "\improper Northern Maintenance Tunnels"
+	icon_state = "north"
+
+/area/taipei/atrium
+	name = "\improper Main Atrium"
+	sound_environment = SOUND_ENVIRONMENT_PARKING_LOT
+	soundscape_playlist = SCAPE_PL_ELEVATOR_MUSIC
+	soundscape_interval = 120
+	icon_state = "green"
+
+/area/taipei/atrium/medbay
+	name = "\improper Clinic"
+	icon_state = "medbay"
+	sound_environment = SOUND_ENVIRONMENT_ROOM
+	soundscape_playlist = SCAPE_PL_ELEVATOR_MUSIC
+	soundscape_interval = 120
+
+/area/taipei/cmb
+	name = "\improper Colonial Marshall Bureau"
+	icon_state = "security"
+	sound_environment = SOUND_ENVIRONMENT_ROOM
+
+/area/taipei/cargo
+	name = "\improper Cargo Access"
+	icon_state = "primarystorage"
+	sound_environment = SOUND_ENVIRONMENT_HANGAR
+
+/area/taipei/hangar
+	name = "\improper Access Hangar"
+	icon_state = "yellow"
+	sound_environment = SOUND_ENVIRONMENT_HANGAR
+	soundscape_playlist = SCAPE_PL_HANGAR
+	soundscape_interval = 30
+
+/area/taipei/hangar/landingzone
+	name = "\improper Landing Zone One"
+	is_landing_zone = TRUE
+	icon_state = "lv-626"
+
+/area/taipei/telecomms
+	name = "\improper Telecommunications"
+	icon_state = "purple"
+	soundscape_playlist = SCAPE_PL_AICORE
+	soundscape_interval = 5
+	sound_environment = SOUND_ENVIRONMENT_GENERIC
+
+/area/taipei/atrium/laundry
+	name = "\improper Laundromat"
+	icon_state = "gruntrnr"
+	sound_environment = SOUND_ENVIRONMENT_ROOM
+
+/area/taipei/atrium/store
+	name = "\improper Conveniance-Mart"
+	icon_state = "req"
+	sound_environment = SOUND_ENVIRONMENT_ROOM
+
+/area/taipei/theatre
+	name = "\improper Movie Star"
+	icon_state = "almayer"
+	sound_environment = SOUND_ENVIRONMENT_AUDITORIUM
+
+/area/taipei/atrium/offices
+	name = "\improper Management Office"
+	icon_state = "livingspace"
+	sound_environment = SOUND_ENVIRONMENT_LIVINGROOM
+
+/area/taipei/reactor
+	name = "\improper Reactor Control Room"
+	icon_state = "upperengineering"
+	sound_environment = SOUND_ENVIRONMENT_GENERIC
+	soundscape_playlist = SCAPE_PL_ENG
+	soundscape_interval = 15
+
+/area/taipei/reactor/chamber
+	name = "\improper Reactor Chamber"
+	icon_state = "green"
+	sound_environment = SOUND_ENVIRONMENT_MOUNTAINS
+
+/area/taipei/atrium/restaurant
+	name = "\improper Sal's Noodles"
+	icon_state = "pink"
+	sound_environment = SOUND_ENVIRONMENT_ROOM
+
+/area/taipei/atrium/bookstore
+	name = "\improper Lots'o'Books"
+	icon_state = "yellow"
+	sound_environment = SOUND_ENVIRONMENT_LIVINGROOM
+
+/area/taipei/hangar/cargoshuttle
+	name = "\improper Cargo Skiff"
+	icon_state = "green"
+	sound_environment = SOUND_ENVIRONMENT_HALLWAY
+
+/area/taipei/elevator
+	name = "Elevator"
+	icon_state = "yellow"
+
+/area/taipei/elevator/arrivals
+	name = "\improper Arrivals Elevator"
+
+/area/taipei/elevator/departures
+	name = "\improper Departures Elevator"
+
+/area/taipei/atrium/hotel
+	name = "\improper Short Stay Room and Board"
+	icon_state = "green"
+	sound_environment = SOUND_ENVIRONMENT_CARPETED_HALLWAY

code/game/objects/items/toys/toys.dm

@@ -695,3 +695,55 @@
 
 /obj/item/toy/plush/shark/alt
 	icon_state = "shark_alt"
+
+//desk toys
+/obj/item/toy/desk
+	name = "generic desk-toy"
+	desc = "You shouldn't be seeing this."
+	icon = 'icons/obj/items/toy.dmi'
+	var/on = FALSE
+	var/activation_sound = 'sound/machines/click.ogg'
+
+/obj/item/toy/desk/update_icon()
+	if(on)
+		icon_state = initial(icon_state) + "-on"
+	else
+		icon_state = initial(icon_state)
+
+/obj/item/toy/desk/proc/activate(mob/user as mob)
+	on = !on
+	playsound(src.loc, activation_sound, 75, 1)
+	update_icon()
+	return 1
+
+/obj/item/toy/desk/attack_self(mob/user)
+	..()
+	activate(user)
+
+/obj/item/toy/desk/MouseDrop(atom/over_object)
+	if(over_object == usr && ishuman(usr) && !usr.is_mob_restrained() && !usr.stat && (loc == usr || in_range(src, usr)))
+		if(!usr.get_active_hand()) //if active hand is empty
+			usr.put_in_hands(src)
+		to_chat(usr, SPAN_NOTICE("You pick up [src]."))
+	return
+
+/obj/item/toy/desk/newtoncradle
+	name = "\improper Newton's cradle"
+	desc = "A ancient 21th century super-weapon model demonstrating that Sir Isaac Newton is the deadliest sonuvabitch in space."
+	icon_state = "newtoncradle"
+
+/obj/item/toy/desk/fan
+	name = "office fan"
+	desc = "Your greatest fan."
+	icon_state = "fan"
+
+/obj/item/toy/desk/officetoy
+	name = "office toy"
+	desc = "A generic battery-powered office desk toy. Only generates magnetism and ennui."
+	icon_state = "desktoy"
+
+/obj/item/toy/desk/dippingbird
+	name = "dipping bird toy"
+	desc = "Engineers marvel at this scale model of a primitive thermal engine. It's highly debated why the majority of owners \
+	were in low-level bureaucratic jobs."
+	icon_state = "dippybird"

code/modules/cm_marines/equipment/maps.dm

@@ -145,6 +145,12 @@
 	html_link = "images/5/54/USS_Almayer.png"
 	color = "cyan"
 
+/obj/item/map/taipei_map
+	name = "\improper Taipei Station Map"
+	desc = "Voted Okay-est Spaceport 2164"
+	html_link = ""
+	color = "red"
+
 GLOBAL_LIST_INIT_TYPED(map_type_list, /obj/item/map, setup_all_maps())
 
 /proc/setup_all_maps()
@@ -168,6 +174,7 @@ GLOBAL_LIST_INIT_TYPED(map_type_list, /obj/item/map, setup_all_maps())
 		MAP_NEW_VARADERO = new /obj/item/map/new_varadero(),
 		MAP_NEW_VARADERO_REPAIRED = new /obj/item/map/new_varadero(),
 		MAP_DERELICT_ALMAYER = new /obj/item/map/almayer(),
+		MAP_TAIPEI_STATION = new /obj/item/map/taipei_map(),
 	)
 
 //used by marine equipment machines to spawn the correct map.

colonialmarines.dme

@@ -780,6 +780,7 @@
 #include "code\game\area\space_station_13_areas.dm"
 #include "code\game\area\strata.dm"
 #include "code\game\area\Sulaco.dm"
+#include "code\game\area\Taipei.dm"
 #include "code\game\area\techtree.dm"
 #include "code\game\area\varadero.dm"
 #include "code\game\area\WhiskeyOutpost.dm"

map_config/maps.txt

@@ -73,3 +73,6 @@ endmap
 
 map whiskey_outpost_v2
 endmap
+
+map taipei_station
+endmap