From d45073a5ab1a88682e1fd56e2e717da27c56eb74 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Tue, 28 May 2013 03:12:58 +0400 Subject: [PATCH 1/3] Added new item - hailer. Use in hand to make it say HALT! SECURITY! Should help in asking people to halt while running. --- baystation12.dme | 230 +-------------------- code/game/objects/items/devices/whistle.dm | 21 ++ sound/voice/halt.ogg | Bin 0 -> 10448 bytes 3 files changed, 25 insertions(+), 226 deletions(-) create mode 100644 code/game/objects/items/devices/whistle.dm create mode 100644 sound/voice/halt.ogg diff --git a/baystation12.dme b/baystation12.dme index 79f0e2de777..ef839733bc9 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -6,235 +6,14 @@ // BEGIN_FILE_DIR #define FILE_DIR . #define FILE_DIR "code" -#define FILE_DIR "code/__HELPERS" -#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/diseases/advance" -#define FILE_DIR "code/datums/diseases/advance/symptoms" -#define FILE_DIR "code/datums/helper_datums" -#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/autotraitor" -#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/epidemic" -#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/meme" -#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/magic" -#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/closets" -#define FILE_DIR "code/game/objects/closets/secure" -#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/melee" -#define FILE_DIR "code/game/objects/items/weapons/storage" -#define FILE_DIR "code/game/objects/items/weapons/tanks" -#define FILE_DIR "code/game/objects/storage" -#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/structure" -#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/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/permissionverbs" -#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/customitems" -#define FILE_DIR "code/modules/destilery" -#define FILE_DIR "code/modules/DetectiveWork" -#define FILE_DIR "code/modules/events" -#define FILE_DIR "code/modules/flufftext" -#define FILE_DIR "code/modules/food" -#define FILE_DIR "code/modules/genetics" -#define FILE_DIR "code/modules/icon generation" -#define FILE_DIR "code/modules/library" -#define FILE_DIR "code/modules/liquid" -#define FILE_DIR "code/modules/maps" -#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/living/simple_animal/friendly" -#define FILE_DIR "code/modules/mob/living/simple_animal/hostile" -#define FILE_DIR "code/modules/mob/living/simple_animal/hostile/retaliate" -#define FILE_DIR "code/modules/mob/new_player" -#define FILE_DIR "code/modules/organs" -#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/research/xenoarchaeology" -#define FILE_DIR "code/modules/research/xenoarchaeology/artifact" -#define FILE_DIR "code/modules/research/xenoarchaeology/artifact/effects" -#define FILE_DIR "code/modules/research/xenoarchaeology/finds" -#define FILE_DIR "code/modules/research/xenoarchaeology/machinery" -#define FILE_DIR "code/modules/research/xenoarchaeology/tools" -#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/modules/surgery" #define FILE_DIR "code/TriDimension" -#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/AI_Visibility" -#define FILE_DIR "code/WorkInProgress/animusstation" -#define FILE_DIR "code/WorkInProgress/Apples" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Economy" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jungle" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/ShieldGen" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter" -#define FILE_DIR "code/WorkInProgress/carn" -#define FILE_DIR "code/WorkInProgress/Chinsky" -#define FILE_DIR "code/WorkInProgress/Cib" -#define FILE_DIR "code/WorkInProgress/Cib/amorph" -#define FILE_DIR "code/WorkInProgress/Mini" -#define FILE_DIR "code/WorkInProgress/Mloc" -#define FILE_DIR "code/WorkInProgress/organs" -#define FILE_DIR "code/WorkInProgress/Ported" -#define FILE_DIR "code/WorkInProgress/Ported/Abi79" -#define FILE_DIR "code/WorkInProgress/Ported/Bureaucracy" -#define FILE_DIR "code/WorkInProgress/Ported/Spawners" -#define FILE_DIR "code/WorkInProgress/Sigyn" -#define FILE_DIR "code/WorkInProgress/Sigyn/Department Sec" -#define FILE_DIR "code/WorkInProgress/Sigyn/Softcurity" -#define FILE_DIR "code/WorkInProgress/SkyMarshal" #define FILE_DIR "code/WorkInProgress/Susan" -#define FILE_DIR "code/WorkInProgress/Tastyfish" -#define FILE_DIR "code/WorkInProgress/virus2" -#define FILE_DIR "code/WorkInProgress/virus2/Disease2" -#define FILE_DIR "code/WorkInProgress/Wrongnumber" -#define FILE_DIR "code/ZAS" #define FILE_DIR "html" #define FILE_DIR "icons" #define FILE_DIR "icons/48x48" @@ -257,9 +36,6 @@ #define FILE_DIR "icons/turf" #define FILE_DIR "icons/vending_icons" #define FILE_DIR "icons/xenoarch_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" @@ -278,7 +54,8 @@ #define FILE_DIR "sound/voice/Serithi" #define FILE_DIR "sound/weapons" #define FILE_DIR "tools" -#define FILE_DIR "tools/Redirector" +#define FILE_DIR "tools/AddToChangelog" +#define FILE_DIR "tools/AddToChangelog/AddToChangelog" // END_FILE_DIR // BEGIN_PREFERENCES #define DEBUG @@ -718,6 +495,7 @@ #include "code\game\objects\items\devices\transfer_valve.dm" #include "code\game\objects\items\devices\uplinks.dm" #include "code\game\objects\items\devices\violin.dm" +#include "code\game\objects\items\devices\whistle.dm" #include "code\game\objects\items\devices\PDA\cart.dm" #include "code\game\objects\items\devices\PDA\chatroom.dm" #include "code\game\objects\items\devices\PDA\PDA.dm" @@ -1013,7 +791,7 @@ #include "code\modules\DetectiveWork\detective_work.dm" #include "code\modules\DetectiveWork\evidence.dm" #include "code\modules\DetectiveWork\footprints_and_rag.dm" -#include "code\modules\detectivework\scanner.dm" +#include "code\modules\DetectiveWork\scanner.dm" #include "code\modules\events\alien_infestation.dm" #include "code\modules\events\blob.dm" #include "code\modules\events\brand_intelligence.dm" diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm new file mode 100644 index 00000000000..c735f40264f --- /dev/null +++ b/code/game/objects/items/devices/whistle.dm @@ -0,0 +1,21 @@ +/obj/item/device/hailer + name = "hailer" + desc = "Used by obese officers to save their breath for running." + icon_state = "voice0" + item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang) + w_class = 1.0 + flags = FPRINT | TABLEPASS| CONDUCT + + var/spamcheck = 0 + + +/obj/item/device/hailer/attack_self(mob/living/carbon/user as mob) + if (spamcheck) + return + + playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0) + user.visible_message("[user]'s [name] rasps, \"Halt! Security!\"") + + spamcheck = 1 + spawn(20) + spamcheck = 0 \ No newline at end of file diff --git a/sound/voice/halt.ogg b/sound/voice/halt.ogg new file mode 100644 index 0000000000000000000000000000000000000000..4885bc19483ec39e7ee03a97ae06542c7620d87d GIT binary patch literal 10448 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 Qfd9UELD>HD)&(j37v??a8~^|S literal 0 HcmV?d00001 From 6de8060545452c9be14c8298cd3df883e9e9f8f3 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sat, 1 Jun 2013 08:34:31 +0400 Subject: [PATCH 2/3] Added hailers to the Sec closets. --- .../objects/structures/crates_lockers/closets/secure/security.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index f6ad799900d..413333f397c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -186,6 +186,7 @@ new /obj/item/weapon/gun/energy/taser(src) new /obj/item/clothing/glasses/sunglasses/sechud(src) new /obj/item/taperoll/police(src) + new /obj/item/device/hailer return From 88f5a2a3b55118d80f69de1d0ea1ca8180a6b92a Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sat, 1 Jun 2013 17:20:13 +0400 Subject: [PATCH 3/3] Added this sound as emote to borgs. --- code/modules/mob/living/silicon/robot/emote.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 86d4e5d2f46..4fa8a543b98 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -198,6 +198,15 @@ m_type = 2 else src << "You are not THE LAW, pal." + + if("halt") + if (istype(module,/obj/item/weapon/robot_module/security)) + message = "[src]'s speakers skreech, \"Halt! Security!\"." + + playsound(src.loc, 'sound/voice/halt.ogg', 50, 0) + m_type = 2 + else + src << "You are not security." else src << text("Invalid Emote: []", act) if ((message && src.stat == 0))