Commit Graph
9130 Commits
Author SHA1 Message Date
Cael_Aislinn 2a4433ec59 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/verbs/AI_status.dm
	code/modules/mob/living/silicon/ai/ai.dm
	config/custom_items.txt
	icons/mob/AI.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-04 22:11:21 +10:00
Erthilo a8fd29c5d9 Merge pull request #1700 from Erthilo/master
Syncing config lists with server.
2012-09-02 17:55:14 -07:00
Erthilo 2160c5445e Forgot config.txt 2012-09-03 01:54:11 +01:00
Erthilo e3be272f27 Syncing config lists with server. 2012-09-03 01:53:34 +01:00
Mloc b600824b4d Added Phaux to mods. 2012-09-03 01:50:04 +02:00
Mloc 6229c4f2ab Merge pull request #1694 from comma/master
Fix for appendictomy not being possible without admin intervention.
2012-08-31 08:34:49 -07:00
Jim "Apples" aea6fbe20f Merge pull request #1696 from caelaislinn/master
update custom_items.txt
2012-08-31 08:11:47 -07:00
Cael_Aislinn 97d4e6b785 update custom_items.txt
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-01 01:09:33 +10:00
Jim "Apples" 79bd1dd1b1 Merge pull request #1695 from caelaislinn/master
custom items
2012-08-31 07:37:15 -07:00
Cael_Aislinn 0549787788 missing icons
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-01 00:29:29 +10:00
Cael_Aislinn 1b307f26de custom item stuff: updated roaper(enos adlai) comfy hat sprite, added searif (ara al-jazari) classy bartender uniform, sirribbit (james mcreary) mcreary's journal, serithi (tribunal) custom ai sprites (player has manual selection of both normal and malf states), removed (commented out) searif's one nations flagmask
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-01 00:27:24 +10:00
Chinsky 4db98fa311 Fix for appendictomy not being possible.
For some reason organ, affected with scalpel (by organ.status |= BLEEDING) did not start to bleed.
That caused hemostat step to fail, and not advance appendix operation stage.
2012-08-31 17:16:31 +04:00
Cael_Aislinn 62b2f41921 taj can't wear gloves or shoes comfortably, have a chance to break them/hurt themself when they try to put them on
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-28 21:34:20 +10:00
Cael_Aislinn 78435b0ba6 re-add wedding stuff. haven't tested them ingame
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-28 20:51:31 +10:00
Cael_Aislinn 2b44f0cd93 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	code/modules/clothing/gimmick.dm
	icons/mob/uniform.dmi
	icons/obj/closet.dmi
	icons/obj/clothing/uniforms.dmi

removed dresses etc, will reapply manually

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-28 20:26:58 +10:00
Cael_Aislinn e6078b100f Merge tgstation r4572 into bs12_with_tgport, fixed missing title screen (tgside problem?), some conflicts
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-28 20:22:22 +10:00
Cael_Aislinn eacd84b212 Merge tgstation13 r4570 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/defines/procs/helpers.dm
	code/defines/turf.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/master_controller.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/item.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/wires.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/unused/toilets.dm
	html/changelog.html
	icons/effects/alert.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-28 19:57:11 +10:00
Cael_Aislinn 6db38dbda7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-08-28 08:50:33 +10:00
giacomand@gmail.com b0f750339c Added freelook AI Eye acceleration. Your AI Eye will get faster the longer you move it, allowing you to move around the station quickly. Stopping long enough will return the camera to normal speed.
With this I added a toggle to the acceleration. Using it will stop the AI Eye from gaining speed.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4570 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-27 20:30:03 +00:00
sieve32@gmail.com c7ec10523b Committing this before I forget about it again, just a change to lasertag gun icons so they actually indicates their charge
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4569 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-27 20:13:46 +00:00
elly1989@rocketmail.com 306a1ce1be Runtime Fix for:
The following runtime has occured 12 time(s).
runtime error: Cannot read null.buckled
proc name: manual unbuckle (/obj/structure/stool/bed/nest/manual_unbuckle)
  source file: nest.dm,18
  usr: null
  src: the alien nest (/obj/structure/stool/bed/nest)

