diff --git a/code/WorkInProgress/buildmode.dm b/code/WorkInProgress/buildmode.dm index ba17008a53b..28550759b29 100644 --- a/code/WorkInProgress/buildmode.dm +++ b/code/WorkInProgress/buildmode.dm @@ -6,7 +6,7 @@ log_admin("[key_name(usr)] has left build mode.") M.client.buildmode = 0 M.client.show_popup_menus = 1 - for(var/obj/bmode/buildholder/H) + for(var/obj/effect/bmode/buildholder/H) if(H.cl == M.client) del(H) else @@ -14,14 +14,14 @@ M.client.buildmode = 1 M.client.show_popup_menus = 0 - var/obj/bmode/buildholder/H = new/obj/bmode/buildholder() - var/obj/bmode/builddir/A = new/obj/bmode/builddir(H) + var/obj/effect/bmode/buildholder/H = new/obj/effect/bmode/buildholder() + var/obj/effect/bmode/builddir/A = new/obj/effect/bmode/builddir(H) A.master = H - var/obj/bmode/buildhelp/B = new/obj/bmode/buildhelp(H) + var/obj/effect/bmode/buildhelp/B = new/obj/effect/bmode/buildhelp(H) B.master = H - var/obj/bmode/buildmode/C = new/obj/bmode/buildmode(H) + var/obj/effect/bmode/buildmode/C = new/obj/effect/bmode/buildmode(H) C.master = H - var/obj/bmode/buildquit/D = new/obj/bmode/buildquit(H) + var/obj/effect/bmode/buildquit/D = new/obj/effect/bmode/buildquit(H) D.master = H H.builddir = A @@ -34,15 +34,15 @@ M.client.screen += D H.cl = M.client -/obj/bmode//Cleaning up the tree a bit +/obj/effect/bmode//Cleaning up the tree a bit density = 1 anchored = 1 layer = 20 dir = NORTH icon = 'buildmode.dmi' - var/obj/bmode/buildholder/master = null + var/obj/effect/bmode/buildholder/master = null -/obj/bmode/builddir +/obj/effect/bmode/builddir icon_state = "build" screen_loc = "NORTH,WEST" Click() @@ -59,7 +59,7 @@ dir = NORTH return -/obj/bmode/buildhelp +/obj/effect/bmode/buildhelp icon = 'buildmode.dmi' icon_state = "buildhelp" screen_loc = "NORTH,WEST+1" @@ -97,24 +97,24 @@ usr << "\blue ***********************************************************" return -/obj/bmode/buildquit +/obj/effect/bmode/buildquit icon_state = "buildquit" screen_loc = "NORTH,WEST+3" Click() togglebuildmode(master.cl.mob) -/obj/bmode/buildholder +/obj/effect/bmode/buildholder density = 0 anchored = 1 var/client/cl = null - var/obj/bmode/builddir/builddir = null - var/obj/bmode/buildhelp/buildhelp = null - var/obj/bmode/buildmode/buildmode = null - var/obj/bmode/buildquit/buildquit = null + var/obj/effect/bmode/builddir/builddir = null + var/obj/effect/bmode/buildhelp/buildhelp = null + var/obj/effect/bmode/buildmode/buildmode = null + var/obj/effect/bmode/buildquit/buildquit = null var/atom/movable/throw_atom = null -/obj/bmode/buildmode +/obj/effect/bmode/buildmode icon_state = "buildmode1" screen_loc = "NORTH,WEST+2" var/varholder = "name" @@ -173,8 +173,8 @@ /proc/build_click(var/mob/user, buildmode, location, control, params, var/obj/object) - var/obj/bmode/buildholder/holder = null - for(var/obj/bmode/buildholder/H) + var/obj/effect/bmode/buildholder/holder = null + for(var/obj/effect/bmode/buildholder/H) if(H.cl == user.client) holder = H break diff --git a/code/WorkInProgress/organs/organs.dm b/code/WorkInProgress/organs/organs.dm index 607a22e4338..e712f8a7a35 100644 --- a/code/WorkInProgress/organs/organs.dm +++ b/code/WorkInProgress/organs/organs.dm @@ -1,18 +1,18 @@ -/obj/organstructure //used obj for the "contents" var +/obj/effect/organstructure //used obj for the "contents" var name = "organs" var/species = "mob" //for speaking in unknown languages purposes - var/obj/organ/limb/arms/arms = null - var/obj/organ/limb/legs/legs = null - var/obj/organ/torso/torso = null - var/obj/organ/head/head = null + var/obj/effect/organ/limb/arms/arms = null + var/obj/effect/organ/limb/legs/legs = null + var/obj/effect/organ/torso/torso = null + var/obj/effect/organ/head/head = null proc/GetSpeciesName() var/list/speciesPresent = list() - for(var/obj/organ/organ in src) //only external organs count, since it's judging by the appearance + for(var/obj/effect/organ/organ in src) //only external organs count, since it's judging by the appearance if(speciesPresent[organ.species]) speciesPresent[organ.species]++ else @@ -39,10 +39,10 @@ proc/RecalculateStructure() var/list/organs = GetAllContents() - arms = locate(/obj/organ/limb/arms) in organs - legs = locate(/obj/organ/limb/legs) in organs - torso = locate(/obj/organ/torso) in organs - head = locate(/obj/organ/head) in organs + arms = locate(/obj/effect/organ/limb/arms) in organs + legs = locate(/obj/effect/organ/limb/legs) in organs + torso = locate(/obj/effect/organ/torso) in organs + head = locate(/obj/effect/organ/head) in organs GetSpeciesName() @@ -52,8 +52,7 @@ set background = 1 var/list/organs = GetAllContents() - for(var/name in organs) - var/obj/organ/organ = organs[name] + for(var/obj/effect/organ/organ in organs) organ.ProcessOrgan() return @@ -62,27 +61,27 @@ ..() RecalculateStructure() -/obj/organstructure/human +/obj/effect/organstructure/human name = "human organs" New() - new /obj/organ/torso/human(src) + new /obj/effect/organ/torso/human(src) ..() -/obj/organstructure/alien +/obj/effect/organstructure/alien name = "alien organs" New() - new /obj/organ/torso/alien(src) + new /obj/effect/organ/torso/alien(src) ..() -/obj/organ +/obj/effect/organ name = "organ" //All types var/organType = 0 //CYBER and SPELL go here var/species = "mob" - var/obj/organstructure/rootOrganStructure = null + var/obj/effect/organstructure/rootOrganStructure = null New(location) ..() @@ -90,129 +89,129 @@ rootOrganStructure = FindRootStructure() proc/FindRootStructure() - if(istype(loc,/obj/organ)) - var/obj/organ/parent = loc + if(istype(loc,/obj/effect/organ)) + var/obj/effect/organ/parent = loc return parent.FindRootStructure() - else if(istype(loc,/obj/organstructure)) + else if(istype(loc,/obj/effect/organstructure)) return loc return null proc/ProcessOrgan() return -/obj/organ/torso +/obj/effect/organ/torso name = "torso" var/maxHealth = 50 //right now, the mob's (only humans for now) health depends only on it. Will be fixed later -/obj/organ/torso/human +/obj/effect/organ/torso/human name = "human torso" species = "human" maxHealth = 100 New() ..() - new /obj/organ/limb/arms/human(src) - new /obj/organ/limb/legs/human(src) - new /obj/organ/head/human(src) -/obj/organ/torso/alien + new /obj/effect/organ/limb/arms/human(src) + new /obj/effect/organ/limb/legs/human(src) + new /obj/effect/organ/head/human(src) +/obj/effect/organ/torso/alien name = "alien torso" species = "alien" maxHealth = 100 New() ..() - new /obj/organ/limb/arms/alien(src) - new /obj/organ/limb/legs/alien(src) - new /obj/organ/head/alien(src) + new /obj/effect/organ/limb/arms/alien(src) + new /obj/effect/organ/limb/legs/alien(src) + new /obj/effect/organ/head/alien(src) -/obj/organ/limb +/obj/effect/organ/limb name = "limb" -/obj/organ/limb/arms +/obj/effect/organ/limb/arms name = "arms" var/minDamage = 5 //punching damage var/maxDamage = 5 -/obj/organ/limb/arms/alien +/obj/effect/organ/limb/arms/alien name = "alien arms" species = "alien" minDamage = 5 maxDamage = 15 -/obj/organ/limb/arms/human +/obj/effect/organ/limb/arms/human name = "human arms" species = "human" minDamage = 1 maxDamage = 9 -/obj/organ/limb/legs +/obj/effect/organ/limb/legs name = "legs" -/obj/organ/limb/legs/human +/obj/effect/organ/limb/legs/human name = "human legs" species = "human" -/obj/organ/limb/legs/alien +/obj/effect/organ/limb/legs/alien name = "alien legs" species = "alien" -/obj/organ/head +/obj/effect/organ/head name = "head" -/obj/organ/head/human +/obj/effect/organ/head/human name = "human head" species = "human" -/obj/organ/head/alien +/obj/effect/organ/head/alien name = "alien head" species = "alien" -/obj/organ/limb/arms/alien +/obj/effect/organ/limb/arms/alien name = "alien arms" species = "alien" minDamage = 5 maxDamage = 15 -/obj/organ/limb/legs/alien +/obj/effect/organ/limb/legs/alien name = "alien legs" species = "alien" -/obj/organ/head/alien +/obj/effect/organ/head/alien name = "alien head" species = "alien" // ++++STUB ORGAN STRUCTURE. THIS IS THE DEFAULT STRUCTURE. USED TO PREVENT EXCEPTIONS++++ -/obj/organstructure/stub +/obj/effect/organstructure/stub name = "stub organs" New() - new /obj/organ/torso/stub(src) + new /obj/effect/organ/torso/stub(src) ..() -/obj/organ/torso/stub +/obj/effect/organ/torso/stub name = "stub torso" species = "stub" maxHealth = 100 New() ..() - new /obj/organ/limb/arms/stub(src) - new /obj/organ/limb/legs/stub(src) - new /obj/organ/head/stub(src) + new /obj/effect/organ/limb/arms/stub(src) + new /obj/effect/organ/limb/legs/stub(src) + new /obj/effect/organ/head/stub(src) -/obj/organ/limb/arms/stub +/obj/effect/organ/limb/arms/stub name = "stub arms" species = "stub" -/obj/organ/limb/legs/stub +/obj/effect/organ/limb/legs/stub name = "stub legs" species = "stub" -/obj/organ/head/stub +/obj/effect/organ/head/stub name = "stub head" species = "stub" @@ -221,129 +220,129 @@ // ++++MONKEY++++ -/obj/organstructure/monkey +/obj/effect/organstructure/monkey name = "monkey organs" New() - new /obj/organ/torso/monkey(src) + new /obj/effect/organ/torso/monkey(src) ..() -/obj/organ/torso/monkey +/obj/effect/organ/torso/monkey name = "monkey torso" species = "monkey" maxHealth = 100 New() ..() - new /obj/organ/limb/arms/monkey(src) - new /obj/organ/limb/legs/monkey(src) - new /obj/organ/head/monkey(src) + new /obj/effect/organ/limb/arms/monkey(src) + new /obj/effect/organ/limb/legs/monkey(src) + new /obj/effect/organ/head/monkey(src) -/obj/organ/limb/arms/monkey +/obj/effect/organ/limb/arms/monkey name = "monkey arms" species = "monkey" -/obj/organ/limb/legs/monkey +/obj/effect/organ/limb/legs/monkey name = "monkey legs" species = "monkey" -/obj/organ/head/monkey +/obj/effect/organ/head/monkey name = "monkey head" species = "monkey" // +++++CYBORG+++++ -/obj/organstructure/cyborg +/obj/effect/organstructure/cyborg name = "cyborg organs" New() - new /obj/organ/torso/cyborg(src) + new /obj/effect/organ/torso/cyborg(src) ..() -/obj/organ/torso/cyborg +/obj/effect/organ/torso/cyborg name = "cyborg torso" species = "cyborg" maxHealth = 100 New() ..() - new /obj/organ/limb/arms/cyborg(src) - new /obj/organ/limb/legs/cyborg(src) - new /obj/organ/head/cyborg(src) + new /obj/effect/organ/limb/arms/cyborg(src) + new /obj/effect/organ/limb/legs/cyborg(src) + new /obj/effect/organ/head/cyborg(src) -/obj/organ/limb/arms/cyborg +/obj/effect/organ/limb/arms/cyborg name = "cyborg arms" species = "cyborg" -/obj/organ/limb/legs/cyborg +/obj/effect/organ/limb/legs/cyborg name = "cyborg legs" species = "cyborg" -/obj/organ/head/cyborg +/obj/effect/organ/head/cyborg name = "cyborg head" species = "cyborg" // +++++AI++++++ -/obj/organstructure/AI +/obj/effect/organstructure/AI name = "AI organs" New() - new /obj/organ/torso/AI(src) + new /obj/effect/organ/torso/AI(src) ..() -/obj/organ/torso/AI +/obj/effect/organ/torso/AI name = "AI torso" species = "AI" maxHealth = 100 New() ..() - new /obj/organ/limb/arms/AI(src) - new /obj/organ/limb/legs/AI(src) - new /obj/organ/head/AI(src) + new /obj/effect/organ/limb/arms/AI(src) + new /obj/effect/organ/limb/legs/AI(src) + new /obj/effect/organ/head/AI(src) -/obj/organ/limb/arms/AI +/obj/effect/organ/limb/arms/AI name = "AI arms" species = "AI" -/obj/organ/limb/legs/AI +/obj/effect/organ/limb/legs/AI name = "AI legs" species = "AI" -/obj/organ/head/AI +/obj/effect/organ/head/AI name = "AI head" species = "AI" /* New organ structure template -/obj/organstructure/template +/obj/effect/organstructure/template name = "template organs" New() - new /obj/organ/torso/template(src) + new /obj/effect/organ/torso/template(src) ..() -/obj/organ/torso/template +/obj/effect/organ/torso/template name = "template torso" species = "template" maxHealth = 100 New() ..() - new /obj/organ/limb/arms/template(src) - new /obj/organ/limb/legs/template(src) - new /obj/organ/head/template(src) + new /obj/effect/organ/limb/arms/template(src) + new /obj/effect/organ/limb/legs/template(src) + new /obj/effect/organ/head/template(src) -/obj/organ/limb/arms/template +/obj/effect/organ/limb/arms/template name = "template arms" species = "template" -/obj/organ/limb/legs/template +/obj/effect/organ/limb/legs/template name = "template legs" species = "template" -/obj/organ/head/template +/obj/effect/organ/head/template name = "template head" species = "template" diff --git a/code/datums/helper_datums/tension.dm b/code/datums/helper_datums/tension.dm index a4002f6590a..f9242cfbeef 100644 --- a/code/datums/helper_datums/tension.dm +++ b/code/datums/helper_datums/tension.dm @@ -626,31 +626,14 @@ var/global/datum/tension/tension_master //Generates a list of commandos from active ghosts. Then the user picks which characters to respawn as the commandos. -/* - for(var/obj/debug/debugger/B in world) - B.list1 = list() - B.list2 = list() - B.list3 = list() - B.list4 = list() -*/ for(var/mob/dead/observer/G in world) -/* - for(var/obj/debug/debugger/B in world) - B.list1 += G - B.list2 += G.key -*/ spawn(0) switch(alert(G,"Do you wish to be considered for an elite syndicate strike team being sent in?","Please answer in 30 seconds!","Yes","No")) if("Yes") if((world.time-time_passed)>300)//If more than 30 game seconds passed. return candidates += G - /* - for(var/obj/debug/debugger/B in world) - B.list3 += G - B.list4 += G.key - */ if("No") return sleep(300) @@ -660,19 +643,7 @@ var/global/datum/tension/tension_master candidates.Remove(G) if(candidates.len) - /* - for(var/obj/debug/debugger/B in world) - B.var1 = candidates.len - B.list5 = candidates.Copy() - for(var/mob/dead/observer/G in candidates) - B.list6 += G.key - - */ var/numagents = 6 -/* - for(var/obj/debug/debugger/B in world) - B.var2 = 0 -*/ //Spawns commandos and equips them. for (var/obj/effect/landmark/L in world) if(numagents<=0) @@ -685,18 +656,10 @@ var/global/datum/tension/tension_master while((!theghost || !theghost.client) && candidates.len) - /* - for(var/obj/debug/debugger/B in world) - B.var2++ - */ theghost = pick(candidates) candidates.Remove(theghost) if(!theghost) - /* - for(var/obj/debug/debugger/B in world) - B.var4 = 1 - */ del(new_syndicate_commando) break diff --git a/code/defines/global.dm b/code/defines/global.dm index 9f33447269b..be2c232e8fa 100644 --- a/code/defines/global.dm +++ b/code/defines/global.dm @@ -1,6 +1,6 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 -var/global/obj/datacore/data_core = null +var/global/obj/effect/datacore/data_core = null var/global/obj/effect/overlay/plmaster = null var/global/obj/effect/overlay/slmaster = null diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 45ad2ccbf98..ffb9736cdcf 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -102,7 +102,7 @@ anchored = 1.0 unacidable = 1 -/obj/datacore +/obj/effect/datacore name = "datacore" var/medical[] = list() var/general[] = list() @@ -1526,27 +1526,6 @@ desc = "You can't resist." // name = "" - - -/obj/debug/debugger - name = "Quantum Debugger" - desc = "A quantum debugger used by Centcomm Reality Engineers to help monitor transiant variables." - icon = 'stationobjs.dmi' - icon_state = "blackbox" - - var/list/list1 = list() - var/list/list2 = list() - var/list/list3 = list() - var/list/list4 = list() - var/list/list5 = list() - var/list/list6 = list() - - var/var1 = null - var/var2 = null - var/var3 = null - var/var4 = null - var/var5 = null - /obj/item/rubberduck name = "rubber duck" desc = "A rubber duck. Quack." diff --git a/code/game/cellautomata.dm b/code/game/cellautomata.dm index 13a59505ea7..3210bac6526 100644 --- a/code/game/cellautomata.dm +++ b/code/game/cellautomata.dm @@ -97,7 +97,7 @@ radio_controller = new /datum/controller/radio() //main_hud1 = new /obj/hud() - data_core = new /obj/datacore() + data_core = new /obj/effect/datacore() paiController = new /datum/paiController() diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index ef311774f78..427fa9015cf 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -134,7 +134,7 @@ Pod/Blast Doors computer return 1 -/obj/datacore/proc/manifest(var/nosleep = 0) +/obj/effect/datacore/proc/manifest(var/nosleep = 0) spawn() if(!nosleep) sleep(40) @@ -244,7 +244,7 @@ Pod/Blast Doors computer locked += L return -/obj/datacore/proc/manifest_modify(var/name, var/assignment) +/obj/effect/datacore/proc/manifest_modify(var/name, var/assignment) var/datum/data/record/foundrecord for(var/datum/data/record/t in data_core.general) @@ -258,7 +258,7 @@ Pod/Blast Doors computer foundrecord.fields["real_rank"] = assignment -/obj/datacore/proc/manifest_inject(var/mob/living/carbon/human/H) +/obj/effect/datacore/proc/manifest_inject(var/mob/living/carbon/human/H) if (!isnull(H.mind) && (H.mind.assigned_role != "MODE")) var/datum/data/record/G = new() var/datum/data/record/M = new() diff --git a/code/game/step_triggers.dm b/code/game/step_triggers.dm index 53169583c81..f492a21a58c 100644 --- a/code/game/step_triggers.dm +++ b/code/game/step_triggers.dm @@ -1,15 +1,15 @@ /* Simple object type, calls a proc when "stepped" on by something */ -/obj/step_trigger +/obj/effect/step_trigger var/affect_ghosts = 0 var/stopper = 1 // stops throwers invisibility = 101 // nope cant see this shit anchored = 1 -/obj/step_trigger/proc/Trigger(var/atom/movable/A) +/obj/effect/step_trigger/proc/Trigger(var/atom/movable/A) return 0 -/obj/step_trigger/HasEntered(H as mob|obj) +/obj/effect/step_trigger/HasEntered(H as mob|obj) ..() if(!H) return @@ -21,7 +21,7 @@ /* Tosses things in a certain direction */ -/obj/step_trigger/thrower +/obj/effect/step_trigger/thrower var/direction = SOUTH // the direction of throw var/tiles = 3 // if 0: forever until atom hits a stopper var/immobilize = 1 // if nonzero: prevents mobs from moving while they're being flung @@ -33,7 +33,7 @@ Trigger(var/atom/movable/A) var/curtiles = 0 var/stopthrow = 0 - for(var/obj/step_trigger/thrower/T in orange(2, src)) + for(var/obj/effect/step_trigger/thrower/T in orange(2, src)) if(A in T.affecting) return @@ -56,11 +56,11 @@ // Calculate if we should stop the process if(!nostop) - for(var/obj/step_trigger/T in get_step(A, direction)) + for(var/obj/effect/step_trigger/T in get_step(A, direction)) if(T.stopper && T != src) stopthrow = 1 else - for(var/obj/step_trigger/teleporter/T in get_step(A, direction)) + for(var/obj/effect/step_trigger/teleporter/T in get_step(A, direction)) if(T.stopper) stopthrow = 1 @@ -81,11 +81,11 @@ /* Stops things thrown by a thrower, doesn't do anything */ -/obj/step_trigger/stopper +/obj/effect/step_trigger/stopper /* Instant teleporter */ -/obj/step_trigger/teleporter +/obj/effect/step_trigger/teleporter var/teleport_x = 0 // teleportation coordinates (if one is null, then no teleport!) var/teleport_y = 0 var/teleport_z = 0 @@ -99,7 +99,7 @@ /* Random teleporter, teleports atoms to locations ranging from teleport_x - teleport_x_offset, etc */ -/obj/step_trigger/teleporter/random +/obj/effect/step_trigger/teleporter/random var/teleport_x_offset = 0 var/teleport_y_offset = 0 var/teleport_z_offset = 0 diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index ee260eeecbe..8f3625dbd1d 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -215,7 +215,7 @@ proc/check_panel(mob/M) return 1 return 0*/ -/obj/fake_attacker +/obj/effect/fake_attacker icon = null icon_state = null name = "" @@ -358,8 +358,8 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite if(!possible_clones.len) return clone = pick(possible_clones) - //var/obj/fake_attacker/F = new/obj/fake_attacker(outside_range(target)) - var/obj/fake_attacker/F = new/obj/fake_attacker(target.loc) + //var/obj/effect/fake_attacker/F = new/obj/effect/fake_attacker(outside_range(target)) + var/obj/effect/fake_attacker/F = new/obj/effect/fake_attacker(target.loc) if(clone.l_hand) if(!(locate(clone.l_hand) in non_fakeattack_weapons)) clone_weapon = clone.l_hand.name diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 49cb49d38b6..c78bd646426 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -86,7 +86,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/Move(NewLoc, direct) if(NewLoc) loc = NewLoc - for(var/obj/step_trigger/S in NewLoc) + for(var/obj/effect/step_trigger/S in NewLoc) S.HasEntered(src) return @@ -100,7 +100,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if((direct & WEST) && x > 1) x-- - for(var/obj/step_trigger/S in locate(x, y, z)) + for(var/obj/effect/step_trigger/S in locate(x, y, z)) S.HasEntered(src) /mob/dead/observer/examine() diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index d9c13ba48f8..bd653712aa6 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -67,6 +67,25 @@ return message = "[src] [input]" + if ("me") + if(silent) + return + if (src.client && (client.muted || client.muted_complete)) + src << "You are muted." + return + if (stat) + return + if(!(message)) + return + else + if(cmptext(copytext(message, 1, 3), "v ")) + message = "[src] [copytext(message, 3)]" + m_type = 1 + else if(cmptext(copytext(message, 1, 3), "h ")) + message = "[src] [copytext(message, 3)]" + m_type = 2 + else + message = "[src] [message]" if ("twitch") message = "[src] twitches violently." m_type = 1 @@ -189,25 +208,7 @@ playsound(src.loc, 'biamthelaw.ogg', 50, 0) m_type = 2 - if ("me") - if(silent) - return - if (src.client && (client.muted || client.muted_complete)) - src << "You are muted." - return - if (stat) - return - if(!(message)) - return - else - if(cmptext(copytext(message, 1, 3), "v ")) - message = "[src] [copytext(message, 3)]" - m_type = 1 - else if(cmptext(copytext(message, 1, 3), "h ")) - message = "[src] [copytext(message, 3)]" - m_type = 2 - else - message = "[src] [message]" + if("help") src << "beep-(none)/mob, ping-(none)/mob, buzz-(none)/mob, look-(none)/mob, stare-(none)/mob, glare-(none)/mob, twitch, twitch_s, law" diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 7e7daa258ab..3d54b956cb2 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -12,7 +12,7 @@ //MOB overhaul //Not in use yet -// var/obj/organstructure/organStructure = null +// var/obj/effect/organstructure/organStructure = null //Vars that have been relocated to organStructure //Vars that have been relocated to organStructure ++END diff --git a/icons/obj/ERP.dmi b/icons/obj/ERP.dmi deleted file mode 100644 index 972ddab18f6..00000000000 Binary files a/icons/obj/ERP.dmi and /dev/null differ diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 60a44bc8c44..42f5f7f9a48 100755 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -5944,21 +5944,21 @@ "ckp" = (/turf/space,/area/syndicate_station/one) "ckq" = (/turf/space,/area/syndicate_station/four) "ckr" = (/turf/unsimulated/wall,/area) -"cks" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns15,/area) -"ckt" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns9,/area) -"cku" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns5,/area) -"ckv" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns12,/area) -"ckw" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns8,/area) -"ckx" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns3,/area) -"cky" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns6,/area) -"ckz" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns7,/area) -"ckA" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns4,/area) -"ckB" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns14,/area) -"ckC" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns1,/area) -"ckD" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns11,/area) -"ckE" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns13,/area) -"ckF" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns2,/area) -"ckG" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns10,/area) +"cks" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns15,/area) +"ckt" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns9,/area) +"cku" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns5,/area) +"ckv" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns12,/area) +"ckw" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns8,/area) +"ckx" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns3,/area) +"cky" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns6,/area) +"ckz" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns7,/area) +"ckA" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns4,/area) +"ckB" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns14,/area) +"ckC" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns1,/area) +"ckD" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns11,/area) +"ckE" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns13,/area) +"ckF" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns2,/area) +"ckG" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns10,/area) "ckH" = (/turf/space/transit/east/shuttlespace_ew13,/area) "ckI" = (/turf/space/transit/east/shuttlespace_ew14,/area) "ckJ" = (/turf/space/transit/east/shuttlespace_ew15,/area) @@ -5966,21 +5966,21 @@ "ckL" = (/turf/space/transit/east/shuttlespace_ew2,/area) "ckM" = (/turf/space/transit/east/shuttlespace_ew3,/area) "ckN" = (/turf/space/transit/east/shuttlespace_ew4,/area) -"ckO" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew5,/area) -"ckP" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew6,/area) -"ckQ" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew7,/area) -"ckR" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew8,/area) -"ckS" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew9,/area) -"ckT" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew10,/area) -"ckU" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew11,/area) -"ckV" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew12,/area) -"ckW" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew13,/area) -"ckX" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew14,/area) -"ckY" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew15,/area) -"ckZ" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew1,/area) -"cla" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew2,/area) -"clb" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew3,/area) -"clc" = (/obj/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew4,/area) +"ckO" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew5,/area) +"ckP" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew6,/area) +"ckQ" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew7,/area) +"ckR" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew8,/area) +"ckS" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew9,/area) +"ckT" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew10,/area) +"ckU" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew11,/area) +"ckV" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew12,/area) +"ckW" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew13,/area) +"ckX" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew14,/area) +"ckY" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew15,/area) +"ckZ" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew1,/area) +"cla" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew2,/area) +"clb" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew3,/area) +"clc" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/east/shuttlespace_ew4,/area) "cld" = (/turf/space{tag = "icon-black"; icon_state = "black"},/area) "cle" = (/turf/unsimulated/wall{tag = "icon-iron6"; icon = 'mineral_walls.dmi'; icon_state = "iron6"},/area) "clf" = (/obj/structure/window/reinforced,/turf/unsimulated/wall{tag = "icon-iron12"; icon = 'mineral_walls.dmi'; icon_state = "iron12"},/area) @@ -6027,31 +6027,31 @@ "clU" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "red"},/area/holodeck/source_emptycourt) "clV" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "blue"},/area/holodeck/source_emptycourt) "clW" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "blue"},/area/holodeck/source_emptycourt) -"clX" = (/obj/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew13,/area) -"clY" = (/obj/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew14,/area) -"clZ" = (/obj/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew15,/area) -"cma" = (/obj/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew1,/area) -"cmb" = (/obj/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew2,/area) -"cmc" = (/obj/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew3,/area) -"cmd" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; tiles = 0},/turf/space/transit/north/shuttlespace_ns13,/area) -"cme" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns11,/area) -"cmf" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns6,/area) -"cmg" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns8,/area) -"cmh" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns3,/area) -"cmi" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns5,/area) -"cmj" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 4; name = "thrower_escapeshuttletop(right)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns9,/area) -"cmk" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 4; name = "thrower_escapeshuttletop(right)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns2,/area) -"cml" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 4; name = "thrower_escapeshuttletop(right)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns13,/area) -"cmm" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 4; name = "thrower_escapeshuttletop(right)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns10,/area) -"cmn" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; tiles = 0},/turf/space/transit/north/shuttlespace_ns4,/area) -"cmo" = (/obj/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew8,/area) +"clX" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew13,/area) +"clY" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew14,/area) +"clZ" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew15,/area) +"cma" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew1,/area) +"cmb" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew2,/area) +"cmc" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew3,/area) +"cmd" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; tiles = 0},/turf/space/transit/north/shuttlespace_ns13,/area) +"cme" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns11,/area) +"cmf" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns6,/area) +"cmg" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns8,/area) +"cmh" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns3,/area) +"cmi" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns5,/area) +"cmj" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 4; name = "thrower_escapeshuttletop(right)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns9,/area) +"cmk" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 4; name = "thrower_escapeshuttletop(right)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns2,/area) +"cml" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 4; name = "thrower_escapeshuttletop(right)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns13,/area) +"cmm" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 4; name = "thrower_escapeshuttletop(right)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns10,/area) +"cmn" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; tiles = 0},/turf/space/transit/north/shuttlespace_ns4,/area) +"cmo" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew8,/area) "cmp" = (/turf/space/transit/east/shuttlespace_ew7,/area/shuttle/escape_pod5/transit) "cmq" = (/turf/space/transit/east/shuttlespace_ew8,/area/shuttle/escape_pod5/transit) "cmr" = (/turf/space/transit/east/shuttlespace_ew9,/area/shuttle/escape_pod5/transit) "cms" = (/turf/space/transit/east/shuttlespace_ew10,/area/shuttle/escape_pod5/transit) -"cmt" = (/obj/step_trigger/thrower{direction = 1; name = "thrower_throwup"; nostop = 0; tiles = 0},/turf/space/transit/east/shuttlespace_ew13,/area) -"cmu" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; tiles = 0},/turf/space/transit/north/shuttlespace_ns9,/area) -"cmv" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns10,/area) +"cmt" = (/obj/effect/step_trigger/thrower{direction = 1; name = "thrower_throwup"; nostop = 0; tiles = 0},/turf/space/transit/east/shuttlespace_ew13,/area) +"cmu" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; tiles = 0},/turf/space/transit/north/shuttlespace_ns9,/area) +"cmv" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns10,/area) "cmw" = (/turf/space/transit/north/shuttlespace_ns12,/area/shuttle/escape/transit) "cmx" = (/turf/space/transit/north/shuttlespace_ns14,/area/shuttle/escape/transit) "cmy" = (/turf/space/transit/north/shuttlespace_ns9,/area/shuttle/escape/transit) @@ -6063,34 +6063,34 @@ "cmE" = (/turf/space/transit/east/shuttlespace_ew3,/area/shuttle/escape_pod5/transit) "cmF" = (/turf/space/transit/east/shuttlespace_ew4,/area/shuttle/escape_pod5/transit) "cmG" = (/turf/space/transit/east/shuttlespace_ew5,/area/shuttle/escape_pod5/transit) -"cmH" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; stopper = 0; tiles = 0},/turf/space/transit/east/shuttlespace_ew7,/area) +"cmH" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; stopper = 0; tiles = 0},/turf/space/transit/east/shuttlespace_ew7,/area) "cmI" = (/turf/simulated/floor/holofloor{icon_state = "bluecorner"},/area/holodeck/source_emptycourt) "cmJ" = (/turf/simulated/floor/holofloor{icon_state = "blue"},/area/holodeck/source_emptycourt) "cmK" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "bluecorner"},/area/holodeck/source_emptycourt) -"cmL" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns5,/area) +"cmL" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns5,/area) "cmM" = (/turf/space/transit/north/shuttlespace_ns2,/area/shuttle/escape/transit) "cmN" = (/turf/space/transit/north/shuttlespace_ns13,/area/shuttle/escape/transit) "cmO" = (/turf/space/transit/north/shuttlespace_ns10,/area/shuttle/escape/transit) "cmP" = (/turf/space/transit/north/shuttlespace_ns7,/area/shuttle/escape/transit) -"cmQ" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns4,/area) -"cmR" = (/obj/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew7,/area) +"cmQ" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns4,/area) +"cmR" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew7,/area) "cmS" = (/turf/space/transit/east/shuttlespace_ew11,/area/shuttle/escape_pod5/transit) "cmT" = (/turf/space/transit/east/shuttlespace_ew12,/area/shuttle/escape_pod5/transit) "cmU" = (/turf/space/transit/east/shuttlespace_ew13,/area/shuttle/escape_pod5/transit) "cmV" = (/turf/space/transit/east/shuttlespace_ew14,/area/shuttle/escape_pod5/transit) -"cmW" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; stopper = 0; tiles = 0},/turf/space/transit/east/shuttlespace_ew12,/area) +"cmW" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; stopper = 0; tiles = 0},/turf/space/transit/east/shuttlespace_ew12,/area) "cmX" = (/turf/simulated/floor/holofloor{dir = 10; icon_state = "blue"},/area/holodeck/source_emptycourt) "cmY" = (/turf/simulated/floor/holofloor{dir = 6; icon_state = "blue"},/area/holodeck/source_emptycourt) "cmZ" = (/turf/space/transit/north/shuttlespace_ns1,/area/shuttle/escape/transit) "cna" = (/turf/space/transit/north/shuttlespace_ns6,/area/shuttle/escape/transit) -"cnb" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns3,/area) -"cnc" = (/obj/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew4,/area) -"cnd" = (/obj/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew5,/area) +"cnb" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns3,/area) +"cnc" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew4,/area) +"cnd" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew5,/area) "cne" = (/turf/unsimulated/wall{tag = "icon-iron7"; icon = 'mineral_walls.dmi'; icon_state = "iron7"},/area) "cnf" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/unsimulated/wall{tag = "icon-iron12"; icon = 'mineral_walls.dmi'; icon_state = "iron12"},/area) "cng" = (/turf/unsimulated/wall{tag = "icon-iron11"; icon = 'mineral_walls.dmi'; icon_state = "iron11"},/area) "cnh" = (/turf/space/transit/north/shuttlespace_ns5,/area/shuttle/escape/transit) -"cni" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns2,/area) +"cni" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns2,/area) "cnj" = (/turf/simulated/floor/holofloor/grass,/area/holodeck/source_beach) "cnk" = (/obj/structure/table/holotable,/obj/machinery/readybutton,/turf/simulated/floor/holofloor{dir = 9; icon_state = "red"},/area/holodeck/source_thunderdomecourt) "cnl" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/under/color/red,/obj/item/weapon/melee/energy/sword/holosword/red,/turf/simulated/floor/holofloor{dir = 5; icon_state = "red"},/area/holodeck/source_thunderdomecourt) @@ -6102,7 +6102,7 @@ "cnr" = (/turf/simulated/floor/holofloor,/area/holodeck/source_boxingcourt) "cns" = (/obj/structure/table/holotable,/obj/item/clothing/gloves/boxing/hologlove{icon_state = "boxingyellow"},/turf/simulated/floor/holofloor{dir = 9; icon_state = "red"},/area/holodeck/source_boxingcourt) "cnt" = (/turf/simulated/floor/holofloor{dir = 5; icon_state = "red"},/area/holodeck/source_boxingcourt) -"cnu" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns1,/area) +"cnu" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns1,/area) "cnv" = (/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) "cnw" = (/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) "cnx" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "red"},/area/holodeck/source_thunderdomecourt) @@ -6115,34 +6115,34 @@ "cnE" = (/turf/simulated/floor/holofloor{dir = 1; icon_state = "red"},/area/holodeck/source_boxingcourt) "cnF" = (/turf/simulated/floor/holofloor{dir = 1; icon_state = "redcorner"},/area/holodeck/source_boxingcourt) "cnG" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "red"},/area/holodeck/source_boxingcourt) -"cnH" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns15,/area) -"cnI" = (/obj/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew6,/area) -"cnJ" = (/obj/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew9,/area) +"cnH" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns15,/area) +"cnI" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew6,/area) +"cnJ" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew9,/area) "cnK" = (/turf/simulated/floor/holofloor,/area/holodeck/source_thunderdomecourt) "cnL" = (/turf/space/transit/north/shuttlespace_ns3,/area/shuttle/escape/transit) -"cnM" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns14,/area) -"cnN" = (/obj/step_trigger/thrower{direction = 1; name = "thrower_throwup"; nostop = 0; tiles = 0},/turf/space/transit/east/shuttlespace_ew14,/area) -"cnO" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns13,/area) -"cnP" = (/obj/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew11,/area) -"cnQ" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; stopper = 0; tiles = 0},/turf/space/transit/east/shuttlespace_ew1,/area) +"cnM" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns14,/area) +"cnN" = (/obj/effect/step_trigger/thrower{direction = 1; name = "thrower_throwup"; nostop = 0; tiles = 0},/turf/space/transit/east/shuttlespace_ew14,/area) +"cnO" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns13,/area) +"cnP" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew11,/area) +"cnQ" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; stopper = 0; tiles = 0},/turf/space/transit/east/shuttlespace_ew1,/area) "cnR" = (/obj/structure/holowindow,/turf/simulated/floor/holofloor{dir = 8; icon_state = "red"},/area/holodeck/source_thunderdomecourt) "cnS" = (/obj/structure/holowindow,/turf/simulated/floor/holofloor,/area/holodeck/source_thunderdomecourt) "cnT" = (/obj/structure/holowindow,/turf/simulated/floor/holofloor{dir = 4; icon_state = "red"},/area/holodeck/source_thunderdomecourt) -"cnU" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns12,/area) -"cnV" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; stopper = 0; tiles = 0},/turf/space/transit/east/shuttlespace_ew10,/area) +"cnU" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns12,/area) +"cnV" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; stopper = 0; tiles = 0},/turf/space/transit/east/shuttlespace_ew10,/area) "cnW" = (/obj/structure/holowindow{dir = 1},/turf/simulated/floor/holofloor{dir = 8; icon_state = "blue"},/area/holodeck/source_thunderdomecourt) "cnX" = (/obj/structure/holowindow{dir = 1},/turf/simulated/floor/holofloor,/area/holodeck/source_thunderdomecourt) "cnY" = (/obj/structure/holowindow{dir = 1},/turf/simulated/floor/holofloor{dir = 4; icon_state = "blue"},/area/holodeck/source_thunderdomecourt) "cnZ" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "blue"},/area/holodeck/source_boxingcourt) "coa" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "blue"},/area/holodeck/source_boxingcourt) -"cob" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns11,/area) -"coc" = (/obj/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew10,/area) -"cod" = (/obj/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew12,/area) +"cob" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns11,/area) +"coc" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew10,/area) +"cod" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew12,/area) "coe" = (/turf/simulated/floor/holofloor{icon = 'beach.dmi'; icon_state = "sand"; name = "Soft sand"},/area/holodeck/source_beach) "cof" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "blue"},/area/holodeck/source_thunderdomecourt) "cog" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "blue"},/area/holodeck/source_thunderdomecourt) -"coh" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns10,/area) -"coi" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns9,/area) +"coh" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns10,/area) +"coi" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns9,/area) "coj" = (/turf/simulated/floor/holofloor{icon = 'icons/misc/beach2.dmi'; icon_state = "sandwater"; name = "Beach Front"},/area/holodeck/source_beach) "cok" = (/turf/simulated/floor/holofloor{icon_state = "bluecorner"},/area/holodeck/source_thunderdomecourt) "col" = (/turf/simulated/floor/holofloor{icon_state = "blue"},/area/holodeck/source_thunderdomecourt) @@ -6150,7 +6150,7 @@ "con" = (/turf/simulated/floor/holofloor{icon_state = "bluecorner"},/area/holodeck/source_boxingcourt) "coo" = (/turf/simulated/floor/holofloor{icon_state = "blue"},/area/holodeck/source_boxingcourt) "cop" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "bluecorner"},/area/holodeck/source_boxingcourt) -"coq" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns8,/area) +"coq" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns8,/area) "cor" = (/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/simulated/floor/holofloor{icon = 'beach.dmi'; icon_plating = "water"; icon_regular_floor = "water"; icon_state = "water"; name = "Water"},/area/holodeck/source_beach) "cos" = (/turf/simulated/floor/holofloor{dir = 10; icon_state = "blue"},/area/holodeck/source_thunderdomecourt) "cot" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/under/color/green,/obj/item/weapon/melee/energy/sword/holosword/green,/turf/simulated/floor/holofloor{dir = 6; icon_state = "blue"},/area/holodeck/source_thunderdomecourt) @@ -6161,12 +6161,12 @@ "coy" = (/obj/structure/table/holotable,/obj/item/clothing/gloves/boxing/hologlove,/turf/simulated/floor/holofloor{dir = 6; icon_state = "blue"},/area/holodeck/source_boxingcourt) "coz" = (/obj/structure/table/holotable,/obj/item/clothing/gloves/boxing/hologlove,/turf/simulated/floor/holofloor{dir = 10; icon_state = "blue"},/area/holodeck/source_boxingcourt) "coA" = (/turf/simulated/floor/holofloor{dir = 6; icon_state = "blue"},/area/holodeck/source_boxingcourt) -"coB" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns7,/area) +"coB" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns7,/area) "coC" = (/turf/unsimulated/wall{tag = "icon-iron5"; icon = 'mineral_walls.dmi'; icon_state = "iron5"},/area) "coD" = (/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/wall{tag = "icon-iron12"; icon = 'mineral_walls.dmi'; icon_state = "iron12"},/area) "coE" = (/turf/unsimulated/wall{tag = "icon-iron13"; icon = 'mineral_walls.dmi'; icon_state = "iron13"},/area) "coF" = (/turf/unsimulated/wall{tag = "icon-iron9"; icon = 'mineral_walls.dmi'; icon_state = "iron9"},/area) -"coG" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns6,/area) +"coG" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns6,/area) "coH" = (/turf/space,/area/shuttle/escape_pod1/centcom) "coI" = (/turf/space,/area/shuttle/escape_pod2/centcom) "coJ" = (/turf/space,/area/shuttle/escape_pod3/centcom) @@ -6229,14 +6229,14 @@ "cpO" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/centcom/evac) "cpP" = (/obj/machinery/sleeper,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/centcom/evac) "cpQ" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-burst_l (WEST)"; icon_state = "burst_l"; dir = 8},/turf/space,/area/centcom/evac) -"cpR" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns15,/area) -"cpS" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns4,/area) -"cpT" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns14,/area) -"cpU" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 4; name = "thrower_escapeshuttletop(right)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns1,/area) -"cpV" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns11,/area) -"cpW" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns2,/area) -"cpX" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 4; name = "thrower_escapeshuttletop(right)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns3,/area) -"cpY" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns14,/area) +"cpR" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns15,/area) +"cpS" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns4,/area) +"cpT" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns14,/area) +"cpU" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 4; name = "thrower_escapeshuttletop(right)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns1,/area) +"cpV" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns11,/area) +"cpW" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns2,/area) +"cpX" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 4; name = "thrower_escapeshuttletop(right)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns3,/area) +"cpY" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns14,/area) "cpZ" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s5"; icon_state = "swall_s5"; dir = 2},/area/centcom/evac) "cqa" = (/obj/machinery/computer/secure_data,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/centcom/evac) "cqb" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/centcom/evac) @@ -6244,12 +6244,12 @@ "cqd" = (/turf/space/transit/north/shuttlespace_ns9,/area/shuttle/escape_pod1/transit) "cqe" = (/turf/space/transit/north/shuttlespace_ns4,/area/shuttle/escape_pod1/transit) "cqf" = (/turf/space/transit/north/shuttlespace_ns6,/area/shuttle/escape_pod1/transit) -"cqg" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns10,/area) -"cqh" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns1,/area) +"cqg" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns10,/area) +"cqh" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns1,/area) "cqi" = (/turf/space/transit/north/shuttlespace_ns11,/area/shuttle/escape_pod2/transit) "cqj" = (/turf/space/transit/north/shuttlespace_ns1,/area/shuttle/escape_pod2/transit) "cqk" = (/turf/space/transit/north/shuttlespace_ns7,/area/shuttle/escape_pod2/transit) -"cql" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns13,/area) +"cql" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns13,/area) "cqm" = (/obj/machinery/door/window/northleft{base_state = "right"; dir = 8; icon_state = "right"; req_access_txt = "100"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/centcom/evac) "cqn" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/PDAbox{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/id_kit{pixel_x = 2},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/centcom/evac) "cqo" = (/obj/structure/table,/obj/item/weapon/book/manual/medical_cloning{pixel_y = 6},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/centcom/evac) @@ -6259,29 +6259,29 @@ "cqs" = (/turf/space/transit/north/shuttlespace_ns8,/area/shuttle/escape_pod1/transit) "cqt" = (/turf/space/transit/north/shuttlespace_ns3,/area/shuttle/escape_pod1/transit) "cqu" = (/turf/space/transit/north/shuttlespace_ns5,/area/shuttle/escape_pod1/transit) -"cqv" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns9,/area) +"cqv" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns9,/area) "cqw" = (/turf/space/transit/north/shuttlespace_ns10,/area/shuttle/escape_pod2/transit) "cqx" = (/turf/space/transit/north/shuttlespace_ns15,/area/shuttle/escape_pod2/transit) "cqy" = (/turf/space/transit/north/shuttlespace_ns6,/area/shuttle/escape_pod2/transit) -"cqz" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns12,/area) +"cqz" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns12,/area) "cqA" = (/turf/space/transit/north/shuttlespace_ns7,/area/shuttle/escape_pod1/transit) "cqB" = (/turf/space/transit/north/shuttlespace_ns2,/area/shuttle/escape_pod1/transit) -"cqC" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns8,/area) +"cqC" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns8,/area) "cqD" = (/turf/space/transit/north/shuttlespace_ns9,/area/shuttle/escape_pod2/transit) "cqE" = (/turf/space/transit/north/shuttlespace_ns14,/area/shuttle/escape_pod2/transit) "cqF" = (/turf/space/transit/north/shuttlespace_ns5,/area/shuttle/escape_pod2/transit) "cqG" = (/turf/space/transit/north/shuttlespace_ns1,/area/shuttle/escape_pod1/transit) -"cqH" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns7,/area) +"cqH" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns7,/area) "cqI" = (/turf/space/transit/north/shuttlespace_ns8,/area/shuttle/escape_pod2/transit) "cqJ" = (/turf/space/transit/north/shuttlespace_ns13,/area/shuttle/escape_pod2/transit) "cqK" = (/turf/space/transit/north/shuttlespace_ns4,/area/shuttle/escape_pod2/transit) -"cqL" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns6,/area) -"cqM" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns5,/area) -"cqN" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns4,/area) +"cqL" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns6,/area) +"cqM" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns5,/area) +"cqN" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns4,/area) "cqO" = (/turf/space/transit/north/shuttlespace_ns13,/area/shuttle/escape_pod3/transit) "cqP" = (/turf/space/transit/north/shuttlespace_ns5,/area/shuttle/escape_pod3/transit) "cqQ" = (/turf/space/transit/north/shuttlespace_ns15,/area/shuttle/escape_pod3/transit) -"cqR" = (/obj/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns3,/area) +"cqR" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; tiles = 0},/turf/space/transit/north/shuttlespace_ns3,/area) "cqS" = (/turf/space/transit/north/shuttlespace_ns12,/area/shuttle/escape_pod3/transit) "cqT" = (/turf/space/transit/north/shuttlespace_ns4,/area/shuttle/escape_pod3/transit) "cqU" = (/turf/space/transit/north/shuttlespace_ns14,/area/shuttle/escape_pod3/transit)