From 2e8f1932a87e1436135075e4e4e11e53f097984b Mon Sep 17 00:00:00 2001 From: Erthilo Date: Thu, 7 Jun 2012 02:41:38 +0100 Subject: [PATCH] TG: - Deleted ERP.dmi - Moved some objects into /effect - Removed the debugger object Revision: r3739 Author: baloh.matevz --- code/WorkInProgress/buildmode.dm | 38 ++-- code/WorkInProgress/organs/organs.dm | 175 ++++++++-------- code/datums/helper_datums/tension.dm | 37 ---- code/defines/global.dm | 2 +- code/defines/obj.dm | 23 +- code/game/cellautomata.dm | 2 +- code/game/machinery/computer/computer.dm | 6 +- code/game/step_triggers.dm | 20 +- code/modules/flufftext/Hallucination.dm | 6 +- code/modules/mob/dead/observer/observer.dm | 4 +- .../modules/mob/living/silicon/robot/emote.dm | 39 ++-- code/modules/mob/mob_defines.dm | 2 +- icons/obj/ERP.dmi | Bin 1288 -> 0 bytes maps/tgstation.2.0.8.dmm | 196 +++++++++--------- 14 files changed, 246 insertions(+), 304 deletions(-) delete mode 100644 icons/obj/ERP.dmi 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 972ddab18f692342098f0bb8c2f70784c5b2f7cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1288 zcmV+j1^4=iP)V=-0C=1w$1w_oFc1aMI&+GT_M)q88i_~>bA=@^(F~}8B)He#!tT8m^Rik8 zvsrpVE|P9&OkGdvCtM>m#t*3&9(E6vuz>zK?ltX4=jS&~{p&5(*Ss#1Ku+8$=trY*5W1?b<~9e;EEme{?PM7XIDJrFE=t#Y^K1N%RS@9lgh)|hb+rh}cC zA)m^Xz5cE;@M71l*h`x`Vxdp~)3Ye8Uqfy($-vOJgNp+2;R~3RL2__II+rJJ^8Uc_0}Bo?()XPg300Ffpx_h8 z!DGm2e_|kRm{xgx%B%*uG|_!_16)6=n-gJhi*9=E7hyG1cp+@ zXkwhiL;`L429^RCK1Qz&6Y}Zp3kvY+b9=hG+PBft)=J|8?Sw-S0u42IW(hfKv-QEP zWnV(`0;r4BwpUdJnMvh<9Oi6+kew#Hv<_h?_;p{U{*?i&saqbKm`bAt^I#Q89t7r^Y4A9&6 z<$=j;lDhgjR)(VljcSBYkt7Mnbu0C*8~|V}eQPk2&fqhAJi1{M8`rf_qv#~f*^0;T zyZ|&+#qwMn2S&!mv9eP{mMr13-lI<}3P5vHODq~)L8vB-X$VAM8MWb6oV$3@+t>Ye zccpq#IUkefckkZ(PS1NkMjN6mUDAl=*Kss~>$>Q!gy&gUmc>M3jDh}v!Smu&N7*t=H#&xgYmEX_MAC= zdU7u9JC@*=OP9PzLp>$irC9W^Z5!LR5srrY&H9pG;eS*+{~iqDT# zEHN>0ozFl0xasNG&N(wMXAg9Ab}kE4Rk!#8{)XnYEzhpqxFM#gI*JfzhKiy2FnmE= yr@%KS`}dEHj{X21p6BsZZ|}J|oy!4OjQAU8Ew-tzMrhFh0000