mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-01-06 23:42:56 +00:00
a24b637de561c876eea97cb15cc77d9c75dbbe25
1688 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
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> |
||
|
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> |
||
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 |
||
|
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
|
||
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 |
||
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 |
||
|
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 |
||
|
elly1989@rocketmail.com
|
6e274cd395 |
New lighting, it's essentially just the old DAL system with a queue.
Comments for lighting: Like sd_DAL (what we used to use), it changes the shading overlays of areas by splitting each type of area into sub-areas by using the var/tag variable and moving turfs into the contents list of the correct sub-area. Unlike sd_DAL however it uses a queueing system. Everytime we call a change to opacity or luminosity (through SetOpacity() or SetLuminosity()) we are simply updating variables and scheduling certain lights/turfs for an update. Actual updates are handled periodically by the lighting_controller. This carries additional overheads, however it means that each thing is changed only once per lighting_controller.processing_interval ticks. Allowing for greater control over how much priority we'd like lighting updates to have. It also makes it possible for us to simply delay updates by setting lighting_controller.processing = 0 at say, the start of a large explosion, waiting for it to finish, and then turning it back on with lighting_controller.processing = 1. Unlike our old system there is a hardcoded maximum luminosity. This is to discourage coders using large luminosity values for dynamic lighting, as the cost of lighting grows rapidly at large luminosity levels (especially when changing opacity at runtime) Also, in order for the queueing system to work, each light remembers the effect it casts on each turf. This is going to have larger memory requirements than our previous system but hopefully it's worth the hassle for the greater control we gain. Besides, there are far far worse uses of needless lists in the game, it'd be worth pruning some of them to offset costs. Known Issues/TODO: admin-spawned turfs will have broken lumcounts. Not willing to fix it at this moment mob luminosity will be lower than expected when one of multiple light sources is dropped after exceeding the maximum luminosity Shuttles still do not have support for dynamic lighting (I hope to fix this at some point) No directional lighting support. Fairly easy to add this and the code is ready. When opening airlocks etc, lighting does not always update to account for the change in opacity. Explosions now cause lighting to cease processing temporarily. Moved controller datums to the code/controllers directory. I plan on standardising them. "Master","Ticker","Lighting","Air","Jobs","Sun","Radio","Supply Shuttle","Emergency Shuttle","Configuration","pAI" controller datums can be accessed via the debug controller verb (used to be the debug master controller verb) Supply shuttle now uses a controller datum. Shuttles tend to arrive up to 30 seconds late, this is not a bug. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4537 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
giacomand@gmail.com
|
676079cdba |
-Added more cameras to Telecomms.
-Made telecomms look symmetrical again. -Added the telecommunication blackout event to the RNG. Admins can trigger it and they have an option to alert the crew. -AI can now properly use their multitool. (forgot to uncomment) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4536 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
giacomand@gmail.com
|
683662f3b6 |
-Ported/continued AI Freelook. AIs can now look around like a ghost with the exception that they cannot see what cameras cannot see. Meaning if you're in maintenance, and there's no cameras near you, the AI will not know what you are doing. This also means there's no X-Ray vision cameras anymore. I've added documentation to freelook.dm which explains how the system works, if anyone is interested in adding anything. More information here: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=9675
-I've added some cameras to rooms that should have cameras but were previously depending on other camera's using their X-Ray vision in order to see into a room. -AIs have a multitool in their contents that they can use to interact with the telecommunication machines. -Added "Follow" for observers. Works the same as AI tracking without checking if they can track. -Added a range to how far Cyborgs can interact with machines. This is to stop Cyborgs from interacting with machines through cameras, which could be used to easily disable the AI. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4531 316c924e-a436-60f5-8080-3fe189b3f50e |
||
petethegoat@gmail.com
|
93a5db2cf9 |
Readded the chain of command, by popular demand. Now with a nice sprite and shit!
Added EngTaylor's riot shield bash suggestion! Intimidate those peaceful protesters! FEATURES! git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4529 316c924e-a436-60f5-8080-3fe189b3f50e |
||
Erthilo
|
5a75e606a6 |
Merge branch 'bs12_with_tgport' of git://github.com/caelaislinn/Baystation12 into TGUpdates
Conflicts: baystation12.dme |
||
|
Erthilo
|
5eb7f37396 |
Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts: maps/exodus.dmm |
||
|
Cael_Aislinn
|
4c500f8b1c |
Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport
Conflicts: baystation12.dme code/game/gamemodes/cult/runes.dm code/game/gamemodes/events.dm code/game/machinery/telecomms/broadcaster.dm code/game/machinery/telecomms/machine_interactions.dm code/game/objects/devices/uplinks.dm code/game/objects/weapons.dm code/modules/mining/mine_items.dm html/changelog.html icons/obj/chemical.dmi maps/tgstation.2.0.9.dmm Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au> |
||
|
giacomand@gmail.com
|
42f3efc21a |
I wanted to wait until after the feature freeze to commit this but there have been problems with Telecomms recently and this update that I've been keeping fixes most of the issues. I've tried to remove most features from it but there were some things that I couldn't.
-TCommsat machines no longer use their Z level to check if they can receive the signal or not. Instead, they use listening_level. It defaults to 0 for machines that don't change the value. If it is 0 when the telecomms machine's New() is called it will set itself to it's Z level. -This allows you to manually change the value to other Z levels. I call this an off-site relay. I've added an off-site relay on the satelitte for the station and removed the one in the communications room. -Players can create an offsite relay with two receivers, two broadcasters and, if necessary, a relay. Why two receivers and broadcasters? Otherwise any player can go to the Ruskie/Mining relays and turn them into off-site relays for the station! It would harm the TCommsat's usefulness. Instead, you will have to setup another broadcaster and receiver if you want to do that. Though it may be pointless, if someone sabotages the Commsat they would have destroyed/depowered the other machines there too. -About the option to have an offsite relay, there is only a single Z level that you can lock onto at the moment and that's the station. Gameplay wise, the TCommsat is orbiting the station and if we do get the away missions then it would not make sense for the TCommsat's broadcaster/receiver signal to be able to pickup there. More sense if the Receivers and Broadcasters from there are sent here... maybe. I don't know, seems more fun this way. -Fixed an issue that doesn't let the Engineer Borg (or Borgs with multitools) be able to link machines with their multitool module. -All-In-Ones do not have a Z level restriction. They can pick up ALL signals and send ALL signals (to Z levels 1-10) -Fixed an issue with the player being unable to remove frequencies from the filter. -Added support for additional interaction options for certain machines. To use it, create a new Options_Menu() and Options_Topic(href, href_list) for your machine. -Added EMP_ACT to Telecommunication Machines. I've also added an event called "telecommunications_blackout()", it will loop through all telecomm machines, in telecomms_list, and EMP_ACT them. The EMP will last 2 minutes. Currently only admins can use it. -Fixed issue 831 -Changed the map. The station no longer has the station relay, it is now on the Satellite. There's an empty room now, it should be used for something after the feature freeze. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4522 316c924e-a436-60f5-8080-3fe189b3f50e |
||
CubeJackal
|
27508cb914 | Added maintenance tunnels to Sec | ||
|
petethegoat@gmail.com
|
d6f2556945 |
First part of a fix for issue 818.
Removed some pointless, unused objects. (i'm looking at you, rubber chicken without a sprite) Added a few new "features"- lighting cigs with igniters, and toggle-able bedsheets. Slightly improved the cow gib sprite because if I don't commit it now I'll revert it. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4517 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
Cael_Aislinn
|
c314b5f42b |
Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12
Conflicts: README.txt SQL/tgstation_schema.sql baystation12.dme code/ATMOSPHERICS/components/unary/vent_pump.dm code/ATMOSPHERICS/pipes.dm code/FEA/FEA_airgroup.dm code/FEA/FEA_fire.dm code/FEA/FEA_gas_mixture.dm code/FEA/FEA_turf_tile.dm code/TriDimension/Pipes.dm code/WorkInProgress/buildmode.dm code/WorkInProgress/organs/organs.dm code/WorkInProgress/virus2/Disease2/analyser.dm code/WorkInProgress/virus2/Disease2/biohazard destroyer.dm code/WorkInProgress/virus2/Disease2/cureimplanter.dm code/WorkInProgress/virus2/Disease2/diseasesplicer.dm code/WorkInProgress/virus2/Disease2/dishincubator.dm code/WorkInProgress/virus2/Disease2/isolator.dm code/WorkInProgress/virus2/Disease2/monkeydispensor.dm code/WorkInProgress/virus2/analyser.dm code/WorkInProgress/virus2/antibodies.dm code/WorkInProgress/virus2/base.dm code/WorkInProgress/virus2/biohazard destroyer.dm code/WorkInProgress/virus2/cureimplanter.dm code/WorkInProgress/virus2/curer.dm code/WorkInProgress/virus2/diseasesplicer.dm code/WorkInProgress/virus2/dishincubator.dm code/WorkInProgress/virus2/isolator.dm code/WorkInProgress/virus2/monkeydispensor.dm code/datums/ai_laws.dm code/datums/configuration.dm code/datums/datumvars.dm code/datums/diseases/alien_embryo.dm code/datums/diseases/appendicitis.dm code/datums/diseases/robotic_transformation.dm code/datums/diseases/xeno_transformation.dm code/datums/helper_datums/getrev.dm code/datums/helper_datums/teleport.dm code/datums/helper_datums/tension.dm code/datums/mind.dm code/datums/mixed.dm code/datums/shuttle_controller.dm code/datums/spell.dm code/datums/spells/ethereal_jaunt.dm code/datums/spells/genetic.dm code/datums/spells/wizard.dm code/defines/area/Space Station 13 areas.dm code/defines/atom.dm code/defines/global.dm code/defines/mob/dead/observer.dm code/defines/mob/living/carbon/alien.dm code/defines/mob/living/carbon/alien_humanoid.dm code/defines/mob/living/carbon/carbon.dm code/defines/mob/living/carbon/metroid.dm code/defines/mob/living/carbon/monkey.dm code/defines/mob/living/living.dm code/defines/mob/living/silicon/ai.dm code/defines/mob/living/silicon/robot.dm code/defines/obj.dm code/defines/obj/closet.dm code/defines/obj/clothing.dm code/defines/obj/clothing/costume.dm code/defines/obj/computer.dm code/defines/obj/costume.dm code/defines/obj/decal.dm code/defines/obj/door.dm code/defines/obj/hydro.dm code/defines/obj/machinery.dm code/defines/obj/storage.dm code/defines/obj/supplypacks.dm code/defines/obj/toy.dm code/defines/obj/vending.dm code/defines/obj/weapon.dm code/defines/procs/AStar.dm code/defines/procs/command_name.dm code/defines/procs/dbcore.dm code/defines/procs/forum_activation.dm code/defines/procs/gamehelpers.dm code/defines/procs/helpers.dm code/defines/procs/icon_procs.dm code/defines/procs/station_name.dm code/defines/procs/statistics.dm code/defines/turf.dm code/game/algorithm.dm code/game/area/areas.dm code/game/asteroid/artifacts.dm code/game/atom_procs.dm code/game/cellautomata.dm code/game/dna.dm code/game/events/EventProcs/clang.dm code/game/events/EventProcs/dust.dm code/game/events/EventProcs/ninja_abilities.dm code/game/events/EventProcs/ninja_equipment.dm code/game/events/EventProcs/space_ninja.dm code/game/events/EventProcs/spacevines.dm code/game/gamemodes/blob/blob.dm code/game/gamemodes/blob/blob_finish.dm code/game/gamemodes/blob/blob_report.dm code/game/gamemodes/blob/theblob.dm code/game/gamemodes/changeling/changeling.dm code/game/gamemodes/changeling/changeling_powers.dm code/game/gamemodes/changeling/modularchangling.dm code/game/gamemodes/changeling/traitor_chan.dm code/game/gamemodes/cult/cult.dm code/game/gamemodes/cult/cult_items.dm code/game/gamemodes/cult/cult_structures.dm code/game/gamemodes/events.dm code/game/gamemodes/events/black_hole.dm code/game/gamemodes/events/miniblob.dm code/game/gamemodes/factions.dm code/game/gamemodes/game_mode.dm code/game/gamemodes/gameticker.dm code/game/gamemodes/malfunction/malfunction.dm code/game/gamemodes/meteor/meteor.dm code/game/gamemodes/meteor/meteors.dm code/game/gamemodes/nuclear/nuclear.dm code/game/gamemodes/nuclear/nuclearbomb.dm code/game/gamemodes/nuclear/pinpointer.dm code/game/gamemodes/objective.dm code/game/gamemodes/revolution/revolution.dm code/game/gamemodes/sandbox/h_sandbox.dm code/game/gamemodes/sandbox/sandbox.dm code/game/gamemodes/setupgame.dm code/game/gamemodes/traitor/traitor.dm code/game/gamemodes/wizard/rightandwrong.dm code/game/gamemodes/wizard/soulstone.dm code/game/gamemodes/wizard/spellbook.dm code/game/gamemodes/wizard/spells.dm code/game/gamemodes/wizard/veilrender.dm code/game/gamemodes/wizard/wizard.dm code/game/hud.dm code/game/jobs/access.dm code/game/jobs/job/captain.dm code/game/jobs/job/civilian.dm code/game/jobs/job/civilian_chaplain.dm code/game/jobs/job/engineering.dm code/game/jobs/job/job.dm code/game/jobs/job/medical.dm code/game/jobs/job/science.dm code/game/jobs/job/security.dm code/game/jobs/job/silicon.dm code/game/jobs/job_controller.dm code/game/jobs/jobs.dm code/game/machinery/Beacon.dm code/game/machinery/OpTable.dm code/game/machinery/Sleeper.dm code/game/machinery/alarm.dm code/game/machinery/atmo_control.dm code/game/machinery/atmoalter/area_atmos_computer.dm code/game/machinery/autolathe.dm code/game/machinery/biogenerator.dm code/game/machinery/bots/bots.dm code/game/machinery/bots/cleanbot.dm code/game/machinery/bots/ed209bot.dm code/game/machinery/bots/floorbot.dm code/game/machinery/bots/medbot.dm code/game/machinery/bots/mulebot.dm code/game/machinery/camera.dm code/game/machinery/cell_charger.dm code/game/machinery/cloning.dm code/game/machinery/computer/HolodeckControl.dm code/game/machinery/computer/Operating.dm code/game/machinery/computer/ai_core.dm code/game/machinery/computer/arcade.dm code/game/machinery/computer/atmos_alert.dm code/game/machinery/computer/buildandrepair.dm code/game/machinery/computer/card.dm code/game/machinery/computer/cloning.dm code/game/machinery/computer/communications.dm code/game/machinery/computer/computer.dm code/game/machinery/computer/crew.dm code/game/machinery/computer/hologram.dm code/game/machinery/computer/law.dm code/game/machinery/computer/medical.dm code/game/machinery/computer/message.dm code/game/machinery/computer/pod.dm code/game/machinery/computer/power.dm code/game/machinery/computer/prisoner.dm code/game/machinery/computer/robot.dm code/game/machinery/computer/security.dm code/game/machinery/computer/shuttle.dm code/game/machinery/constructable_frame.dm code/game/machinery/deployable.dm code/game/machinery/door_control.dm code/game/machinery/doors/airlock.dm code/game/machinery/doors/airlock_electronics.dm code/game/machinery/doors/brigdoors.dm code/game/machinery/doors/door.dm code/game/machinery/doors/firedoor.dm code/game/machinery/doors/poddoor.dm code/game/machinery/doors/unpowered.dm code/game/machinery/doors/windowdoor.dm code/game/machinery/flasher.dm code/game/machinery/gateway.dm code/game/machinery/hologram.dm code/game/machinery/hydroponics.dm code/game/machinery/kitchen/gibber.dm code/game/machinery/morgue.dm code/game/machinery/newscaster.dm code/game/machinery/pipe/construction.dm code/game/machinery/pipe/pipe_dispenser.dm code/game/machinery/portable_turret.dm code/game/machinery/recharger.dm code/game/machinery/rechargestation.dm code/game/machinery/requests_console.dm code/game/machinery/shieldgen.dm code/game/machinery/spaceheater.dm code/game/machinery/suit_storage_unit.dm code/game/machinery/syndicatebeacon.dm code/game/machinery/telecomms/broadcaster.dm code/game/machinery/telecomms/logbrowser.dm code/game/machinery/telecomms/machine_interactions.dm code/game/machinery/telecomms/telemonitor.dm code/game/machinery/telecomms/traffic_control.dm code/game/machinery/teleporter.dm code/game/machinery/turrets.dm code/game/machinery/vending.dm code/game/magic/cultist/ritual.dm code/game/magic/cultist/runes.dm code/game/magic/library.dm code/game/magic/musician.dm code/game/master_controller.dm code/game/mecha/combat/combat.dm code/game/mecha/combat/gygax.dm code/game/mecha/equipment/mecha_equipment.dm code/game/mecha/equipment/tools/tools.dm code/game/mecha/equipment/weapons/weapons.dm code/game/mecha/mech_fabricator.dm code/game/mecha/mecha.dm code/game/mecha/mecha_construction_paths.dm code/game/mecha/mecha_wreckage.dm code/game/mecha/medical/medical.dm code/game/mecha/medical/odysseus.dm code/game/mecha/working/ripley.dm code/game/objects/alien/facehugger.dm code/game/objects/alien/resin.dm code/game/objects/bodybag.dm code/game/objects/closets.dm code/game/objects/closets/emergency.dm code/game/objects/closets/extinguisher.dm code/game/objects/closets/fireaxe.dm code/game/objects/closets/firecloset.dm code/game/objects/closets/fitnesscloset.dm code/game/objects/closets/janitor.dm code/game/objects/closets/kitchen.dm code/game/objects/closets/nuclear.dm code/game/objects/closets/secure/bar.dm code/game/objects/closets/secure/cargo.dm code/game/objects/closets/secure/engineering.dm code/game/objects/closets/secure/hydroponics.dm code/game/objects/closets/secure/medical.dm code/game/objects/closets/secure/personal.dm code/game/objects/closets/secure/scientist.dm code/game/objects/closets/secure/secure_closets.dm code/game/objects/closets/secure/security.dm code/game/objects/closets/syndicate.dm code/game/objects/closets/wardrobe.dm code/game/objects/contraband.dm code/game/objects/crates.dm code/game/objects/devices/PDA/PDA.dm code/game/objects/devices/PDA/cart.dm code/game/objects/devices/PDA/chatroom.dm code/game/objects/devices/aicard.dm code/game/objects/devices/flash.dm code/game/objects/devices/flashlight.dm code/game/objects/devices/paicard.dm code/game/objects/devices/scanners.dm code/game/objects/devices/taperecorder.dm code/game/objects/devices/traitordevices.dm code/game/objects/door_assembly.dm code/game/objects/effect_system.dm code/game/objects/electricchair.dm code/game/objects/explosion.dm code/game/objects/gibs.dm code/game/objects/grille.dm code/game/objects/items.dm code/game/objects/items/blueprints.dm code/game/objects/items/candle.dm code/game/objects/items/clothing.dm code/game/objects/items/food.dm code/game/objects/items/helper_procs.dm code/game/objects/items/item.dm code/game/objects/items/robot_items.dm code/game/objects/items/robot_parts.dm code/game/objects/items/tk_grab.dm code/game/objects/items/weapons/AI_modules.dm code/game/objects/items/weapons/RCD.dm code/game/objects/items/weapons/RSF.dm code/game/objects/items/weapons/cameras.dm code/game/objects/items/weapons/cards_ids.dm code/game/objects/items/weapons/cigs_lighters.dm code/game/objects/items/weapons/clown_items.dm code/game/objects/items/weapons/dna_injector.dm code/game/objects/items/weapons/explosives.dm code/game/objects/items/weapons/flamethrower.dm code/game/objects/items/weapons/grenades.dm code/game/objects/items/weapons/hand_lablers.dm code/game/objects/items/weapons/hydroponics.dm code/game/objects/items/weapons/implants/implant.dm code/game/objects/items/weapons/implants/implantcase.dm code/game/objects/items/weapons/implants/implantchair.dm code/game/objects/items/weapons/implants/implanter.dm code/game/objects/items/weapons/implants/implantfreedom.dm code/game/objects/items/weapons/implants/implantnanoaug.dm code/game/objects/items/weapons/implants/implantpad.dm code/game/objects/items/weapons/kitchen.dm code/game/objects/items/weapons/manuals.dm code/game/objects/items/weapons/medical.dm code/game/objects/items/weapons/mops_cleaners.dm code/game/objects/items/weapons/papers_bins.dm code/game/objects/items/weapons/stunbaton.dm code/game/objects/items/weapons/surgery_tools.dm code/game/objects/items/weapons/swords_axes_etc.dm code/game/objects/items/weapons/table_rack_parts.dm code/game/objects/items/weapons/tools.dm code/game/objects/items/weapons/twohanded.dm code/game/objects/items/weapons/wrappingpaper.dm code/game/objects/mineral_doors.dm code/game/objects/radio/beacon.dm code/game/objects/radio/electropack.dm code/game/objects/radio/encryptionkey.dm code/game/objects/radio/headset.dm code/game/objects/radio/intercom.dm code/game/objects/radio/radio.dm code/game/objects/secstorage/sbriefcase.dm code/game/objects/secstorage/ssafe.dm code/game/objects/stacks/glass.dm code/game/objects/stacks/metal.dm code/game/objects/stacks/stack.dm code/game/objects/stacks/wood.dm code/game/objects/stool.dm code/game/objects/storage/backpack.dm code/game/objects/storage/belt.dm code/game/objects/storage/bible.dm code/game/objects/storage/briefcase.dm code/game/objects/storage/lockbox.dm code/game/objects/storage/storage.dm code/game/objects/storage/uplink_kits.dm code/game/objects/structures.dm code/game/objects/tables_racks.dm code/game/objects/tank.dm code/game/objects/tanks/emergency.dm code/game/objects/tanks/jetpack.dm code/game/objects/toys.dm code/game/objects/transfer_valve.dm code/game/objects/uplinks.dm code/game/objects/watercloset.dm code/game/objects/weapons.dm code/game/objects/windoor_assembly.dm code/game/objects/window.dm code/game/prisonshuttle.dm code/game/smoothwall.dm code/game/sound.dm code/game/step_triggers.dm code/game/structure/structure.dm code/game/supplyshuttle.dm code/game/throwing.dm code/game/topic.dm code/game/turf.dm code/game/vehicles/airtight/airtight.dm code/game/vehicles/airtight/land.dm code/game/vehicles/airtight/space.dm code/game/vehicles/vehicle.dm code/game/verbs/ooc.dm code/game/verbs/sound.dm code/game/verbs/suicide.dm code/game/verbs/who.dm code/game/vote.dm code/modules/admin/IsBanned.dm code/modules/admin/NewBan.dm code/modules/admin/admin.dm code/modules/admin/admin_investigate.dm code/modules/admin/admin_memo.dm code/modules/admin/admin_verbs.dm code/modules/admin/banjob.dm code/modules/admin/create_mob.dm code/modules/admin/create_object.dm code/modules/admin/create_turf.dm code/modules/admin/player_panel.dm code/modules/admin/verbs/MC.dm code/modules/admin/verbs/adminhelp.dm code/modules/admin/verbs/adminjump.dm code/modules/admin/verbs/adminpm.dm code/modules/admin/verbs/adminsay.dm code/modules/admin/verbs/atmosdebug.dm code/modules/admin/verbs/cinematic.dm code/modules/admin/verbs/deadsay.dm code/modules/admin/verbs/debug.dm code/modules/admin/verbs/diagnostics.dm code/modules/admin/verbs/getlogs.dm code/modules/admin/verbs/mapping.dm code/modules/admin/verbs/massmodvar.dm code/modules/admin/verbs/modifyvariables.dm code/modules/admin/verbs/onlyone.dm code/modules/admin/verbs/playsound.dm code/modules/admin/verbs/possess.dm code/modules/admin/verbs/pray.dm code/modules/admin/verbs/randomverbs.dm code/modules/admin/verbs/striketeam.dm code/modules/admin/verbs/striketeam_syndicate.dm code/modules/assembly/assembly.dm code/modules/assembly/signaler.dm code/modules/chemical/Chemistry-Machinery.dm code/modules/chemical/Chemistry-Tools.dm code/modules/client/client defines.dm code/modules/client/client procs.dm code/modules/clothing/costume.dm code/modules/clothing/gimmick.dm code/modules/clothing/glasses.dm code/modules/clothing/glasses/glasses.dm code/modules/clothing/glasses/hud.dm code/modules/clothing/gloves.dm code/modules/clothing/head/hardhat.dm code/modules/clothing/jumpsuit.dm code/modules/clothing/mask.dm code/modules/clothing/shoes.dm code/modules/clothing/spacesuit.dm code/modules/clothing/spacesuits/captain.dm code/modules/clothing/spacesuits/miscellaneous.dm code/modules/clothing/spacesuits/ninja.dm code/modules/clothing/spacesuits/rig.dm code/modules/clothing/spacesuits/syndi.dm code/modules/clothing/spacesuits/void.dm code/modules/clothing/suit.dm code/modules/clothing/suits/armor.dm code/modules/clothing/suits/bio.dm code/modules/clothing/suits/bomb.dm code/modules/clothing/suits/detective.dm code/modules/clothing/suits/fire.dm code/modules/clothing/suits/heavy.dm code/modules/clothing/suits/hos.dm code/modules/clothing/suits/labcoat.dm code/modules/clothing/suits/miscellaneous.dm code/modules/clothing/suits/wiz_robe.dm code/modules/clothing/uniforms/lawyer.dm code/modules/critters/critter.dm code/modules/critters/critter_AI.dm code/modules/critters/critters.dm code/modules/critters/hivebots/hivebot.dm code/modules/flufftext/Dreaming.dm code/modules/flufftext/Hallucination.dm code/modules/flufftext/TextFilters.dm code/modules/food/food.dm code/modules/food/meat.dm code/modules/food/recipes_microwave.dm code/modules/maps/SwapMaps.dm code/modules/maps/dmm_suite.dm code/modules/maps/fromdmp.dm code/modules/maps/randomZlevel.dm code/modules/maps/reader.dm code/modules/maps/writer.dm code/modules/mining/machine_processing.dm code/modules/mining/machine_stacking.dm code/modules/mining/machine_unloading.dm code/modules/mining/mine_items.dm code/modules/mining/mine_turfs.dm code/modules/mining/mint.dm code/modules/mining/ores_materials_coins.dm code/modules/mining/satchel_ore_boxdm.dm code/modules/mob/dead/death.dm code/modules/mob/dead/observer/observer.dm code/modules/mob/death.dm code/modules/mob/living/blob/blob.dm code/modules/mob/living/carbon/alien/alien.dm code/modules/mob/living/carbon/alien/death.dm code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm code/modules/mob/living/carbon/alien/humanoid/death.dm code/modules/mob/living/carbon/alien/humanoid/hud.dm code/modules/mob/living/carbon/alien/humanoid/humanoid.dm code/modules/mob/living/carbon/alien/humanoid/life.dm code/modules/mob/living/carbon/alien/humanoid/login.dm code/modules/mob/living/carbon/alien/humanoid/queen.dm code/modules/mob/living/carbon/alien/larva/death.dm code/modules/mob/living/carbon/alien/larva/hud.dm code/modules/mob/living/carbon/alien/larva/larva.dm code/modules/mob/living/carbon/alien/larva/life.dm code/modules/mob/living/carbon/alien/larva/login.dm code/modules/mob/living/carbon/alien/larva/powers.dm code/modules/mob/living/carbon/alien/special/_main.dm code/modules/mob/living/carbon/alien/special/snakeman.dm code/modules/mob/living/carbon/brain/MMI.dm code/modules/mob/living/carbon/brain/brain.dm code/modules/mob/living/carbon/brain/death.dm code/modules/mob/living/carbon/brain/hud.dm code/modules/mob/living/carbon/brain/life.dm code/modules/mob/living/carbon/brain/say.dm code/modules/mob/living/carbon/carbon.dm code/modules/mob/living/carbon/human/death.dm code/modules/mob/living/carbon/human/emote.dm code/modules/mob/living/carbon/human/examine.dm code/modules/mob/living/carbon/human/hud.dm code/modules/mob/living/carbon/human/human.dm code/modules/mob/living/carbon/human/human_attackalien.dm code/modules/mob/living/carbon/human/human_attackhand.dm code/modules/mob/living/carbon/human/human_damage.dm code/modules/mob/living/carbon/human/human_defense.dm code/modules/mob/living/carbon/human/life.dm code/modules/mob/living/carbon/human/login.dm code/modules/mob/living/carbon/human/say.dm code/modules/mob/living/carbon/human/whisper.dm code/modules/mob/living/carbon/metroid/death.dm code/modules/mob/living/carbon/metroid/examine.dm code/modules/mob/living/carbon/metroid/life.dm code/modules/mob/living/carbon/metroid/login.dm code/modules/mob/living/carbon/metroid/metroid.dm code/modules/mob/living/carbon/metroid/powers.dm code/modules/mob/living/carbon/monkey/death.dm code/modules/mob/living/carbon/monkey/examine.dm code/modules/mob/living/carbon/monkey/hud.dm code/modules/mob/living/carbon/monkey/life.dm code/modules/mob/living/carbon/monkey/login.dm code/modules/mob/living/carbon/monkey/monkey.dm code/modules/mob/living/carbon/monkey/powers.dm code/modules/mob/living/damage_procs.dm code/modules/mob/living/living.dm code/modules/mob/living/living_defense.dm code/modules/mob/living/login.dm code/modules/mob/living/say.dm code/modules/mob/living/silicon/ai/ai.dm code/modules/mob/living/silicon/ai/death.dm code/modules/mob/living/silicon/ai/examine.dm code/modules/mob/living/silicon/ai/life.dm code/modules/mob/living/silicon/ai/login.dm code/modules/mob/living/silicon/ai/move.dm code/modules/mob/living/silicon/death.dm code/modules/mob/living/silicon/decoy/death.dm code/modules/mob/living/silicon/pai/death.dm code/modules/mob/living/silicon/pai/hud.dm code/modules/mob/living/silicon/pai/pai.dm code/modules/mob/living/silicon/pai/recruit.dm code/modules/mob/living/silicon/pai/software.dm code/modules/mob/living/silicon/robot/death.dm code/modules/mob/living/silicon/robot/emote.dm code/modules/mob/living/silicon/robot/examine.dm code/modules/mob/living/silicon/robot/hud.dm code/modules/mob/living/silicon/robot/life.dm code/modules/mob/living/silicon/robot/login.dm code/modules/mob/living/silicon/robot/robot.dm code/modules/mob/living/silicon/robot/robot_modules.dm code/modules/mob/living/silicon/robot/say.dm code/modules/mob/living/silicon/robot/wires.dm code/modules/mob/living/silicon/say.dm code/modules/mob/living/simple_animal/life.dm code/modules/mob/login.dm code/modules/mob/logout.dm code/modules/mob/mob.dm code/modules/mob/mob_cleanup.dm code/modules/mob/mob_defines.dm code/modules/mob/mob_grab.dm code/modules/mob/mob_helpers.dm code/modules/mob/mob_movement.dm code/modules/mob/mob_transformation_simple.dm code/modules/mob/new_player/login.dm code/modules/mob/new_player/new_player.dm code/modules/mob/new_player/preferences.dm code/modules/mob/new_player/preferences_setup.dm code/modules/mob/new_player/savefile.dm code/modules/mob/new_player/sprite_accessories.dm code/modules/mob/organ/organ.dm code/modules/mob/organ/organ_external.dm code/modules/mob/organ/pain.dm code/modules/mob/say.dm code/modules/mob/screen.dm code/modules/mob/simple_animal/crab.dm code/modules/mob/transform_procs.dm code/modules/paperwork/clipboard.dm code/modules/paperwork/filingcabinet.dm code/modules/paperwork/folders.dm code/modules/paperwork/handlabeler.dm code/modules/paperwork/paper.dm code/modules/paperwork/paperbin.dm code/modules/paperwork/pen.dm code/modules/paperwork/photocopier.dm code/modules/paperwork/stamps.dm code/modules/power/antimatter/computer.dm code/modules/power/antimatter/engine.dm code/modules/power/antimatter/fuel.dm code/modules/power/apc.dm code/modules/power/cable.dm code/modules/power/cable_heavyduty.dm code/modules/power/cell.dm code/modules/power/generator.dm code/modules/power/generator_type2.dm code/modules/power/gravitygenerator.dm code/modules/power/lighting.dm code/modules/power/port_gen.dm code/modules/power/sd_DynamicAreaLighting.dm code/modules/power/singularity/collector.dm code/modules/power/singularity/containment_field.dm code/modules/power/singularity/emitter.dm code/modules/power/singularity/field_generator.dm code/modules/power/singularity/generator.dm code/modules/power/singularity/investigate.dm code/modules/power/singularity/particle_accelerator/particle.dm code/modules/power/singularity/particle_accelerator/particle_accelerator.dm code/modules/power/singularity/particle_accelerator/particle_chamber.dm code/modules/power/singularity/particle_accelerator/particle_control.dm code/modules/power/singularity/particle_accelerator/particle_emitter.dm code/modules/power/singularity/particle_accelerator/particle_power.dm code/modules/power/singularity/singularity.dm code/modules/power/smes.dm code/modules/power/solar.dm code/modules/power/switch.dm code/modules/power/turbine.dm code/modules/projectiles/ammunition.dm code/modules/projectiles/gun.dm code/modules/projectiles/guns/energy.dm code/modules/projectiles/guns/energy/laser.dm code/modules/projectiles/guns/energy/nuclear.dm code/modules/projectiles/guns/energy/pulse.dm code/modules/projectiles/guns/energy/special.dm code/modules/projectiles/guns/energy/stun.dm code/modules/projectiles/guns/projectile.dm code/modules/projectiles/guns/projectile/pistol.dm code/modules/projectiles/guns/projectile/revolver.dm code/modules/projectiles/guns/projectile/shotgun.dm code/modules/projectiles/projectile.dm code/modules/projectiles/projectile/beams.dm code/modules/projectiles/projectile/bullets.dm code/modules/projectiles/projectile/change.dm code/modules/projectiles/projectile/special.dm code/modules/reagents/Chemistry-Holder.dm code/modules/reagents/Chemistry-Reagents.dm code/modules/reagents/Chemistry-Recipes.dm code/modules/recycling/conveyor2.dm code/modules/recycling/disposal-construction.dm code/modules/recycling/disposal.dm code/modules/recycling/sortingmachinery.dm code/modules/research/designs.dm code/modules/research/destructive_analyzer.dm code/modules/research/message_server.dm code/modules/research/protolathe.dm code/modules/research/rdconsole.dm code/modules/research/rdmachines.dm code/modules/research/research.dm code/modules/research/server.dm code/modules/scripting/AST/Operators/Binary Operators.dm code/modules/scripting/Implementations/Telecomms.dm code/modules/scripting/Parser/Keywords.dm code/modules/scripting/Scanner/Tokens.dm code/modules/scripting/stack.dm code/modules/security levels/keycard authentication.dm code/modules/security levels/security levels.dm code/setup.dm code/stylesheet.dm code/unused/AI_Visibility.dm code/unused/Ultralight.dm code/unused/airtunnel.dm code/unused/beast/bodypart.dm code/unused/conveyor.dm code/unused/disease2/analyser.dm code/unused/disease2/base.dm code/unused/disease2/biohazard destroyer.dm code/unused/disease2/cureimplanter.dm code/unused/disease2/curer.dm code/unused/disease2/diseasesplicer.dm code/unused/disease2/dishincubator.dm code/unused/disease2/isolator.dm code/unused/disease2/monkeydispensor.dm code/unused/dna.dm code/unused/gamemodes/deathmatch.dm code/unused/jobs.dm code/unused/mining/datum_processing_recipe.dm code/unused/mining/spaceship_builder_unused.dm code/unused/new_year.dm code/unused/spacecraft/manufacturing.dm code/unused/spacecraft/shipcore.dm config/README feedback.txt config/admins.txt config/config.txt config/rules.html data/mode.txt html/add-to-changelog.html html/archivedchangelog.html html/changelog.css html/changelog.html html/changelog.js icons/effects/blood.dmi icons/effects/genetics.dmi icons/misc/fullscreen.dmi icons/mob/AI.dmi icons/mob/alien.dmi icons/mob/animal.dmi icons/mob/back.dmi icons/mob/belt.dmi icons/mob/blob.dmi icons/mob/critter.dmi icons/mob/dam_human.dmi icons/mob/eyes.dmi icons/mob/feet.dmi icons/mob/hands.dmi icons/mob/head.dmi icons/mob/human.dmi icons/mob/human_face.dmi icons/mob/items_lefthand.dmi icons/mob/items_righthand.dmi icons/mob/livestock.dmi icons/mob/mask.dmi icons/mob/mecha.dmi icons/mob/mob.dmi icons/mob/monkey.dmi icons/mob/robots.dmi icons/mob/screen1.dmi icons/mob/screen1_Midnight.dmi icons/mob/screen1_Orange.dmi icons/mob/screen1_alien.dmi icons/mob/screen1_old.dmi icons/mob/suit.dmi icons/mob/uniform.dmi icons/mob/zone_sel.dmi icons/obj/Cryogenic2.dmi icons/obj/aibots.dmi icons/obj/ammo.dmi icons/obj/atmos.dmi icons/obj/bureaucracy.dmi icons/obj/card.dmi icons/obj/cigarettes.dmi icons/obj/closet.dmi icons/obj/clothing/glasses.dmi icons/obj/clothing/gloves.dmi icons/obj/clothing/hats.dmi icons/obj/clothing/masks.dmi icons/obj/clothing/shoes.dmi icons/obj/clothing/suits.dmi icons/obj/clothing/uniforms.dmi icons/obj/computer.dmi icons/obj/contraband.dmi icons/obj/decals.dmi icons/obj/device.dmi icons/obj/doors/DoorHazard.dmi icons/obj/doors/door_assembly.dmi icons/obj/drinks.dmi icons/obj/engine.dmi icons/obj/food.dmi icons/obj/grenade.dmi icons/obj/gun.dmi icons/obj/harvest.dmi icons/obj/hydroponics.dmi icons/obj/items.dmi icons/obj/janitor.dmi icons/obj/library.dmi icons/obj/lighting.dmi icons/obj/machines/field_generator.dmi icons/obj/machines/gateway.dmi icons/obj/machines/mining_machines.dmi icons/obj/machines/particle_accelerator.dmi icons/obj/meter.dmi icons/obj/mining.dmi icons/obj/objects.dmi icons/obj/paper.dmi icons/obj/pda.dmi icons/obj/pipes/disposal.dmi icons/obj/plants.dmi icons/obj/power.dmi icons/obj/projectiles.dmi icons/obj/robotics.dmi icons/obj/seeds.dmi icons/obj/singularity.dmi icons/obj/stationobjs.dmi icons/obj/stock_parts.dmi icons/obj/storage.dmi icons/obj/structures.dmi icons/obj/surgery.dmi icons/obj/syringe.dmi icons/obj/tank.dmi icons/obj/terminals.dmi icons/obj/toy.dmi icons/obj/vending.dmi icons/obj/watercloset.dmi icons/obj/weapons.dmi icons/obj/wizard.dmi icons/turf/areas.dmi icons/turf/floors.dmi icons/turf/walls.dmi interface/interface.dm interface/skin.dmf maps/Antiqua.dmm maps/RandomZLevels/assistantChamber.dmm maps/RandomZLevels/fileList.txt maps/tgstation.2.0.9.dmm sound/AI/animes.ogg sound/AI/newroundsexy.ogg sound/AI/newroundsexy2.ogg sound/effects/adminhelp.ogg tools/UnstandardnessTestForDM/UnstandardnessTestForDM.sln tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.Designer.cs tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.cs tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.resx tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Program.cs tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/AssemblyInfo.cs tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Resources.Designer.cs tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Resources.resx tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Settings.Designer.cs tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Settings.settings tools/UnstandardnessTestForDM/UnstandardnessTestForDM/UnstandardnessTestForDM.csproj tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.vshost.exe.manifest tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.csproj.FileListAbsolute.txt tools/expand_filedir_paths.py tools/readme.txt Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au> |
||
|
elly1989@rocketmail.com
|
4073ac9b00 |
Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.
All credits to the author for this handy little script. I Committed the modified python script to tool directory. Although it needs to be in the root folder of your repo to work. To notice the improved compile times, in dreammaker go to Build > Preferences > and untick "automatically set file_dir for subfolders" If this commit inteferes with any large projects just revert it, do your thing, then rerun the script. Easy-peasy. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4488 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
CubeJackal
|
f68e9206e4 | Added basic atmos things to sec lobby + fore primary hallway | ||
|
petethegoat@gmail.com
|
de4f662df1 |
Fixed a stray disposal pipe.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4480 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
CubeJackal
|
53dd6b7a3e | Removed 'fore maint' area from space next to detective's office | ||
|
CubeJackal
|
bb3873664d | Various small map changes, removed some hidden silly things | ||
|
johnsonmt88@gmail.com
|
852b838e4e |
There were a bunch of boxes that had their own special code when they all do the same thing. So I've merged them into proper storage items.
Boxes affected: - Donut boxes - Egg cartons - Candle packs - Match boxes - Snap pop boxes - Monkey cube boxes Items I didn't merge: - Pizza boxes - Cigarette packs Pizza boxes are a whole new kind of 'special snowflake code' that is best left the way it is. Cigarette packs involve some stuff I'm unfamiliar with so that can wait until I learn what I need to learn. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4452 316c924e-a436-60f5-8080-3fe189b3f50e |
||
baloh.matevz
|
cac628a640 |
- In preparation of fixing issue 585, which extends far further than just the things listed there, as well as to standardize the many incarnations of satchel-type code (pill boxes, mining satchels, hydroponics satchels, etc.) I have added some functions to storage type items:
New variables: var/use_to_pickup = if 1, the storage item also works like satchels, which means you can use it on something else to pick it up. var/display_contents_with_number = if 1, the items in the storage item are grouped by type with the number of items being displayed. See the screenshot. var/allow_quick_empty = if 1 on creation, it adds a verb that allows you to empty the item with one click var/allow_quick_gather = if 1 on creation, it adds a verb which allows you to switch between pick-up methods. one-per-click or all-on-tile. Same as satchels worked. use_to_pickup must be 1 for any of that to matter. var/collection_mode = 1; //0 = pick one at a time, 1 = pick all on tile New procs: /obj/item/weapon/storage/proc/can_be_inserted(obj/item/W as obj, stop_messages = 0) - Returns 0 or 1, depending on whether the item W can be inserted /obj/item/weapon/storage/proc/handle_item_insertion(obj/item/W as obj) - Inserts the item into the storage item and calls all the procs it needs to. Doesn't check whether the item can fit tho, tha'ts what can_be_inserted() is for. /obj/item/weapon/storage/proc/remove_from_storage(obj/item/W as obj, atom/new_location) - Removes item W from the storage object and sets it's loc to new_location or get_turf(src) if one is not provided. /obj/item/proc/on_exit_storage(obj/item/weapon/storage/S as obj) - Called after the object has been removed from the storage item S. The object's loc is already set to the new one. /obj/item/proc/on_enter_storage(obj/item/weapon/storage/S as obj) - Called after the object has been inserted into the storage item S. The object's loc is already set to S. I made satchels work on this new code. The rest will be added to it soon. See the screenshot. Screenshot: http://www.kamletos.si/new%20satchels.png This is yet another big change and it is very possible that bugs will come from it. Please report them to me or on the tracker. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4451 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
petethegoat@gmail.com
|
0970e6c55d |
Standardised reagent colour mixing a little bit. Fixes issue 785.
Changed the path of large beakers, so they're actually a subtype of beaker (wtf) Moved new_year.dm to unused. Updated Carn's sequential master controller to not have tension stuff, for potential live testing. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4444 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
petethegoat@gmail.com
|
cece33ebde |
Updated that darn plaque.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4411 316c924e-a436-60f5-8080-3fe189b3f50e |
||
trubblebass@gmail.com
|
4a7cb44f43 |
Added a plaque to the station in honour of our 4407th revision.
We've come a long way since we forked off from Goonstation's r4407 and we've done spectacularly well. I for one am proud to be part of this project and hope it goes on to amazing things in the future. TGstation, this one's for you : http://www.youtube.com/watch?v=iQru7oCdYXA git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4407 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
petethegoat@gmail.com
|
d82fe7e03d |
Fixed the pixel_y of the toilet on the Ruskie DJ station.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4406 316c924e-a436-60f5-8080-3fe189b3f50e |
||
SkyMarshal
|
d3179bb5b5 | Random not much finished bullshit work on mapdata. | ||
|
johnsonmt88@gmail.com
|
26ce5db5b0 |
Meteors and Space dust (now that they work again) will no longer have an effect on singularity containment. Field generators and Emitters are protected.
I added a check to meteor and space dust Bump() directly because changing ex_act() on the machines themselves would make the machines immune to bombs and C4. Hopefully fixes issue 716. light/process() was added back in causing lights to use power as they were meant to. Recently lights have been made brighter causing more power to be drained. As a result the engineering APC would not last very long. The station using a lot of power is a good thing since the singularity produces an incredible amount of power, so to keep this higher power demand but still give engineers a fighting chance to set up the singularity, I've bumped up the engineering APC's starting battery power. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4401 316c924e-a436-60f5-8080-3fe189b3f50e |
||
sieve32@gmail.com
|
c62bdf0a6e |
-Cleaned up sacrificing again so it didn't rely on hasvar()
-Made a variation of hasvar(), creatively named has_var(), intended for objects versus datums, and the var name is case sensitive -Clean up mech fabricator code considerably, the terrible switches are all gone, and I was able to make it more robust at the same time. Now, if a junk item is added to the mech fab then it will remove it in 1 of 2 places, either when you call for the queue to be displayed (Will throw it out then rebuild the queue) or when it is processing the queue (Will throw it out then reprocess the building), so now you won't even see the shit that finds its way in there. -Made the add_part_to_set() useful, now instead of dumping everything in the "Exosuit Equipment" category, it checks if the design's category matches one of the part sets, then adds it to said set if it does (All others get dumped into "Misc"). Right now there isn't much through, mostly just moving MMIs, cells, etc... to the "Misc" set, but this would be easy to use with any other system that handles designs -Little bit of OCD here, but I noticed that the cells on the map were all 'crap' cells, even though they had 1.5x the charge of a high-capacity cell, so I changed them all to high-capacity cells with the added capacity git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4395 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
petethegoat@gmail.com
|
f657677a99 |
Fixed issue 775.
Fixed issue 767. The fix for issue 767 was to standardise spray bottle code (to some extent). If any issues come up with spray bottles, pepper spray, or chem sprayers, report them to me. Cyborgs now recharge their pacid and lube, as the size of their bottles was quartered. Changed the flash item_state to "flashbang", as it looks exactly like a flash. There's some more grammar and text clean up too, mostly with crates and closets. Finally, fixed some pipes in virology, and changed the librarian's den so the bookcases are at the top. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4394 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
elly1989@rocketmail.com
|
ae45d10423 |
Pulse emitters (singulo engine) are no longer susceptible to EMPs. Resolves Issue 761
The Field generators are now offset from each-other to allow the engine to be restarted should containment fail. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4380 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
johnsonmt88@gmail.com
|
79666c2a08 |
Replacing lattices around the singularity area that had their sprites removed in r4367.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4376 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
johnsonmt88@gmail.com
|
cc544acea0 |
Removed the tensioner. It was buggy and really only served to ruin rounds. The original purpose of the tensioner before Poly reworked it was to act as a stat tracker, which is now meaningless since erro has a fully operational stat tracker in place.
As a result, cyborg death squads were also removed. This also fixes meteors and space dust so that they properly take into account the borders of the map. Please do not hardcode numbers when we have defines in place. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4374 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
petethegoat@gmail.com
|
b9facf9e43 |
Removed the chainsword and chain of command. No chains allowed.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4373 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
trubblebass@gmail.com
|
2e89abaff8 |
- Adds 9 randomised coils of wire to Art Storage.
- Adds a box of crayons to Art Storage. - Extended the cryo room a tile to get rid of the doubled up walls. - Bomb test site now has r-walls around it. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4357 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
trubblebass@gmail.com
|
4b98d66d68 |
- Fixed a broken disposal pipe in the library game-room.
- Removed a foursquare of walls in medical storage. - Replaced the plastic-flaps in disposals. - Removed art storage. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4354 316c924e-a436-60f5-8080-3fe189b3f50e |
||
ericgfwong@hotmail.com
|
c02457e70d |
Removed a doubled up fire lock in virology.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4345 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
ericgfwong@hotmail.com
|
b24952d72a |
Added missing door control buttons to incinerator airlock. Used r-walls instead of glass so they can be seen easier
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4343 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
ericgfwong@hotmail.com
|
a8393f5bc7 |
-Added missing scanner to the library
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4337 316c924e-a436-60f5-8080-3fe189b3f50e |
||
cib
|
8ee4280e73 | Moved the captain's space suit to a secure position in EVA. | ||
|
Cael_Aislinn
|
e4600a8fa7 |
tweaks / fixes to carp a bit, removes munchkin from tgstation.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au> |
||
|
ericgfwong@hotmail.com
|
74be6141e8 |
-Fixed Beepsky's patrol route by adding in missing nav beacons. He now patrols the starboard and fore primary hallways.
-Fixed a couple of minor /area/ bugs -Re-routed engineering disposals so it doesn't go through walls git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4333 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
ericgfwong@hotmail.com
|
75bd323d8b |
-Added an air alarm to the Engineering break room.
-Also added a disposal chute for all that garbage git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4332 316c924e-a436-60f5-8080-3fe189b3f50e |
||
Superxpdude@gmail.com
|
696fad01d2 |
Fixed an issue with an incorrect area in the research department.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4329 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
ericgfwong@hotmail.com
|
ab6e4656eb |
Added some glass and some spare computer frames on the syndicate shuttle for nuke ops to build evil computers with
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4328 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
ericgfwong@hotmail.com
|
8a1c8b932c |
Just adding a few light switches
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4327 316c924e-a436-60f5-8080-3fe189b3f50e |
||
|
ericgfwong@hotmail.com
|
a2ee0a24c3 |
Fixed Issue 504
-Door controls now check if the bolt wire is cut and if the door is powered git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4326 316c924e-a436-60f5-8080-3fe189b3f50e |
