diff --git a/code/defines/area/Space Station 13 areas.dm b/code/defines/area/Space Station 13 areas.dm index eae208d1efb..5cd05235826 100755 --- a/code/defines/area/Space Station 13 areas.dm +++ b/code/defines/area/Space Station 13 areas.dm @@ -110,11 +110,11 @@ proc/process_ghost_teleport_locs() requires_power = 0 /area/arrival/start - name = "Arrival Area" + name = "\improper Arrival Area" icon_state = "start" /area/admin - name = "Admin room" + name = "\improper Admin room" icon_state = "start" @@ -129,7 +129,7 @@ proc/process_ghost_teleport_locs() sd_lighting = 0 /area/shuttle/arrival - name = "Arrival Shuttle" + name = "\improper Arrival Shuttle" /area/shuttle/arrival/pre_game icon_state = "shuttle2" @@ -138,23 +138,23 @@ proc/process_ghost_teleport_locs() icon_state = "shuttle" /area/shuttle/escape - name = "Emergency Shuttle" + name = "\improper Emergency Shuttle" music = "music/escape.ogg" /area/shuttle/escape/station - name = "Emergency Shuttle Station" + name = "\improper Emergency Shuttle Station" icon_state = "shuttle2" /area/shuttle/escape/centcom - name = "Emergency Shuttle Centcom" + name = "\improper Emergency Shuttle Centcom" icon_state = "shuttle" /area/shuttle/escape/transit // the area to pass through for 3 minute transit - name = "Emergency Shuttle Transit" + name = "\improper Emergency Shuttle Transit" icon_state = "shuttle" /area/shuttle/escape_pod1 - name = "Escape Pod One" + name = "\improper Escape Pod One" music = "music/escape.ogg" /area/shuttle/escape_pod1/station @@ -167,7 +167,7 @@ proc/process_ghost_teleport_locs() icon_state = "shuttle" /area/shuttle/escape_pod2 - name = "Escape Pod Two" + name = "\improper Escape Pod Two" music = "music/escape.ogg" /area/shuttle/escape_pod2/station @@ -180,7 +180,7 @@ proc/process_ghost_teleport_locs() icon_state = "shuttle" /area/shuttle/escape_pod3 - name = "Escape Pod Three" + name = "\improper Escape Pod Three" music = "music/escape.ogg" /area/shuttle/escape_pod3/station @@ -193,7 +193,7 @@ proc/process_ghost_teleport_locs() icon_state = "shuttle" /area/shuttle/escape_pod5 //Pod 4 was lost to meteors - name = "Escape Pod Five" + name = "\improper Escape Pod Five" music = "music/escape.ogg" /area/shuttle/escape_pod5/station @@ -206,7 +206,7 @@ proc/process_ghost_teleport_locs() icon_state = "shuttle" /area/shuttle/mining - name = "Mining Shuttle" + name = "\improper Mining Shuttle" music = "music/escape.ogg" /area/shuttle/mining/station @@ -217,31 +217,31 @@ proc/process_ghost_teleport_locs() /area/shuttle/transport1/centcom icon_state = "shuttle" - name = "Transport Shuttle Centcom" + name = "\improper Transport Shuttle Centcom" /area/shuttle/transport1/station icon_state = "shuttle" - name = "Transport Shuttle" + name = "\improper Transport Shuttle" /area/shuttle/transport2/centcom icon_state = "shuttle" /area/shuttle/alien/base icon_state = "shuttle" - name = "Alien Shuttle Base" + name = "\improper Alien Shuttle Base" requires_power = 1 luminosity = 0 sd_lighting = 1 /area/shuttle/alien/mine icon_state = "shuttle" - name = "Alien Shuttle Mine" + name = "\improper Alien Shuttle Mine" requires_power = 1 luminosity = 0 sd_lighting = 1 /area/shuttle/prison/ - name = "Prison Shuttle" + name = "\improper Prison Shuttle" /area/shuttle/prison/station icon_state = "shuttle" @@ -250,54 +250,54 @@ proc/process_ghost_teleport_locs() icon_state = "shuttle2" /area/shuttle/specops/centcom - name = "Special Ops Shuttle" + name = "\improper Special Ops Shuttle" icon_state = "shuttlered" /area/shuttle/specops/station - name = "Special Ops Shuttle" + name = "\improper Special Ops Shuttle" icon_state = "shuttlered2" /area/shuttle/syndicate_elite/mothership - name = "Syndicate Elite Shuttle" + name = "\improper Syndicate Elite Shuttle" icon_state = "shuttlered" /area/shuttle/syndicate_elite/station - name = "Syndicate Elite Shuttle" + name = "\improper Syndicate Elite Shuttle" icon_state = "shuttlered2" /area/shuttle/administration/centcom - name = "Administration Shuttle Centcom" + name = "\improper Administration Shuttle Centcom" icon_state = "shuttlered" /area/shuttle/administration/station - name = "Administration Shuttle" + name = "\improper Administration Shuttle" icon_state = "shuttlered2" /area/shuttle/thunderdome name = "honk" /area/shuttle/thunderdome/grnshuttle - name = "Thunderdome GRN Shuttle" + name = "\improper Thunderdome GRN Shuttle" icon_state = "green" /area/shuttle/thunderdome/grnshuttle/dome - name = "GRN Shuttle" + name = "\improper GRN Shuttle" icon_state = "shuttlegrn" /area/shuttle/thunderdome/grnshuttle/station - name = "GRN Station" + name = "\improper GRN Station" icon_state = "shuttlegrn2" /area/shuttle/thunderdome/redshuttle - name = "Thunderdome RED Shuttle" + name = "\improper Thunderdome RED Shuttle" icon_state = "red" /area/shuttle/thunderdome/redshuttle/dome - name = "RED Shuttle" + name = "\improper RED Shuttle" icon_state = "shuttlered" /area/shuttle/thunderdome/redshuttle/station - name = "RED Station" + name = "\improper RED Station" icon_state = "shuttlered2" // === Trying to remove these areas: @@ -316,76 +316,76 @@ proc/process_ghost_teleport_locs() // === end remove /area/alien - name = "Alien base" + name = "\improper Alien base" icon_state = "yellow" requires_power = 0 // CENTCOM /area/centcom - name = "Centcom" + name = "\improper Centcom" icon_state = "centcom" requires_power = 0 /area/centcom/control - name = "Centcom Control" + name = "\improper Centcom Control" /area/centcom/evac - name = "Centcom Emergency Shuttle" + name = "\improper Centcom Emergency Shuttle" /area/centcom/suppy - name = "Centcom Supply Shuttle" + name = "\improper Centcom Supply Shuttle" /area/centcom/ferry - name = "Centcom Transport Shuttle" + name = "\improper Centcom Transport Shuttle" /area/centcom/shuttle - name = "Centcom Administration Shuttle" + name = "\improper Centcom Administration Shuttle" /area/centcom/test - name = "Centcom Testing Facility" + name = "\improper Centcom Testing Facility" /area/centcom/living - name = "Centcom Living Quarters" + name = "\improper Centcom Living Quarters" /area/centcom/specops - name = "Centcom Special Ops" + name = "\improper Centcom Special Ops" /area/centcom/creed name = "Creed's Office" /area/centcom/holding - name = "Holding Facility" + name = "\improper Holding Facility" //SYNDICATES /area/syndicate_mothership - name = "Syndicate Mothership" + name = "\improper Syndicate Mothership" icon_state = "syndie-ship" requires_power = 0 /area/syndicate_mothership/control - name = "Syndicate Control Room" + name = "\improper Syndicate Control Room" icon_state = "syndie-control" /area/syndicate_mothership/elite_squad - name = "Syndicate Elite Squad" + name = "\improper Syndicate Elite Squad" icon_state = "syndie-elite" //EXTRA /area/asteroid // -- TLE - name = "Asteroid" + name = "\improper Asteroid" icon_state = "asteroid" requires_power = 0 /area/asteroid/cave // -- TLE - name = "Asteroid - Underground" + name = "\improper Asteroid - Underground" icon_state = "cave" requires_power = 0 /area/asteroid/artifactroom - name = "Asteroid - Artifact" + name = "\improper Asteroid - Artifact" icon_state = "cave" @@ -403,76 +403,84 @@ proc/process_ghost_teleport_locs() /area/planet/clown - name = "Clown Planet" + name = "\improper Clown Planet" icon_state = "honk" requires_power = 0 /area/tdome - name = "Thunderdome" + name = "\improper Thunderdome" icon_state = "thunder" requires_power = 0 /area/tdome/tdome1 - name = "Thunderdome (Team 1)" + name = "\improper Thunderdome (Team 1)" icon_state = "green" /area/tdome/tdome2 - name = "Thunderdome (Team 2)" + name = "\improper Thunderdome (Team 2)" icon_state = "yellow" /area/tdome/tdomeadmin - name = "Thunderdome (Admin.)" + name = "\improper Thunderdome (Admin.)" icon_state = "purple" /area/tdome/tdomeobserve - name = "Thunderdome (Observer.)" + name = "\improper Thunderdome (Observer.)" icon_state = "purple" //ENEMY /area/syndicate_station - name = "Syndicate Station" + name = "\improper Syndicate Station" icon_state = "yellow" requires_power = 0 /area/syndicate_station/start - name = "Syndicate Station Start" + name = "\improper Syndicate Station Start" icon_state = "yellow" /area/syndicate_station/one - name = "Syndicate Station Location 1" + name = "\improper Syndicate Station Location 1" icon_state = "green" /area/syndicate_station/two - name = "Syndicate Station Location 2" + name = "\improper Syndicate Station Location 2" icon_state = "green" /area/syndicate_station/three - name = "Syndicate Station Location 3" + name = "\improper Syndicate Station Location 3" icon_state = "green" /area/syndicate_station/four - name = "Syndicate Station Location 4" + name = "\improper Syndicate Station Location 4" + icon_state = "green" + +/area/syndicate_station/five + name = "\improper Syndicate Station Location 5" + icon_state = "green" + +/area/syndicate_station/six + name = "\improper Syndicate Station Location 6" icon_state = "green" /area/wizard_station - name = "Wizard's Den" + name = "\improper Wizard's Den" icon_state = "yellow" requires_power = 0 /area/borg_deathsquad - name = "Borg Deathsquad" + name = "\improper Borg Deathsquad" icon_state = "yellow" requires_power = 0 /area/borg_deathsquad/start - name = "Borg Deathsquad - Ready" + name = "\improper Borg Deathsquad - Ready" /area/borg_deathsquad/station - name = "Borg Deathsquad - Arrived" + name = "\improper Borg Deathsquad - Arrived" @@ -483,69 +491,69 @@ proc/process_ghost_teleport_locs() //PRISON /area/prison - name = "Prison Station" + name = "\improper Prison Station" icon_state = "brig" /area/prison/arrival_airlock - name = "Prison Station Airlock" + name = "\improper Prison Station Airlock" icon_state = "green" requires_power = 0 /area/prison/control - name = "Prison Security Checkpoint" + name = "\improper Prison Security Checkpoint" icon_state = "security" /area/prison/crew_quarters - name = "Prison Security Quarters" + name = "\improper Prison Security Quarters" icon_state = "security" /area/prison/rec_room - name = "Prison Rec Room" + name = "\improper Prison Rec Room" icon_state = "green" /area/prison/closet - name = "Prison Supply Closet" + name = "\improper Prison Supply Closet" icon_state = "dk_yellow" /area/prison/hallway/fore - name = "Prison Fore Hallway" + name = "\improper Prison Fore Hallway" icon_state = "yellow" /area/prison/hallway/aft - name = "Prison Aft Hallway" + name = "\improper Prison Aft Hallway" icon_state = "yellow" /area/prison/hallway/port - name = "Prison Port Hallway" + name = "\improper Prison Port Hallway" icon_state = "yellow" /area/prison/hallway/starboard - name = "Prison Starboard Hallway" + name = "\improper Prison Starboard Hallway" icon_state = "yellow" /area/prison/morgue - name = "Prison Morgue" + name = "\improper Prison Morgue" icon_state = "morgue" /area/prison/medical_research - name = "Prison Genetic Research" + name = "\improper Prison Genetic Research" icon_state = "medresearch" /area/prison/medical - name = "Prison Medbay" + name = "\improper Prison Medbay" icon_state = "medbay" /area/prison/solar - name = "Prison Solar Array" + name = "\improper Prison Solar Array" icon_state = "storage" requires_power = 0 /area/prison/podbay - name = "Prison Podbay" + name = "\improper Prison Podbay" icon_state = "dk_yellow" /area/prison/solar_control - name = "Prison Solar Array Control" + name = "\improper Prison Solar Array Control" icon_state = "dk_yellow" /area/prison/solitary @@ -571,7 +579,7 @@ proc/process_ghost_teleport_locs() icon_state = "atmos" /area/atmos/refilling - name = "Refilling Station" + name = "\improper Refilling Station" icon_state = "atmos" //Maintenance @@ -629,7 +637,7 @@ proc/process_ghost_teleport_locs() icon_state = "green" /area/maintenance/incinerator - name = "Incinerator" + name = "\improper Incinerator" icon_state = "disposal" /area/maintenance/disposal @@ -639,153 +647,153 @@ proc/process_ghost_teleport_locs() //Hallway /area/hallway/primary/fore - name = "Fore Primary Hallway" + name = "\improper Fore Primary Hallway" icon_state = "hallF" /area/hallway/primary/starboard - name = "Starboard Primary Hallway" + name = "\improper Starboard Primary Hallway" icon_state = "hallS" /area/hallway/primary/aft - name = "Aft Primary Hallway" + name = "\improper Aft Primary Hallway" icon_state = "hallA" /area/hallway/primary/port - name = "Port Primary Hallway" + name = "\improper Port Primary Hallway" icon_state = "hallP" /area/hallway/primary/central - name = "Central Primary Hallway" + name = "\improper Central Primary Hallway" icon_state = "hallC" /area/hallway/secondary/exit - name = "Escape Shuttle Hallway" + name = "\improper Escape Shuttle Hallway" icon_state = "escape" /area/hallway/secondary/construction - name = "Construction Area" + name = "\improper Construction Area" icon_state = "construction" /area/hallway/secondary/entry - name = "Arrival Shuttle Hallway" + name = "\improper Arrival Shuttle Hallway" icon_state = "entry" /area/hallway/secondary/docking - name = "Docking Arm" + name = "\improper Docking Arm" icon_state = "entry" //Command /area/bridge - name = "Bridge" + name = "\improper Bridge" icon_state = "bridge" music = "signal" /area/bridge/meeting_room - name = "Heads of Staff Meeting Room" + name = "\improper Heads of Staff Meeting Room" icon_state = "bridge" music = null /area/crew_quarters/captain - name = "Captain's Quarters" + name = "\improper Captain's Quarters" icon_state = "captain" /area/crew_quarters/courtroom - name = "Courtroom" + name = "\improper Courtroom" icon_state = "courtroom" /area/crew_quarters/heads/hop - name = "Head of Personnel's Quarters" + name = "\improper Head of Personnel's Quarters" icon_state = "head_quarters" /area/crew_quarters/heads/hor - name = "Research Director's Quarters" + name = "\improper Research Director's Quarters" icon_state = "head_quarters" -/area/crew_quarters/heads/ce - name = "Chief Engineer's Quarters" +/area/crew_quarters/heads/chief + name = "\improper Chief Engineer's Quarters" icon_state = "head_quarters" /area/crew_quarters/heads/hos - name = "Head of Security's Quarters" + name = "\improper Head of Security's Quarters" icon_state = "head_quarters" /area/crew_quarters/heads/cmo - name = "Chief Medical Officer's Quarters" + name = "\improper Chief Medical Officer's Quarters" icon_state = "head_quarters" /area/mint - name = "Mint" + name = "\improper Mint" icon_state = "green" //Crew /area/crew_quarters - name = "Dormitories" + name = "\improper Dormitories" icon_state = "Sleep" /area/crew_quarters/toilet - name = "Dormitory Toilets" + name = "\improper Dormitory Toilets" icon_state = "toilet" /area/crew_quarters/sleep_male - name = "Male Dorm" + name = "\improper Male Dorm" icon_state = "Sleep" /area/crew_quarters/sleep_male/toilet_male - name = "Male Toilets" + name = "\improper Male Toilets" icon_state = "toilet" /area/crew_quarters/sleep_female - name = "Female Dorm" + name = "\improper Female Dorm" icon_state = "Sleep" /area/crew_quarters/sleep_female/toilet_female - name = "Female Toilets" + name = "\improper Female Toilets" icon_state = "toilet" /area/crew_quarters/locker - name = "Locker Room" + name = "\improper Locker Room" icon_state = "locker" /area/crew_quarters/locker/locker_toilet - name = "Locker Toilets" + name = "\improper Locker Toilets" icon_state = "toilet" /area/crew_quarters/fitness - name = "Fitness Room" + name = "\improper Fitness Room" icon_state = "fitness" /area/crew_quarters/cafeteria - name = "Cafeteria" + name = "\improper Cafeteria" icon_state = "cafeteria" /area/crew_quarters/kitchen - name = "Kitchen" + name = "\improper Kitchen" icon_state = "kitchen" /area/crew_quarters/bar - name = "Bar" + name = "\improper Bar" icon_state = "bar" /area/crew_quarters/theatre - name = "Theatre" + name = "\improper Theatre" icon_state = "Theatre" /area/library - name = "Library" + name = "\improper Library" icon_state = "library" /area/chapel/main - name = "Chapel" + name = "\improper Chapel" icon_state = "chapel" /area/chapel/office - name = "Chapel Office" + name = "\improper Chapel Office" icon_state = "chapeloffice" /area/lawoffice - name = "Law Office" + name = "\improper Law Office" icon_state = "law" @@ -795,37 +803,37 @@ proc/process_ghost_teleport_locs() /area/holodeck - name = "Holodeck" + name = "\improper Holodeck" icon_state = "Holodeck" luminosity = 1 sd_lighting = 0 /area/holodeck/alphadeck - name = "Holodeck Alpha" + name = "\improper Holodeck Alpha" /area/holodeck/source_plating - name = "Holodeck - Off" + name = "\improper Holodeck - Off" icon_state = "Holodeck" /area/holodeck/source_emptycourt - name = "Holodeck - Empty Court" + name = "\improper Holodeck - Empty Court" /area/holodeck/source_boxingcourt - name = "Holodeck - Boxing Court" + name = "\improper Holodeck - Boxing Court" /area/holodeck/source_thunderdomecourt - name = "Holodeck - Thunderdome Court" + name = "\improper Holodeck - Thunderdome Court" /area/holodeck/source_beach - name = "Holodeck - Beach" + name = "\improper Holodeck - Beach" icon_state = "Holodeck" // Lazy. /area/holodeck/source_burntest - name = "Holodeck - Atmospheric Burn Test" + name = "\improper Holodeck - Atmospheric Burn Test" /area/holodeck/source_wildlife - name = "Holodeck - Wildlife Simulation" + name = "\improper Holodeck - Wildlife Simulation" @@ -841,7 +849,7 @@ proc/process_ghost_teleport_locs() /area/engine engine_smes - name = "Engineering SMES" + name = "\improper Engineering SMES" icon_state = "engine_smes" requires_power = 0//This area only covers the batteries and they deal with their own power @@ -850,19 +858,19 @@ proc/process_ghost_teleport_locs() icon_state = "engine" engineering_break_room - name = "Engineering Break Room" - icon_state = "engine_breakroom" + name = "\improper Engineering Break Room" + icon_state = "engine" chiefs_office - name = "Chief Engineer's office" + name = "\improper Chief Engineer's office" icon_state = "engine_ce" particle_accelerator - name = "Particle Accelerator" + name = "\improper Particle Accelerator" icon_state = "engine_pa" control - name = "Engineering Control" + name = "\improper Engineering Control" icon_state = "engine_control" port @@ -882,7 +890,7 @@ proc/process_ghost_teleport_locs() icon_state = "engine_aft" locker - name = "Engineering Locker Room" + name = "\improper Engineering Locker Room" icon_state = "engine_locker" construction_storage @@ -902,17 +910,17 @@ proc/process_ghost_teleport_locs() icon_state = "engine_secure" foyer - name = "Engineering Foyer" + name = "\improper Engineering Foyer" icon_state = "engine_foyer" core - name = "Engineering Core" + name = "\improper Engineering Core" icon_state = "engine_core" //reactor areas reactor_core - name = "Reactor Core" + name = "\improper Reactor Core" icon_state = "engine_core" reactor_gas @@ -928,7 +936,7 @@ proc/process_ghost_teleport_locs() icon_state = "engine_turbine" reactor_airlock - name = "Reactor Primary Entrance" + name = "\improper Reactor Primary Entrance" icon_state = "engine_airlock" reactor_fuel_storage @@ -936,19 +944,19 @@ proc/process_ghost_teleport_locs() icon_state = "engine_fuel" reactor_fuel_ports - name = "Reactor Fuel Ports" + name = "\improper Reactor Fuel Ports" icon_state = "engine_port" generators - name = "Generator Room" + name = "\improper Generator Room" icon_state = "engine_generators" port_gyro_bay - name = "Port Gyrotron Bay" + name = "\improper Port Gyrotron Bay" icon_state = "engine_starboardgyro" starboard_gyro_bay - name = "Starboard Gyrotron Bay" + name = "\improper Starboard Gyrotron Bay" icon_state = "engine_portgyro" //Solars @@ -959,27 +967,27 @@ proc/process_ghost_teleport_locs() sd_lighting = 0 auxport - name = "Port Auxiliary Solar Array" + name = "\improper Port Auxiliary Solar Array" icon_state = "panelsA" auxstarboard - name = "Starboard Auxiliary Solar Array" + name = "\improper Starboard Auxiliary Solar Array" icon_state = "panelsA" fore - name = "Fore Solar Array" + name = "\improper Fore Solar Array" icon_state = "yellow" aft - name = "Aft Solar Array" + name = "\improper Aft Solar Array" icon_state = "aft" starboard - name = "Starboard Solar Array" + name = "\improper Starboard Solar Array" icon_state = "panelsS" port - name = "Port Solar Array" + name = "\improper Port Solar Array" icon_state = "panelsP" /area/maintenance/auxsolarport @@ -1000,31 +1008,31 @@ proc/process_ghost_teleport_locs() /area/assembly/chargebay - name = "Recharging Bay" + name = "\improper Recharging Bay" icon_state = "mechbay" /area/assembly/showroom - name = "Robotics Showroom" + name = "\improper Robotics Showroom" icon_state = "showroom" /area/assembly/assembly_line - name = "Robotics Assembly Line" + name = "\improper Robotics Assembly Line" icon_state = "ass_line" //Teleporter /area/teleporter - name = "Teleporter" + name = "\improper Teleporter" icon_state = "teleporter" music = "signal" /area/teleporter/gateway - name = "Secure Construction Area" + name = "\improper Secure Construction Area" icon_state = "teleporter" music = "signal" /area/AIsattele - name = "AI Satellite Teleporter Room" + name = "\improper AI Satellite Teleporter Room" icon_state = "teleporter" music = "signal" @@ -1036,11 +1044,11 @@ proc/process_ghost_teleport_locs() music = 'signal.ogg' /area/medical/patients_rooms - name = "Patients Rooms" + name = "\improper Patient's Rooms" icon_state = "patients" /area/medical/cmo - name = "Chief Medical Officer's office" + name = "\improper Chief Medical Officer's office" icon_state = "CMO" /area/medical/robotics @@ -1056,7 +1064,7 @@ proc/process_ghost_teleport_locs() icon_state = "virology" /area/medical/morgue - name = "Morgue" + name = "\improper Morgue" icon_state = "morgue" /area/medical/chemistry @@ -1072,7 +1080,7 @@ proc/process_ghost_teleport_locs() icon_state = "cryo" /area/medical/exam_room - name = "Exam Room" + name = "\improper Exam Room" icon_state = "exam_room" /area/medical/genetics @@ -1080,45 +1088,45 @@ proc/process_ghost_teleport_locs() icon_state = "genetics" /area/medical/sleeper - name = "Medical Sleepers Room" + name = "\improper Medical Sleepers Room" icon_state = "medbay" //Security /area/security/main - name = "Security Office" + name = "\improper Security Office" icon_state = "security" /area/security/lobby - name = "Security Lobby" + name = "\improper Security Lobby" icon_state = "security" /area/security/brig - name = "Brig" + name = "\improper Brig" icon_state = "brig" /area/security/prison - name = "Prison Wing" + name = "\improper Prison Wing" icon_state = "security" /area/security/warden - name = "Warden" + name = "\improper Warden" icon_state = "Warden" /area/security/armoury - name = "Armoury" + name = "\improper Armoury" icon_state = "Warden" /area/security/hos - name = "Head of Security's Office" + name = "\improper Head of Security's Office" icon_state = "security" /area/security/detectives_office - name = "Detective's Office" + name = "\improper Detective's Office" icon_state = "detective" /area/security/range - name = "Firing Range" + name = "\improper Firing Range" icon_state = "firingrange" /* @@ -1139,59 +1147,59 @@ proc/process_ghost_teleport_locs() */ /area/security/nuke_storage - name = "Vault" + name = "\improper Vault" icon_state = "nuke_storage" /area/security/checkpoint - name = "Security Checkpoint" + name = "\improper Security Checkpoint" icon_state = "checkpoint1" /area/security/checkpoint2 - name = "Security Checkpoint" + name = "\improper Security Checkpoint" icon_state = "security" /area/security/vacantoffice - name = "Vacant Office" + name = "\improper Vacant Office" icon_state = "security" /area/quartermaster - name = "Quartermasters" + name = "\improper Quartermasters" icon_state = "quart" ///////////WORK IN PROGRESS////////// /area/quartermaster/sorting - name = "Delivery Office" + name = "\improper Delivery Office" icon_state = "quartstorage" ////////////WORK IN PROGRESS////////// /area/quartermaster/office - name = "Cargo Office" + name = "\improper Cargo Office" icon_state = "quartoffice" /area/quartermaster/storage - name = "Cargo Bay" + name = "\improper Cargo Bay" icon_state = "quartstorage" /area/quartermaster/qm - name = "Quartermaster's Office" + name = "\improper Quartermaster's Office" icon_state = "quart" /area/quartermaster/miningdock - name = "Mining Dock" + name = "\improper Mining Dock" icon_state = "mining" /area/quartermaster/miningstorage - name = "Mining Storage" + name = "\improper Mining Storage" icon_state = "green" /area/quartermaster/mechbay - name = "Mech Bay" + name = "\improper Mech Bay" icon_state = "yellow" /area/janitor/ - name = "Custodial Closet" + name = "\improper Custodial Closet" icon_state = "janitor" /area/hydroponics @@ -1201,19 +1209,19 @@ proc/process_ghost_teleport_locs() //Toxins /area/toxins/hallway - name = "R&D Hallway" + name = "\improper R&D Hallway" icon_state = "hallC" /area/toxins/lab - name = "Research Lab" - icon_state = "researchlab" + name = "\improper Research Lab" + icon_state = "toxlab" /area/toxins/rdoffice - name = "Research Director's Office" + name = "\improper Research Director's Office" icon_state = "head_quarters" /area/toxins/xenobiology - name = "Xenobiology Lab" + name = "\improper Xenobiology Lab" icon_state = "xenolab" /area/toxins/gasstorage @@ -1221,31 +1229,31 @@ proc/process_ghost_teleport_locs() icon_state = "gasstorage" /area/toxins/toxinslab - name = "Toxins Lab" + name = "\improper Toxins Lab" icon_state = "toxlab" /area/toxins/storage - name = "Toxins Storage" + name = "\improper Toxins Storage" icon_state = "toxstorage" /area/toxins/test_area - name = "Toxins Test Area" + name = "\improper Toxins Test Area" icon_state = "toxtest" /area/toxins/mixing - name = "Toxins Mixing Room" + name = "\improper Toxins Mixing Room" icon_state = "toxmix" /area/toxins/observatory - name = "Toxins Lab Observatory" + name = "\improper Toxins Lab Observatory" icon_state = "toxobserv" /area/toxins/server - name = "Server Room" + name = "\improper Server Room" icon_state = "server" /area/toxins/supermatter - name = "Supermatter Laboratory" + name = "\improper Supermatter Laboratory" icon_state = "supermatter" //Storage @@ -1292,35 +1300,35 @@ proc/process_ghost_teleport_locs() /area/storage/testroom requires_power = 0 - name = "Test Room" + name = "\improper Test Room" icon_state = "storage" //DJSTATION /area/djstation - name = "Ruskie DJ Station" + name = "\improper Ruskie DJ Station" icon_state = "DJ" /area/djstation/solars - name = "DJ Station Solars" + name = "\improper DJ Station Solars" icon_state = "DJ" //DERELICT /area/derelict - name = "Derelict Station" + name = "\improper Derelict Station" icon_state = "storage" /area/derelict/hallway/primary - name = "Derelict Primary Hallway" + name = "\improper Derelict Primary Hallway" icon_state = "hallP" /area/derelict/hallway/secondary - name = "Derelict Secondary Hallway" + name = "\improper Derelict Secondary Hallway" icon_state = "hallS" /area/derelict/arrival - name = "Derelict Arrival Centre" + name = "\improper Derelict Arrival Centre" icon_state = "yellow" /area/derelict/storage/equipment @@ -1334,11 +1342,11 @@ proc/process_ghost_teleport_locs() icon_state = "green" /area/derelict/bridge - name = "Derelict Control Room" + name = "\improper Derelict Control Room" icon_state = "bridge" /area/derelict/secret - name = "Derelict Secret Room" + name = "\improper Derelict Secret Room" icon_state = "library" /area/derelict/bridge/access @@ -1346,15 +1354,15 @@ proc/process_ghost_teleport_locs() icon_state = "auxstorage" /area/derelict/bridge/ai_upload - name = "Derelict Computer Core" + name = "\improper Derelict Computer Core" icon_state = "ai" /area/derelict/solar_control - name = "Derelict Solar Control" + name = "\improper Derelict Solar Control" icon_state = "engine" /area/derelict/crew_quarters - name = "Derelict Crew Quarters" + name = "\improper Derelict Crew Quarters" icon_state = "fitness" /area/derelict/medical @@ -1362,15 +1370,15 @@ proc/process_ghost_teleport_locs() icon_state = "medbay" /area/derelict/medical/morgue - name = "Derelict Morgue" + name = "\improper Derelict Morgue" icon_state = "morgue" /area/derelict/medical/chapel - name = "Derelict Chapel" + name = "\improper Derelict Chapel" icon_state = "chapel" /area/derelict/teleporter - name = "Derelict Teleporter" + name = "\improper Derelict Teleporter" icon_state = "teleporter" /area/derelict/eva @@ -1378,41 +1386,41 @@ proc/process_ghost_teleport_locs() icon_state = "eva" /area/derelict/ship - name = "Abandoned Ship" + name = "\improper Abandoned Ship" icon_state = "yellow" /area/solar/derelict_starboard - name = "Derelict Starboard Solar Array" + name = "\improper Derelict Starboard Solar Array" icon_state = "panelsS" /area/solar/derelict_aft - name = "Derelict Aft Solar Array" + name = "\improper Derelict Aft Solar Array" icon_state = "aft" /area/derelict/singularity_engine - name = "Derelict Singularity Engine" + name = "\improper Derelict Singularity Engine" icon_state = "engine" //Construction /area/construction - name = "Construction Area" + name = "\improper Construction Area" icon_state = "yellow" /area/construction/under_construction_small - name = "Construction Area" + name = "\improper Construction Area" icon_state = "construction" /area/construction/under_construction_large - name = "Construction Area" + name = "\improper Construction Area" icon_state = "construction" /area/construction/supplyshuttle - name = "Supply Shuttle" + name = "\improper Supply Shuttle" icon_state = "yellow" /area/construction/quarters - name = "Engineer's Quarters" + name = "\improper Engineer's Quarters" icon_state = "yellow" /area/construction/qmaint @@ -1420,15 +1428,15 @@ proc/process_ghost_teleport_locs() icon_state = "yellow" /area/construction/hallway - name = "Hallway" + name = "\improper Hallway" icon_state = "yellow" /area/construction/solars - name = "Solar Panels" + name = "\improper Solar Panels" icon_state = "yellow" /area/construction/solarscontrol - name = "Solar Panel Control" + name = "\improper Solar Panel Control" icon_state = "yellow" /area/construction/Storage @@ -1450,51 +1458,51 @@ proc/process_ghost_teleport_locs() icon_state = "storage" /area/turret_protected/ai_upload - name = "AI Upload Chamber" + name = "\improper AI Upload Chamber" icon_state = "ai_upload" /area/turret_protected/ai_upload_foyer - name = "AI Upload Foyer" + name = "\improper AI Upload Foyer" icon_state = "ai_foyer" /area/turret_protected/ai - name = "AI Chamber" + name = "\improper AI Chamber" icon_state = "ai_chamber" /area/turret_protected/aisat - name = "AI Satellite" + name = "\improper AI Satellite" icon_state = "ai" /area/turret_protected/aisat_interior - name = "AI Satellite" + name = "\improper AI Satellite" icon_state = "ai" /area/turret_protected/AIsatextFP - name = "AI Sat Ext" + name = "\improper AI Sat Ext" icon_state = "storage" luminosity = 1 sd_lighting = 0 /area/turret_protected/AIsatextFS - name = "AI Sat Ext" + name = "\improper AI Sat Ext" icon_state = "storage" luminosity = 1 sd_lighting = 0 /area/turret_protected/AIsatextAS - name = "AI Sat Ext" + name = "\improper AI Sat Ext" icon_state = "storage" luminosity = 1 sd_lighting = 0 /area/turret_protected/AIsatextAP - name = "AI Sat Ext" + name = "\improper AI Sat Ext" icon_state = "storage" luminosity = 1 sd_lighting = 0 /area/turret_protected/NewAIMain - name = "AI Main New" + name = "\improper AI Main New" icon_state = "storage" @@ -1504,19 +1512,19 @@ proc/process_ghost_teleport_locs() /area/wreck/ai - name = "AI Chamber" + name = "\improper AI Chamber" icon_state = "ai" /area/wreck/main - name = "Wreck" + name = "\improper Wreck" icon_state = "storage" /area/wreck/engineering - name = "Power Room" + name = "\improper Power Room" icon_state = "engine" /area/wreck/bridge - name = "Bridge" + name = "\improper Bridge" icon_state = "bridge" /area/generic @@ -1528,31 +1536,31 @@ proc/process_ghost_teleport_locs() // Telecommunications Satellite /area/tcommsat/entrance - name = "Telecommunications Satellite Teleporter" + name = "\improper Telecommunications Satellite Teleporter" icon_state = "tcomsatentrance" /area/tcommsat/chamber - name = "Telecommunications Satellite Central Compartment" + name = "\improper Telecommunications Satellite Central Compartment" icon_state = "tcomsatcham" /area/turret_protected/tcomfoyer - name = "Telecommunications Satellite Foyer" + name = "\improper Telecommunications Satellite Foyer" icon_state = "tcomsatlob" /area/turret_protected/tcomwest - name = "Telecommunications Satellite West Wing" + name = "\improper Telecommunications Satellite West Wing" icon_state = "tcomsatwest" /area/turret_protected/tcomeast - name = "Telecommunications Satellite East Wing" + name = "\improper Telecommunications Satellite East Wing" icon_state = "tcomsateast" /area/tcommsat/computer - name = "Telecommunications Satellite Observatory" + name = "\improper Telecommunications Satellite Observatory" icon_state = "tcomsatcomp" /area/tcommsat/lounge - name = "Telecommunications Satellite Lounge" + name = "\improper Telecommunications Satellite Lounge" icon_state = "tcomsatlounge" @@ -1567,7 +1575,7 @@ proc/process_ghost_teleport_locs() /area/turret_protected/AssistantRoom - name = "Assistant Room" + name = "\improper Assistant Room" icon_state = "storage" sd_lighting = 0 diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index 9e430951c8b..f3d495452ea 100755 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -873,25 +873,26 @@ return switch(scanmode) if(2) - if (!A.fingerprints) - user << "\blue Unable to locate any fingerprints on [A]!" - else - user << "\blue Isolated [A:fingerprints.len] fingerprints." - var/list/prints = A:fingerprints - var/list/complete_prints = list() - for(var/i in prints) - var/print = prints[i] - if(stringpercent(print) <= FINGERPRINT_COMPLETE) - complete_prints += print - if(complete_prints.len < 1) - user << "\blue No intact prints found" + if(!istype(A, /obj/item/weapon/f_card)) + if (!A.fingerprints) + user << "\blue Unable to locate any fingerprints on [A]!" else - user << "\blue Found [complete_prints.len] intact prints" - for(var/i in complete_prints) - user << "\blue [i]" - if(cartridge && cartridge.access_security) - cartridge.add_data(A) - user << "Data added to internal storage. Scan with a High-Resolution Scanner to retreive." + user << "\blue Isolated [A:fingerprints.len] fingerprints." + var/list/prints = A:fingerprints + var/list/complete_prints = list() + for(var/i in prints) + var/print = prints[i] + if(stringpercent(print) <= FINGERPRINT_COMPLETE) + complete_prints += print + if(complete_prints.len < 1) + user << "\blue No intact prints found" + else + user << "\blue Found [complete_prints.len] intact prints" + for(var/i in complete_prints) + user << "\blue [i]" + if(cartridge && cartridge.access_security) + cartridge.add_data(A) + user << "Data added to internal storage. Scan with a High-Resolution Scanner to retreive." if(3) if(!isnull(A.reagents)) diff --git a/code/game/objects/devices/PDA/cart.dm b/code/game/objects/devices/PDA/cart.dm index fd23ad3254f..ff7b7325b9f 100644 --- a/code/game/objects/devices/PDA/cart.dm +++ b/code/game/objects/devices/PDA/cart.dm @@ -610,7 +610,7 @@ Code: sum_list[1] = A.fingerprints sum_list[2] = A.suit_fibers sum_list[3] = A.blood_DNA - sum_list[4] = "\The [A] in [get_area(A)]" + sum_list[4] = "\The [A] in \the [get_area(A)]" stored["\ref [A]"] = sum_list return 0 diff --git a/code/game/objects/devices/scanners.dm b/code/game/objects/devices/scanners.dm index 9f8398495e2..f1e42988ef0 100644 --- a/code/game/objects/devices/scanners.dm +++ b/code/game/objects/devices/scanners.dm @@ -216,7 +216,7 @@ MASS SPECTROMETER sum_list[1] = A.fingerprints sum_list[2] = A.suit_fibers sum_list[3] = A.blood_DNA - sum_list[4] = "\The [A] in [get_area(A)]" + sum_list[4] = "\The [A] in \the [get_area(A)]" stored["\ref [A]"] = sum_list return 0 diff --git a/code/modules/DetectiveWork/detective_work.dm b/code/modules/DetectiveWork/detective_work.dm index bb4cb2e0a2d..730ca687e82 100644 --- a/code/modules/DetectiveWork/detective_work.dm +++ b/code/modules/DetectiveWork/detective_work.dm @@ -289,13 +289,12 @@ obj/machinery/computer/forensic_scanning if(fibers && fibers.len) temp += " Fibers:
" for(var/j = 1, j <= fibers.len, j++) - temp += "
      [fibers[j]]" + temp += "      [fibers[j]]
" var/list/blood = outputs[2] if(blood && blood.len) temp += " Blood:
" - for(var/j = 1, j <= blood.len, j++) - var/list/templist2 = blood[j] - temp += "      Type: [templist2[2]], DNA: [templist2[1]]
" + for(var/named in blood) + temp += "      Type: [blood[named]], DNA: [named]
" temp += "
{Delete This Record}" temp += "
{Print}" else @@ -313,13 +312,12 @@ obj/machinery/computer/forensic_scanning if(fibers && fibers.len) P.info += " Fibers:
" for(var/j = 1, j <= fibers.len, j++) - P.info += "
      [fibers[j]]" + P.info += "      [fibers[j]]
" var/list/blood = outputs[2] if(blood && blood.len) P.info += " Blood:
" - for(var/j = 1, j <= blood.len, j++) - var/list/templist2 = blood[j] - P.info += "      Type: [templist2[2]], DNA: [templist2[1]]
" + for(var/named in blood) + P.info += "      Type: [blood[named]], DNA: [named]
" else usr << "ERROR. Database not found!
" if("scan")