diff --git a/code/controllers/_DynamicAreaLighting_TG.dm b/code/controllers/_DynamicAreaLighting_TG.dm index 519b5807086..df8e2ecbd2f 100644 --- a/code/controllers/_DynamicAreaLighting_TG.dm +++ b/code/controllers/_DynamicAreaLighting_TG.dm @@ -274,11 +274,11 @@ area if(!src) return if(light < 0) light = 0 - luminosity = 0 +// luminosity = 0 else if(light > lighting_controller.lighting_states) light = lighting_controller.lighting_states - luminosity = 1 +// luminosity = 1 if(lighting_overlay) overlays -= lighting_overlay diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index e4c8f64b9fe..316161589bc 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -231,7 +231,7 @@ var/list/mechtoys = list( for(var/atom/movable/MA in shuttle) if(MA.anchored) continue - if(istype(MA,/obj/structure/closet)) + if(istype(MA,/obj/structure/closet/crate)) points += points_per_crate var/find_slip = 1 diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 2533a8fa978..17289687a01 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1205,18 +1205,17 @@ var/global/floorIsLava = 0 if (href_list["adminplayerobservejump"]) var/mob/M = locate(href_list["adminplayerobservejump"]) if(src && src.owner) + var/client/C if(istype(src.owner,/client)) - var/client/cl = src.owner - cl.admin_observe() - sleep(2) - cl.jumptomob(M) + C = src.owner else if(ismob(src.owner)) var/mob/MO = src.owner - if(MO.client) - var/client/cl = MO.client - cl.admin_observe() - sleep(2) - cl.jumptomob(M) + C = MO.client + if(C) + if(state == 1) + C.admin_ghost() + sleep(2) + C.jumptomob(M) if (href_list["adminchecklaws"]) if(src && src.owner) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index f91e691c723..8ce617b4cae 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -22,7 +22,7 @@ holder = new /obj/admins(src) holder.rank = rank - +/* Unused if(!holder.state) var/state = alert("Which state do you want the admin to begin in?", "Admin-state", "Play", "Observe", "Neither") if(state == "Play") @@ -35,7 +35,7 @@ return else del(holder) - return + return */ switch (rank) if ("Game Master") @@ -125,8 +125,7 @@ verbs += /client/proc/cmd_admin_subtle_message //verbs += /client/proc/warn - was never used verbs += /client/proc/dsay - verbs += /client/proc/admin_play - verbs += /client/proc/admin_observe + verbs += /client/proc/admin_ghost verbs += /client/proc/game_panel verbs += /client/proc/player_panel verbs += /client/proc/player_panel_new @@ -370,8 +369,7 @@ verbs -= /client/proc/cmd_admin_subtle_message //verbs -= /client/proc/warn verbs -= /client/proc/dsay - verbs -= /client/proc/admin_play - verbs -= /client/proc/admin_observe + verbs -= /client/proc/admin_ghost verbs -= /client/proc/game_panel verbs -= /client/proc/player_panel verbs -= /client/proc/unban_panel @@ -424,51 +422,30 @@ verbs -= /client/proc/togglebuildmodeself verbs -= /client/proc/kill_airgroup verbs -= /client/proc/debug_controller + verbs -= /client/proc/startSinglo verbs -= /client/proc/check_ai_laws verbs -= /client/proc/cmd_debug_mob_lists + verbs -= /obj/admins/proc/access_news_network verbs -= /client/proc/one_click_antag return - -/client/proc/admin_observe() +/client/proc/admin_ghost() set category = "Admin" - set name = "Set Observe" - if(!holder) - alert("You are not an admin") - return - - verbs -= /client/proc/admin_play - spawn( 1200 ) - verbs += /client/proc/admin_play - var/rank = holder.rank - clear_admin_verbs() - holder.state = 2 - update_admins(rank) - if(!istype(mob, /mob/dead/observer)) - mob.ghostize(1) - src << "\blue You are now observing" - feedback_add_details("admin_verb","O") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/client/proc/admin_play() - set category = "Admin" - set name = "Set Play" - if(!holder) - alert("You are not an admin") - return - verbs -= /client/proc/admin_observe - spawn( 1200 ) - verbs += /client/proc/admin_observe - var/rank = holder.rank - clear_admin_verbs() - holder.state = 1 - update_admins(rank) - if(istype(mob, /mob/dead/observer)) + set name = "Aghost" + if(!holder) return + if(istype(mob,/mob/dead/observer)) + //re-enter var/mob/dead/observer/ghost = mob - ghost.can_reenter_corpse = 1 //just in-case. + ghost.can_reenter_corpse = 1 //just in-case. ghost.reenter_corpse() - deadchat = 0 - src << "\blue You are now playing" - feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + else + //ghostize + var/mob/body = mob + body.ghostize(1) + body.key = "@[key]" //Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus + feedback_add_details("admin_verb","O") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + /client/proc/get_admin_state() set name = "Get Admin State" @@ -770,8 +747,7 @@ verbs += /client/proc/togglebuildmodeself verbs += /client/proc/dsay - verbs += /client/proc/admin_play - verbs += /client/proc/admin_observe + verbs += /client/proc/admin_ghost verbs += /client/proc/game_panel verbs += /client/proc/player_panel verbs += /client/proc/cmd_admin_subtle_message diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index 683d79e8fa2..db4e550d6a7 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -1,6 +1,6 @@ /obj/item/device/onetankbomb name = "bomb" - icon = 'tank.dmi' + icon = 'icons/obj/tank.dmi' item_state = "assembly" throwforce = 5 w_class = 3.0 diff --git a/code/modules/mob/dead/observer/login.dm b/code/modules/mob/dead/observer/login.dm index 444cae89444..0734d3d6355 100644 --- a/code/modules/mob/dead/observer/login.dm +++ b/code/modules/mob/dead/observer/login.dm @@ -1,2 +1,7 @@ /mob/dead/observer/Login() - return ..() \ No newline at end of file + ..() + if(client.holder && client.holder.state != 2) + client.holder.state = 2 + var/rank = client.holder.rank + client.clear_admin_verbs() + client.update_admins(rank) \ No newline at end of file diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 568c6691e23..5db44dfcfd0 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -81,6 +81,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp else var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst still alive you may not play again this round! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body") if(response != "Ghost") return //didn't want to ghost after-all + resting = 1 ghostize(0) //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3 return @@ -137,7 +138,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!(mind && mind.current && can_reenter_corpse)) src << "You have no body." return - if(mind.current.key) //makes sure we don't accidentally kick any clients + if(mind.current.key && copytext(mind.current.key,1,2)!="@") //makes sure we don't accidentally kick any clients usr << "Another consciousness is in your body...It is resisting you." return if(mind.current.ajourn && mind.current.stat != DEAD) //check if the corpse is astral-journeying (it's client ghosted using a cultist rune). @@ -146,13 +147,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp usr << "The astral cord that ties your body and your spirit has been severed. You are likely to wander the realm beyond until your body is finally dead and thus reunited with you." return mind.current.ajourn=0 - if(client.holder && client.holder.state == 2) //TODO: should be handled by Login/Logout ~Carn - var/rank = client.holder.rank - client.clear_admin_verbs() - client.holder.state = 1 - client.update_admins(rank) - mind.current.key = key + return 1 /mob/dead/observer/proc/dead_tele() set category = "Ghost" diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm index b907b359234..f4ce6e51f8b 100644 --- a/code/modules/mob/living/login.dm +++ b/code/modules/mob/living/login.dm @@ -19,6 +19,14 @@ if(mind in ticker.mode:syndicates) ticker.mode.update_all_synd_icons() + + if(client.holder && client.holder.state != 1) + client.holder.state = 1 + var/rank = client.holder.rank + client.clear_admin_verbs() + client.update_admins(rank) + return . + //This stuff needs to be merged from cloning.dm but I'm not in the mood to be shouted at for breaking all the things :< ~Carn /* clones switch(ticker.mode.name) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 768801d7209..566d2621b6b 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -365,14 +365,8 @@ var/list/slot_equipment_priority = list( \ del(M) return - - - if(client && client.holder && (client.holder.state == 2)) - client.admin_play() - return - - M.key = client.key - M.Login() + M.key = key +// M.Login() //wat return /mob/verb/changes() diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm index 81557916a5a..244743fe573 100644 --- a/code/modules/mob/screen.dm +++ b/code/modules/mob/screen.dm @@ -371,12 +371,6 @@ if("hurt") usr.a_intent = "help" usr.hud_used.action_intent.icon_state = "intent_help" - /*if (usr.hud_used.show_intent_icons) - usr.hud_used.show_intent_icons = 0 - usr.client.screen -= usr.hud_used.intent_small_hud_objects - else - usr.hud_used.show_intent_icons = 1 - usr.client.screen += usr.hud_used.intent_small_hud_objects*/ //Small intent icons if(issilicon(usr)) if(usr.a_intent == "help") usr.a_intent = "hurt" @@ -503,12 +497,12 @@ if(alert(src,"You sure you want to sleep for a while?","Sleep","Yes","No") == "Yes") usr.sleeping = 20 //Short nap -/mob/living/carbon/verb/lay_down() - set name = "Lay down / Get up" +/mob/living/verb/lay_down() + set name = "Rest" set category = "IC" - usr.resting = !( usr.resting ) - usr << "\blue You are now [(usr.resting) ? "resting" : "getting up"]" + resting = !resting + src << "\blue You are now [resting ? "resting" : "getting up"]" /mob/verb/quick_equip() set name = "quick-equip" diff --git a/html/changelog.html b/html/changelog.html index 1e8790b4e7e..f6bd17cd6fc 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -48,6 +48,18 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit tho. Thanks. --> +
+