Forgot to check if user still existed after a spawn() delay.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4568 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-27 19:27:12 +00:00
petethegoat@gmail.com 0195f09059 Fixed up cryo.dm a little bit. Cryo tubes are one 32x64 sprite now.
Moved some of the sprites into cryogenics.dmi- Cryogenic2.dmi is full of random shit, someone should probably look at it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4567 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-27 15:34:47 +00:00
elly1989@rocketmail.com c785acd44a What I've got of the mapfix so far:
Fixes morgue-type doors (confession booth, private study, coffin storage)
Fixes Entertainment telescreens
fixes Splashscreen for new-players
Fixes clown-planet HONK

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4566 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-27 14:27:10 +00:00
giacomand@gmail.com a9ea582961 -You can now enable/disable airlock bolt lights. Cutting the bolt light wire will disable the lights. Pulsing the bolt light wire will toggle the lights.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4565 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-27 12:58:52 +00:00
elly1989@rocketmail.com 99fda82957 Removed all icon = from the dmm. This will mean that a lot of the map appears borked. We're working on doing this stuff outside the map so lazy-mappers don't cause loads of 'cannot find resource' errors for coders trying to use faster compiles.
Affected lines for people fixing the map to look at
  D:\BYOND\CLEAN\maps\tgstation.2.0.9.dmm (177 hits)
	Line 1528: "aDt" = (/obj/machinery/mass_driver{dir = 4; id = "chapelgun"},/obj/machinery/door/window{dir = 8; icon = 'icons/obj/doors/windoor.dmi'; name = "Mass Driver"; req_access_txt = "22"},/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/chapel/main)
	Line 1894: "aKv" = (/obj/machinery/door/window{dir = 4; icon = 'icons/obj/doors/windoor.dmi'; name = "Theatre Stage"; req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/wood,/area/crew_quarters/theatre)
	Line 1896: "aKx" = (/obj/structure/table,/obj/machinery/computer/security/telescreen{desc = "Damn, they better have /tg/thechannel on these things."; icon = 'status_display.dmi'; icon_state = "entertainment"; name = "Entertainment monitor"; pixel_x = 32; pixel_y = 0},/obj/item/clothing/head/cakehat,/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
	Line 1967: "aLQ" = (/obj/machinery/door{icon = 'icons/obj/doors/doormorgue.dmi'; name = "Confession Booth (Chaplain)"; req_access_txt = "22"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
	Line 2010: "aMH" = (/obj/machinery/computer/security/telescreen{desc = "Damn, they better have /tg/thechannel on these things."; icon = 'status_display.dmi'; icon_state = "entertainment"; name = "Entertainment monitor"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
	Line 2170: "aPL" = (/obj/machinery/door{icon = 'icons/obj/doors/doormorgue.dmi'; name = "Confession Booth"; req_access_txt = "0"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
	Line 2720: "bap" = (/obj/machinery/door/window{dir = 1; icon = 'icons/obj/doors/windoor.dmi'; name = "Captain's Desk Door"; req_access_txt = "20"},/turf/simulated/floor/wood,/area/crew_quarters/captain)
	Line 2804: "bbV" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/window{base_state = "right"; dir = 8; icon = 'icons/obj/doors/windoor.dmi'; icon_state = "right"; name = "Head of Personnel's Desk"; req_access_txt = "57"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/machinery/door/window/northleft{dir = 4; icon_state = "left"; name = "Reception Window"; req_access_txt = "0"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/crew_quarters/heads)
	Line 3094: "bhz" = (/obj/structure/table,/obj/item/weapon/aiModule/asimov,/obj/item/weapon/aiModule/freeformcore,/obj/machinery/door/window{base_state = "right"; dir = 4; icon = 'icons/obj/doors/windoor.dmi'; icon_state = "right"; name = "Core Modules"; req_access_txt = "20"},/obj/structure/window/reinforced,/obj/item/weapon/aiModule/corp,/obj/item/weapon/aiModule/paladin,/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload)
	Line 3386: "bnf" = (/obj/machinery/door{icon = 'icons/obj/doors/doormorgue.dmi'; name = "Private Study"; req_access_txt = "37"},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/library)
	Line 4127: "bBs" = (/obj/machinery/door/airlock/glass{autoclose = 0; doortype = 21; frequency = 1449; icon = 'icons/obj/doors/Doorresearchglass.dmi'; icon_state = "door_locked"; id_tag = "tox_airlock_interior"; locked = 1; name = "Mixing Room Interior Airlock"; req_access_txt = "7"},/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/toxins/mixing)
	Line 4129: "bBu" = (/obj/machinery/door/airlock/glass{autoclose = 0; doortype = 21; frequency = 1449; icon = 'icons/obj/doors/Doorresearchglass.dmi'; icon_state = "door_locked"; id_tag = "tox_airlock_exterior"; locked = 1; name = "Mixing Room Exterior Airlock"; req_access_txt = "7"},/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/toxins/mixing)
	Line 5377: "bZu" = (/obj/machinery/door/airlock/maintenance{autoclose = 0; doortype = 7; frequency = 1449; glass = 1; icon = 'icons/obj/doors/Doorglass.dmi'; icon_state = "door_locked"; id_tag = "incinerator_airlock_interior"; locked = 1; name = "Incinerator Interior Airlock"; opacity = 0; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/incinerator)
	Line 5378: "bZv" = (/obj/machinery/door/airlock/maintenance{autoclose = 0; doortype = 7; frequency = 1449; glass = 1; icon = 'icons/obj/doors/Doorglass.dmi'; icon_state = "door_locked"; id_tag = "incinerator_airlock_exterior"; locked = 1; name = "Incinerator Exterior Airlock"; opacity = 0; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/incinerator)
	Line 6020: "clN" = (/turf/unsimulated/wall{tag = "icon-iron6"; icon = 'icons/turf/mineral_walls.dmi'; icon_state = "iron6"},/area)
	Line 6021: "clO" = (/obj/structure/window/reinforced,/turf/unsimulated/wall{tag = "icon-iron12"; icon = 'icons/turf/mineral_walls.dmi'; icon_state = "iron12"},/area)
	Line 6022: "clP" = (/turf/unsimulated/wall{tag = "icon-iron14"; icon = 'icons/turf/mineral_walls.dmi'; icon_state = "iron14"},/area)
	Line 6023: "clQ" = (/turf/unsimulated/wall{tag = "icon-iron10"; icon = 'icons/turf/mineral_walls.dmi'; icon_state = "iron10"},/area)
	Line 6047: "cmo" = (/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/wall{tag = "icon-iron3"; icon = 'icons/turf/mineral_walls.dmi'; icon_state = "iron3"},/area)
	Line 6049: "cmq" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/wall{tag = "icon-iron3"; icon = 'icons/turf/mineral_walls.dmi'; icon_state = "iron3"},/area)
	Line 6055: "cmw" = (/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/wall{tag = "icon-iron3"; icon = 'icons/turf/mineral_walls.dmi'; icon_state = "iron3"},/area)
	Line 6118: "cnH" = (/turf/unsimulated/wall{tag = "icon-iron3"; icon = 'icons/turf/mineral_walls.dmi'; icon_state = "iron3"},/area)
	Line 6119: "cnI" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/unsimulated/wall{tag = "icon-iron12"; icon = 'icons/turf/mineral_walls.dmi'; icon_state = "iron12"},/area)
	Line 6121: "cnK" = (/turf/unsimulated/wall{tag = "icon-iron11"; icon = 'icons/turf/mineral_walls.dmi'; icon_state = "iron11"},/area)
	Line 6137: "coa" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/turf/simulated/floor/holofloor/grass,/area/holodeck/source_beach)
	Line 6138: "cob" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm1"; layer = 10; name = "palm tree"},/turf/simulated/floor/holofloor/grass,/area/holodeck/source_beach)
	Line 6186: "coX" = (/turf/simulated/floor/holofloor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "Soft sand"},/area/holodeck/source_beach)
	Line 6192: "cpd" = (/turf/simulated/floor/holofloor{icon = 'icons/misc/beach2.dmi'; icon_state = "sandwater"; name = "Beach Front"},/area/holodeck/source_beach)
	Line 6197: "cpi" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/simulated/floor/holofloor{icon = 'icons/misc/beach.dmi'; icon_plating = "water"; icon_regular_floor = "water"; icon_state = "water"; name = "Water"},/area/holodeck/source_beach)
	Line 6197: "cpi" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/simulated/floor/holofloor{icon = 'icons/misc/beach.dmi'; icon_plating = "water"; icon_regular_floor = "water"; icon_state = "water"; name = "Water"},/area/holodeck/source_beach)
	Line 6205: "cpq" = (/turf/unsimulated/wall{tag = "icon-iron5"; icon = 'icons/turf/mineral_walls.dmi'; icon_state = "iron5"},/area)
	Line 6206: "cpr" = (/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/wall{tag = "icon-iron12"; icon = 'icons/turf/mineral_walls.dmi'; icon_state = "iron12"},/area)
	Line 6207: "cps" = (/turf/unsimulated/wall{tag = "icon-iron13"; icon = 'icons/turf/mineral_walls.dmi'; icon_state = "iron13"},/area)
	Line 6208: "cpt" = (/turf/unsimulated/wall{tag = "icon-iron9"; icon = 'icons/turf/mineral_walls.dmi'; icon_state = "iron9"},/area)
	Line 6328: "crJ" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership)
	Line 6337: "crS" = (/turf/unsimulated/wall{icon = 'icons/turf/mineral_walls.dmi'; icon_state = "plasma6"},/area/alien)
	Line 6338: "crT" = (/turf/unsimulated/wall{icon = 'icons/turf/mineral_walls.dmi'; icon_state = "plasma12"},/area/alien)
	Line 6339: "crU" = (/turf/unsimulated/wall{icon = 'icons/turf/mineral_walls.dmi'; icon_state = "plasma14"},/area/alien)
	Line 6340: "crV" = (/turf/unsimulated/wall{icon = 'icons/turf/mineral_walls.dmi'; icon_state = "plasma10"},/area/alien)
	Line 6344: "crZ" = (/turf/unsimulated/wall{icon = 'icons/turf/mineral_walls.dmi'; icon_state = "plasma3"},/area/alien)
	Line 6345: "csa" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor5"},/area/alien)
	Line 6346: "csb" = (/turf/unsimulated/wall{icon = 'icons/turf/mineral_walls.dmi'; icon_state = "plasma1"},/area/alien)
	Line 6350: "csf" = (/obj/item/weapon/paper{info = "Some stuff is missing..."; name = "Insert alien artifacts here."},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor5"},/area/alien)
	Line 6351: "csg" = (/obj/machinery/door/airlock/hatch,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor5"},/area/alien)
	Line 6354: "csj" = (/obj/machinery/computer/pod{id = "syndicate_elite"; name = "Hull Door Control"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
	Line 6355: "csk" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; freerange = 1; frequency = 1213; listening = 0; name = "Syndicate Ops Intercom"; pixel_y = 28; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
	Line 6356: "csl" = (/obj/effect/landmark{name = "Syndicate-Commando"; tag = "Commando"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
	Line 6357: "csm" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
	Line 6358: "csn" = (/obj/machinery/mech_bay_recharge_port,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
	Line 6359: "cso" = (/obj/mecha/combat/marauder/mauler,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership)
	Line 6360: "csp" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership)
	Line 6361: "csq" = (/turf/unsimulated/wall{icon = 'icons/misc/fullscreen.dmi'; icon_state = "title"; layer = 10; name = "Space Station 13"},/area/start)
	Line 6362: "csr" = (/obj/structure/closet/acloset,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor5"},/area/alien)
	Line 6363: "css" = (/turf/unsimulated/wall{icon = 'icons/turf/mineral_walls.dmi'; icon_state = "plasma2"},/area/alien)
	Line 6366: "csv" = (/turf/unsimulated/wall{icon = 'icons/turf/mineral_walls.dmi'; icon_state = "plasma4"},/area/alien)
	Line 6367: "csw" = (/turf/unsimulated/wall{icon = 'icons/turf/mineral_walls.dmi'; icon_state = "plasma13"},/area/alien)
	Line 6368: "csx" = (/turf/unsimulated/wall{icon = 'icons/turf/mineral_walls.dmi'; icon_state = "plasma9"},/area/alien)
	Line 6372: "csB" = (/obj/machinery/door/airlock/glass_security{name = "Airlock"; req_access_txt = "150"},/obj/machinery/door/poddoor{id = "syndicate_elite_mech_room"; name = "Mech Room Door"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
	Line 6373: "csC" = (/obj/structure/stool/bed/alien,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor5"},/area/alien)
	Line 6380: "csJ" = (/turf/unsimulated/wall{icon = 'icons/turf/mineral_walls.dmi'; icon_state = "plasma5"},/area/alien)
	Line 6384: "csN" = (/obj/structure/table,/obj/machinery/microwave,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6385: "csO" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6386: "csP" = (/obj/structure/table,/obj/item/device/flashlight/lamp{pixel_x = 4; pixel_y = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6387: "csQ" = (/obj/machinery/computer/syndicate_station,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6388: "csR" = (/obj/structure/table,/obj/item/stack/sheet/glass{amount = 10},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6389: "csS" = (/obj/structure/computerframe,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6390: "csT" = (/obj/structure/table,/obj/item/weapon/storage/donkpocket_kit{pixel_x = 3; pixel_y = 3},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6391: "csU" = (/obj/structure/stool{pixel_y = 8},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6392: "csV" = (/obj/structure/table,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6393: "csW" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_y = -32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6394: "csX" = (/obj/effect/landmark{name = "Syndicate-Gear-Closet"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6396: "csZ" = (/obj/machinery/door/window{name = "Cockpit"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6398: "ctb" = (/obj/structure/table,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6399: "ctc" = (/obj/machinery/vending/cigarette{pixel_x = 0; pixel_y = 0},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6401: "cte" = (/obj/effect/landmark{name = "Nuclear-Closet"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6402: "ctf" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area)
	Line 6403: "ctg" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom)
	Line 6406: "ctj" = (/obj/structure/stool/bed/chair{dir = 4},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6407: "ctk" = (/obj/structure/table,/obj/item/weapon/gun/energy/ionrifle,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6408: "ctl" = (/obj/machinery/door/poddoor{id = "syndicate"; name = "Outer Airlock"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6414: "ctr" = (/obj/structure/table,/obj/item/device/aicard,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6415: "cts" = (/obj/structure/table,/obj/machinery/computer/pod/old/syndicate{id = "syndicate"; pixel_x = -3; pixel_y = 8},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6423: "ctA" = (/obj/machinery/door/window{dir = 4; icon = 'icons/obj/doors/windoor.dmi'; name = "Equipment Room"; req_access_txt = "0"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6423: "ctA" = (/obj/machinery/door/window{dir = 4; icon = 'icons/obj/doors/windoor.dmi'; name = "Equipment Room"; req_access_txt = "0"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6424: "ctB" = (/obj/machinery/door/airlock/external,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6430: "ctH" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Equipment Room"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6432: "ctJ" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate,/obj/item/clothing/head/helmet/space/syndicate,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6447: "ctY" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6470: "cuv" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/suppy)
	Line 6471: "cuw" = (/obj/machinery/sleeper{icon_state = "sleeper_0-r"; orient = "RIGHT"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
	Line 6472: "cux" = (/obj/effect/landmark{name = "Syndicate-Spawn"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
	Line 6473: "cuy" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
	Line 6474: "cuz" = (/obj/machinery/atmospherics/pipe/simple,/obj/structure/table,/obj/item/stack/medical/bruise_pack,/obj/structure/mirror{pixel_y = 28},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
	Line 6475: "cuA" = (/obj/machinery/atmospherics/pipe/simple,/obj/structure/table,/obj/item/stack/medical/ointment,/obj/structure/mirror{pixel_y = 28},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
	Line 6476: "cuB" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/signaler,/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6477: "cuC" = (/obj/structure/table,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/signaler,/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6478: "cuD" = (/obj/structure/table,/obj/item/weapon/wrench,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/infra,/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6479: "cuE" = (/obj/structure/table,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6480: "cuF" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6487: "cuM" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/living)
	Line 6491: "cuQ" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
	Line 6492: "cuR" = (/obj/machinery/door/window{dir = 4; icon = 'icons/obj/doors/windoor.dmi'; name = "Infirmary"; req_access_txt = "0"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
	Line 6492: "cuR" = (/obj/machinery/door/window{dir = 4; icon = 'icons/obj/doors/windoor.dmi'; name = "Infirmary"; req_access_txt = "0"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
	Line 6493: "cuS" = (/obj/machinery/door/window/westright{name = "Tool Storage"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6494: "cuT" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/syndicate,/obj/effect/landmark{name = "Syndicate-Bomb"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6501: "cva" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Infirmary"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
	Line 6502: "cvb" = (/obj/machinery/door/window{dir = 8; icon = 'icons/obj/doors/windoor.dmi'; name = "Tool Storage"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6502: "cvb" = (/obj/machinery/door/window{dir = 8; icon = 'icons/obj/doors/windoor.dmi'; name = "Tool Storage"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6503: "cvc" = (/obj/structure/table,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
	Line 6504: "cvd" = (/obj/item/weapon/weldingtool,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6505: "cve" = (/obj/machinery/door/window{dir = 1; name = "Secure Storage"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6506: "cvf" = (/obj/item/weapon/crowbar,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6507: "cvg" = (/obj/machinery/atmospherics/pipe/simple{dir = 10},/obj/structure/table,/obj/effect/landmark{name = "Syndicate-Bomb"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6508: "cvh" = (/obj/machinery/door/poddoor{id = "syndicate"; name = "Teleporter"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6522: "cvv" = (/obj/machinery/telecomms/allinone{intercept = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6523: "cvw" = (/obj/effect/landmark{name = "Nuclear-Bomb"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6530: "cvD" = (/obj/structure/closet/crate/medical,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
	Line 6531: "cvE" = (/obj/structure/closet/crate/internals,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
	Line 6532: "cvF" = (/obj/item/weapon/storage/firstaid/regular{pixel_x = 6; pixel_y = -5},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
	Line 6534: "cvH" = (/obj/machinery/teleport/station,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6535: "cvI" = (/obj/machinery/teleport/hub,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
	Line 6811: "cAY" = (/obj/structure/table,/obj/item/assembly/shock_kit{icon = 'icons/obj/assemblies.dmi'},/obj/item/device/assembly/signaler,/obj/item/weapon/handcuffs,/obj/item/weapon/melee/classic_baton,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area/centcom/control)
	Line 6851: "cBM" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/obj{anchored = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"; layer = 1; name = "floor"},/turf/simulated/shuttle/wall{tag = "icon-swall_f9"; icon_state = "swall_f9"; dir = 2},/area/shuttle/escape/centcom)
	Line 6856: "cBR" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/obj{anchored = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"; layer = 1; name = "floor"},/turf/simulated/shuttle/wall{tag = "icon-swall_f5"; icon_state = "swall_f5"; dir = 2},/area/shuttle/escape/centcom)
	Line 6870: "cCf" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/ferry)
	Line 6950: "cDH" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/centcom/holding)
	Line 6951: "cDI" = (/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
	Line 6952: "cDJ" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
	Line 6952: "cDJ" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
	Line 6952: "cDJ" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
	Line 6959: "cDQ" = (/obj/item/weapon/camera_test,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
	Line 6960: "cDR" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm1"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
	Line 6960: "cDR" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm1"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
	Line 6960: "cDR" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm1"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
	Line 6970: "cEb" = (/obj/structure/stool{pixel_y = 8},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
	Line 6993: "cEy" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "crab"; name = "crab"},/turf/unsimulated/floor{icon = 'icons/misc/beach2.dmi'; icon_state = "sandwater"},/area/centcom/holding)
	Line 6993: "cEy" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "crab"; name = "crab"},/turf/unsimulated/floor{icon = 'icons/misc/beach2.dmi'; icon_state = "sandwater"},/area/centcom/holding)
	Line 6994: "cEz" = (/turf/unsimulated/floor{icon = 'icons/misc/beach2.dmi'; icon_state = "sandwater"},/area/centcom/holding)
	Line 7003: "cEI" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/computer/security/telescreen{name = "Entertainment monitor"; desc = "Damn, they better have /tg/thechannel on these things."; icon = 'status_display.dmi'; icon_state = "entertainment"; pixel_y = -30},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
	Line 7005: "cEK" = (/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "water"},/area/centcom/holding)
	Line 7014: "cET" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "water"},/area/centcom/holding)
	Line 7014: "cET" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "water"},/area/centcom/holding)
	Line 7097: "cGy" = (/turf/unsimulated/wall{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7102: "cGD" = (/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7103: "cGE" = (/obj/structure/signpost,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7104: "cGF" = (/obj/structure/closet,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7106: "cGH" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7106: "cGH" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7107: "cGI" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm1"; layer = 10; name = "palm tree"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7107: "cGI" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm1"; layer = 10; name = "palm tree"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7120: "cGV" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7120: "cGV" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7120: "cGV" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7121: "cGW" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7122: "cGX" = (/obj/structure/table,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7123: "cGY" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/chips,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7124: "cGZ" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7125: "cHa" = (/obj/item/weapon/beach_ball,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7126: "cHb" = (/obj/structure/stool/bed/chair,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7127: "cHc" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "crab"; name = "crab"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7127: "cHc" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "crab"; name = "crab"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7128: "cHd" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "crab2"; name = "crab"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7128: "cHd" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "crab2"; name = "crab"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)
	Line 7129: "cHe" = (/turf/unsimulated/wall{icon = 'icons/misc/beach2.dmi'; icon_state = "sandwater"; name = "water"},/area/beach)
	Line 7130: "cHf" = (/turf/unsimulated/floor{icon = 'icons/misc/beach2.dmi'; icon_state = "sandwater"},/area/beach)
	Line 7131: "cHg" = (/turf/unsimulated/wall{icon = 'icons/misc/beach.dmi'; icon_state = "water"},/area/beach)
	Line 7132: "cHh" = (/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "water"},/area/beach)
	Line 7133: "cHi" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "water"},/area/beach)
	Line 7133: "cHi" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "water"},/area/beach)
	Line 7153: "cHC" = (/turf/unsimulated/wall{icon = 'icons/turf/walls.dmi'; icon_state = "rock"; name = "rock"},/area/planet/clown)
	Line 7154: "cHD" = (/turf/unsimulated/wall{icon = 'icons/turf/floors.dmi'; icon_state = "grass3"; name = "grass"},/area/planet/clown)
	Line 7207: "cIE" = (/obj/structure/rack,/obj/item/weapon/kitchenknife{desc = "The unearthly energies that once powered this blade are now dormant"; icon = 'icons/obj/wizard.dmi'; icon_state = "render"; name = "Veil Render"},/turf/unsimulated/floor{dir = 8; icon_state = "chapel"},/area/wizard_station)
	Line 7848: "cUV" = (/obj/machinery/door/window{dir = 2; icon = 'icons/obj/doors/windoor.dmi'; name = "Captain's Quarters"; req_access_txt = "20"},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/bridge)
	Line 7954: "cWX" = (/obj/machinery/door/window{icon = 'icons/obj/doors/windoor.dmi'; dir = 8},/turf/simulated/floor,/area/derelict/arrival)
	Line 7978: "cXv" = (/obj/machinery/door{icon = 'icons/obj/doors/doormorgue.dmi'; name = "Coffin Storage"; req_access_txt = "22"},/turf/simulated/floor{icon_state = "dark"},/area/derelict/medical/chapel)
	Line 8026: "cYr" = (/obj/machinery/mass_driver{dir = 8; icon_state = "mass_driver"; id = "derelict_gun"},/obj/machinery/door/window{icon = 'icons/obj/doors/windoor.dmi'; dir = 4; req_access_txt = "25"},/obj/structure/closet/coffin,/turf/simulated/floor/plating,/area/derelict/medical/chapel)
	Line 8027: "cYs" = (/obj/machinery/door/window{icon = 'icons/obj/doors/windoor.dmi'; dir = 8},/turf/simulated/floor/airless,/area/derelict/medical/chapel)

All of these objects with "icon = " in {} parenthesis need either their own subtype with icon = whatever. Or possibly the two iconfiles merged (as my be the case with airlocks).
Windoors appear to be fine, that was down to mapper-laziness pure and simple.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4564 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-27 12:44:09 +00:00
giacomand@gmail.com a6fa7ad176 -Fixed an AI eye issue where tracking a person from your core won't set your eye.dm
-Tracking now works like it has again. The else if weren't working because the "else if human" check would make them pass all of it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4563 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-27 11:52:21 +00:00
giacomand@gmail.com 62124b989f -Forgot the .dme
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4562 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-27 09:34:18 +00:00
giacomand@gmail.com 2066f54e36 -Added Zelack's alien infection code. Aliens can now tell if someone is impregnated or not.
-Fixed a bug where a Cyborg could drop their module by clicking it on an operating table.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4561 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-27 09:32:09 +00:00
giacomand@gmail.com a1695cb5ff -Added a purchasing log for uplinks. To view it, view the variables of the item with the uplink, navigate to hidden_uplink, click on it and then look at the purchase log variable.
-Sorted the following admin commands/verbs:
Get Key, Get Mob, Jump to Area, Jump to Key, Jump to Mob, Player Panel, Player Panel New, Send Mob, Show Player Panel, Show Traitor Panel
-Because of the recent player poll, electrified grilles will now shock you when you bump into them.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4560 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-27 07:57:49 +00:00
giacomand@gmail.com 678e4a9ffa -Cameras have X-Ray vision again.
-Fixed an issue when pressing jump links as an AI, for air alarms/power alarms.
-Changed the empty room to a Cyborg Station room. It has two recharging stations and a computer frame.
-Moved around some Telecomms machines.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4559 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-27 06:35:10 +00:00
giacomand@gmail.com 0f830d74f4 -Fixed an issue with the AI Eye being moved by shuttles.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4558 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-27 05:19:55 +00:00
johnsonmt88@gmail.com 4406c057c9 Admins now have an 'Animalize' button on mob player panels. This allows an admin to turn a mob into any simple_animal they wish.
Unfortunately I had to disallow certain animal types until they can be fixed.

- Mice: I know, it sucks. Mice were the reason I started making this button to begin with, and it's something that both players and admins are requesting. The problem is that when a mob is turned into a mouse, for some reason it becomes impossible to pull up their player panel. If that gets fixed, I'll allow this button to turn players into mice.

- Space Bears: The bear's AI does not seem to turn off when it is player controlled. Basically the bear will automatically maul nearby players to death and spam emotes regardless of the player's actions or inaction.

- Parrots: They are unfinished. They have no sprite, no movement and are completely untested. They were one of Poly's creations that never ended up getting finished. I like the idea of parrots though, someone should work on them!

- Space Worms: Another unfinished project. Currently they drop new space worms when the player moves and you can end up eating your own tail. Eating your tail drops a new space worm and regenerates your tail. I only spent about 15 seconds as a space worm, so there are probably more issues.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4557 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-27 02:51:07 +00:00
johnsonmt88@gmail.com fbd575f6ef Storage items that pick up all of x item on a tile will no longer pick up items they're not allowed to hold. Fixes issue 862.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4556 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-27 01:04:58 +00:00
petethegoat@gmail.com c14f242b4e Some assembly fixes and tidying up. Plus, improved infrared emitters, with new sprites by Pewtershmitz!
Removed the infra sensor, as it was buggy, and, to be perfectly honest, utterly pointless.
Slightly improved and moved dice code.

Fixes issue 366.
Fixes issue 317.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4555 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 22:44:04 +00:00
Mloc f53b079bb9 Merge pull request #1688 from comma/master
More wedding thingies
2012-08-26 11:05:38 -07:00
Chinsky a2114056f7 More dresses for the dress god!
Also cake closet sprite.
2012-08-26 22:02:40 +04:00
elly1989@rocketmail.com 474294466a Fixes a really stupid mistake where a sleep() was causing the explosion() proc to end after the sleep due to src being null. This meant that the lighting process was turned off but never turned back on. It also meant powernets were deferred permanently :( sorry.
Reduced the Login delay for new_players. It stays because it protects against rapid connect/disconnects sending resources repeatedly, it's just a lot less annoying now.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4554 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 17:50:29 +00:00
johnsonmt88@gmail.com 5eb6bd3b68 Runtime fixes:
runtime error: list index out of bounds
proc name: attack (/obj/item/weapon/gun/projectile/russian/attack)

runtime error: Cannot read null.loc
proc name: Topic (/mob/living/silicon/pai/Topic)

I've also added Pewter to the list of spriters.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4553 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 16:16:07 +00:00
giacomand@gmail.com fe3532cf26 -Requested by Intigracy. Changed Centcom Official energy guns from the classic to the modern one.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4552 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 08:45:48 +00:00
johnsonmt88@gmail.com b9d0ec96b1 Woops, meant to do this last commit... Merged Trubble's changelog message in with Carn and Giacom's as they're on the same date.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4551 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 05:31:25 +00:00
johnsonmt88@gmail.com 2e7b008d27 File structure again.
This cleans up all of the files in code/game/objects/items/weapons. Meaning that the re-organizing part of this endeavour is complete. All that is left is to start dragging down all of the object definitions from code/defines/ into their proper places.

While I'm certain this is all good, I'll apologize now if files or paths end up broken.

Again: Make sure your .dme is up to date! Delete it if necessary to SVN Upload it to the current revision.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4550 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 05:20:27 +00:00
giacomand@gmail.com 08a969b6a2 -AI Eye won't show up in pull, examine or point to popout menus.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4549 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 04:53:29 +00:00
johnsonmt88@gmail.com bfbd177732 Changed the AI's intercoms around a bit.
West = Custom Channel (mic off, speaker off)
North = Common Channel (mic on, speaker on)
East = Private Channel (mic off, speaker on) //No change

The old system had two intercoms on the common channel, one with the mic on/speaker off and one with the mic off/speaker on. Apparently it was too confusing for players to figure out that when they changed the freq for one, they'd have to change the speaker/mic of the other. Fixes issue 837.

I've also fixed a derp with fire extinguishers I made in my last commit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4548 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 04:16:37 +00:00
johnsonmt88@gmail.com 28aabc9810 More file structure stuff!
Cleaned up the files themselves.
Everything in code/game/objects should now be in proper files or places with the exception of the files in the /weapons/ sub-folder.

There's two instances of me not following the exact file structure.
- /obj/item/brain has been moved to a file in mob/living/carbon/brain
- /obj/item/clothing/mask/facehugger has been moved into mob/living/carbon/alien/special
Both of these may not make sense according to the object structure, but they do make sense logically. If it's a problem just move them.

Next up: Finish the files in the weapon folder, then start moving defines down.


My god I hope I havent broken everything.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4547 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 03:32:58 +00:00
johnsonmt88@gmail.com d36387607f More file structure stuff.
- The folders themselves are now finished
- Next I'll go through each file and organize them
- Lastly I'll start pulling the object definitions out of /code/defines/ and put them into their respective files.

**Note to committers**
Make sure the .dme file updates when you update to this revision. If necessary delete the .dme and svn-update.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4546 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 01:20:02 +00:00
johnsonmt88@gmail.com 44cf1c4106 Runtime fix.
runtime error: Cannot execute null.apply effect().
proc name: on hit (/obj/item/projectile/energy/floramut/on_hit)
source file: special.dm,85

Moved ninja gloves into the gloves sub-folder in clothing instead of space suits.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4545 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 00:37:47 +00:00
johnsonmt88@gmail.com 1845d5f919 Full revert of r4543. I'm a horrible person!
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4544 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-25 23:56:42 +00:00
w_johnston@hotmail.com 27f8e5f32c git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4543 316c924e-a436-60f5-8080-3fe189b3f50e 2012-08-25 23:47:25 +00:00
giacomand@gmail.com 95f05fbaea -Changed choking.
You have to stand still while lethally choking someone. It takes time to get into that lethal choke. When you are lethaling choking someone, they are still concious until the lack of oxygen knocks them out.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4542 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-25 21:01:39 +00:00
giacomand@gmail.com 4f343aed08 -Added Pewtershmitz' map icons.
-Added a camera in the R&D hallway to cover a blindspot.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4541 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-25 19:00:53 +00:00