17 September 2012

+

Carn updated:

+ +
+

13 September 2012

Carn updated:

diff --git a/tgstation.dme b/tgstation.dme index d60cb72636c..0736b769892 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6,220 +6,6 @@ // BEGIN_FILE_DIR #define FILE_DIR . -#define FILE_DIR "code" -#define FILE_DIR "code/ATMOSPHERICS" -#define FILE_DIR "code/ATMOSPHERICS/components" -#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices" -#define FILE_DIR "code/ATMOSPHERICS/components/trinary_devices" -#define FILE_DIR "code/ATMOSPHERICS/components/unary" -#define FILE_DIR "code/controllers" -#define FILE_DIR "code/datums" -#define FILE_DIR "code/datums/diseases" -#define FILE_DIR "code/datums/helper_datums" -#define FILE_DIR "code/datums/organs" -#define FILE_DIR "code/datums/spells" -#define FILE_DIR "code/defines" -#define FILE_DIR "code/defines/obj" -#define FILE_DIR "code/defines/procs" -#define FILE_DIR "code/FEA" -#define FILE_DIR "code/game" -#define FILE_DIR "code/game/area" -#define FILE_DIR "code/game/gamemodes" -#define FILE_DIR "code/game/gamemodes/blob" -#define FILE_DIR "code/game/gamemodes/blob/blobs" -#define FILE_DIR "code/game/gamemodes/changeling" -#define FILE_DIR "code/game/gamemodes/cult" -#define FILE_DIR "code/game/gamemodes/events" -#define FILE_DIR "code/game/gamemodes/events/holidays" -#define FILE_DIR "code/game/gamemodes/extended" -#define FILE_DIR "code/game/gamemodes/malfunction" -#define FILE_DIR "code/game/gamemodes/meteor" -#define FILE_DIR "code/game/gamemodes/nuclear" -#define FILE_DIR "code/game/gamemodes/revolution" -#define FILE_DIR "code/game/gamemodes/sandbox" -#define FILE_DIR "code/game/gamemodes/traitor" -#define FILE_DIR "code/game/gamemodes/wizard" -#define FILE_DIR "code/game/jobs" -#define FILE_DIR "code/game/jobs/job" -#define FILE_DIR "code/game/machinery" -#define FILE_DIR "code/game/machinery/atmoalter" -#define FILE_DIR "code/game/machinery/bots" -#define FILE_DIR "code/game/machinery/camera" -#define FILE_DIR "code/game/machinery/computer" -#define FILE_DIR "code/game/machinery/doors" -#define FILE_DIR "code/game/machinery/embedded_controller" -#define FILE_DIR "code/game/machinery/kitchen" -#define FILE_DIR "code/game/machinery/pipe" -#define FILE_DIR "code/game/machinery/telecomms" -#define FILE_DIR "code/game/mecha" -#define FILE_DIR "code/game/mecha/combat" -#define FILE_DIR "code/game/mecha/equipment" -#define FILE_DIR "code/game/mecha/equipment/tools" -#define FILE_DIR "code/game/mecha/equipment/weapons" -#define FILE_DIR "code/game/mecha/medical" -#define FILE_DIR "code/game/mecha/working" -#define FILE_DIR "code/game/objects" -#define FILE_DIR "code/game/objects/effects" -#define FILE_DIR "code/game/objects/effects/decals" -#define FILE_DIR "code/game/objects/effects/decals/Cleanable" -#define FILE_DIR "code/game/objects/effects/spawners" -#define FILE_DIR "code/game/objects/items" -#define FILE_DIR "code/game/objects/items/devices" -#define FILE_DIR "code/game/objects/items/devices/PDA" -#define FILE_DIR "code/game/objects/items/devices/radio" -#define FILE_DIR "code/game/objects/items/robot" -#define FILE_DIR "code/game/objects/items/stacks" -#define FILE_DIR "code/game/objects/items/stacks/sheets" -#define FILE_DIR "code/game/objects/items/stacks/tiles" -#define FILE_DIR "code/game/objects/items/weapons" -#define FILE_DIR "code/game/objects/items/weapons/grenades" -#define FILE_DIR "code/game/objects/items/weapons/implants" -#define FILE_DIR "code/game/objects/items/weapons/secstorage" -#define FILE_DIR "code/game/objects/items/weapons/storage" -#define FILE_DIR "code/game/objects/items/weapons/tanks" -#define FILE_DIR "code/game/objects/structures" -#define FILE_DIR "code/game/objects/structures/crates_lockers" -#define FILE_DIR "code/game/objects/structures/crates_lockers/closets" -#define FILE_DIR "code/game/objects/structures/crates_lockers/closets/secure" -#define FILE_DIR "code/game/objects/structures/stool_bed_chair_nest" -#define FILE_DIR "code/game/turfs" -#define FILE_DIR "code/game/turfs/simulated" -#define FILE_DIR "code/game/turfs/space" -#define FILE_DIR "code/game/turfs/unsimulated" -#define FILE_DIR "code/game/vehicles" -#define FILE_DIR "code/game/vehicles/airtight" -#define FILE_DIR "code/game/verbs" -#define FILE_DIR "code/js" -#define FILE_DIR "code/modules" -#define FILE_DIR "code/modules/admin" -#define FILE_DIR "code/modules/admin/DB ban" -#define FILE_DIR "code/modules/admin/verbs" -#define FILE_DIR "code/modules/assembly" -#define FILE_DIR "code/modules/awaymissions" -#define FILE_DIR "code/modules/awaymissions/maploader" -#define FILE_DIR "code/modules/client" -#define FILE_DIR "code/modules/clothing" -#define FILE_DIR "code/modules/clothing/glasses" -#define FILE_DIR "code/modules/clothing/gloves" -#define FILE_DIR "code/modules/clothing/head" -#define FILE_DIR "code/modules/clothing/masks" -#define FILE_DIR "code/modules/clothing/shoes" -#define FILE_DIR "code/modules/clothing/spacesuits" -#define FILE_DIR "code/modules/clothing/suits" -#define FILE_DIR "code/modules/clothing/under" -#define FILE_DIR "code/modules/clothing/under/jobs" -#define FILE_DIR "code/modules/critters" -#define FILE_DIR "code/modules/critters/hivebots" -#define FILE_DIR "code/modules/detectivework" -#define FILE_DIR "code/modules/flufftext" -#define FILE_DIR "code/modules/food" -#define FILE_DIR "code/modules/library" -#define FILE_DIR "code/modules/liquid" -#define FILE_DIR "code/modules/mining" -#define FILE_DIR "code/modules/mob" -#define FILE_DIR "code/modules/mob/dead" -#define FILE_DIR "code/modules/mob/dead/observer" -#define FILE_DIR "code/modules/mob/living" -#define FILE_DIR "code/modules/mob/living/blob" -#define FILE_DIR "code/modules/mob/living/carbon" -#define FILE_DIR "code/modules/mob/living/carbon/alien" -#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid" -#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste" -#define FILE_DIR "code/modules/mob/living/carbon/alien/larva" -#define FILE_DIR "code/modules/mob/living/carbon/alien/special" -#define FILE_DIR "code/modules/mob/living/carbon/brain" -#define FILE_DIR "code/modules/mob/living/carbon/human" -#define FILE_DIR "code/modules/mob/living/carbon/metroid" -#define FILE_DIR "code/modules/mob/living/carbon/monkey" -#define FILE_DIR "code/modules/mob/living/silicon" -#define FILE_DIR "code/modules/mob/living/silicon/ai" -#define FILE_DIR "code/modules/mob/living/silicon/ai/freelook" -#define FILE_DIR "code/modules/mob/living/silicon/decoy" -#define FILE_DIR "code/modules/mob/living/silicon/pai" -#define FILE_DIR "code/modules/mob/living/silicon/robot" -#define FILE_DIR "code/modules/mob/living/simple_animal" -#define FILE_DIR "code/modules/mob/new_player" -#define FILE_DIR "code/modules/paperwork" -#define FILE_DIR "code/modules/power" -#define FILE_DIR "code/modules/power/antimatter" -#define FILE_DIR "code/modules/power/singularity" -#define FILE_DIR "code/modules/power/singularity/particle_accelerator" -#define FILE_DIR "code/modules/projectiles" -#define FILE_DIR "code/modules/projectiles/ammunition" -#define FILE_DIR "code/modules/projectiles/guns" -#define FILE_DIR "code/modules/projectiles/guns/energy" -#define FILE_DIR "code/modules/projectiles/guns/projectile" -#define FILE_DIR "code/modules/projectiles/projectile" -#define FILE_DIR "code/modules/reagents" -#define FILE_DIR "code/modules/reagents/reagent_containers" -#define FILE_DIR "code/modules/reagents/reagent_containers/food" -#define FILE_DIR "code/modules/reagents/reagent_containers/food/drinks" -#define FILE_DIR "code/modules/reagents/reagent_containers/food/drinks/bottle" -#define FILE_DIR "code/modules/reagents/reagent_containers/food/snacks" -#define FILE_DIR "code/modules/reagents/reagent_containers/glass" -#define FILE_DIR "code/modules/reagents/reagent_containers/glass/bottle" -#define FILE_DIR "code/modules/recycling" -#define FILE_DIR "code/modules/research" -#define FILE_DIR "code/modules/scripting" -#define FILE_DIR "code/modules/scripting/AST" -#define FILE_DIR "code/modules/scripting/AST/Operators" -#define FILE_DIR "code/modules/scripting/Implementations" -#define FILE_DIR "code/modules/scripting/Interpreter" -#define FILE_DIR "code/modules/scripting/Parser" -#define FILE_DIR "code/modules/scripting/Scanner" -#define FILE_DIR "code/modules/security levels" -#define FILE_DIR "code/unused" -#define FILE_DIR "code/unused/beast" -#define FILE_DIR "code/unused/computer2" -#define FILE_DIR "code/unused/disease2" -#define FILE_DIR "code/unused/gamemodes" -#define FILE_DIR "code/unused/hivebot" -#define FILE_DIR "code/unused/mining" -#define FILE_DIR "code/unused/optics" -#define FILE_DIR "code/unused/pda2" -#define FILE_DIR "code/unused/powerarmor" -#define FILE_DIR "code/unused/spacecraft" -#define FILE_DIR "code/WorkInProgress" -#define FILE_DIR "code/WorkInProgress/carn" -#define FILE_DIR "code/WorkInProgress/mapload" -#define FILE_DIR "code/WorkInProgress/organs" -#define FILE_DIR "code/WorkInProgress/virus2" -#define FILE_DIR "html" -#define FILE_DIR "icons" -#define FILE_DIR "icons/effects" -#define FILE_DIR "icons/mecha" -#define FILE_DIR "icons/misc" -#define FILE_DIR "icons/mob" -#define FILE_DIR "icons/obj" -#define FILE_DIR "icons/obj/assemblies" -#define FILE_DIR "icons/obj/atmospherics" -#define FILE_DIR "icons/obj/clothing" -#define FILE_DIR "icons/obj/doors" -#define FILE_DIR "icons/obj/machines" -#define FILE_DIR "icons/obj/pipes" -#define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/spideros_icons" -#define FILE_DIR "icons/Testing" -#define FILE_DIR "icons/turf" -#define FILE_DIR "icons/vehicles" -#define FILE_DIR "icons/vending_icons" -#define FILE_DIR "interface" -#define FILE_DIR "maps" -#define FILE_DIR "maps/RandomZLevels" -#define FILE_DIR "sound" -#define FILE_DIR "sound/AI" -#define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/effects" -#define FILE_DIR "sound/hallucinations" -#define FILE_DIR "sound/items" -#define FILE_DIR "sound/machines" -#define FILE_DIR "sound/mecha" -#define FILE_DIR "sound/misc" -#define FILE_DIR "sound/piano" -#define FILE_DIR "sound/voice" -#define FILE_DIR "sound/weapons" -#define FILE_DIR "tools" -#define FILE_DIR "tools/Redirector" // END_FILE_DIR // BEGIN_PREFERENCES @@ -949,6 +735,7 @@ #include "code\modules\mob\update_icons.dm" #include "code\modules\mob\dead\death.dm" #include "code\modules\mob\dead\observer\hud.dm" +#include "code\modules\mob\dead\observer\login.dm" #include "code\modules\mob\dead\observer\logout.dm" #include "code\modules\mob\dead\observer\observer.dm" #include "code\modules\mob\dead\observer\say.dm"