From 7544ae573f67473a1a49f2cddbaf3c38058ea9a8 Mon Sep 17 00:00:00 2001 From: variableundefined <40092670+variableundefined@users.noreply.github.com> Date: Sun, 28 Oct 2018 23:10:37 +0800 Subject: [PATCH 01/82] Add in squeak component and refactor mouse, bikehorn, clown suit to use it. --- code/__DEFINES/components.dm | 4 +- code/__DEFINES/is_helpers.dm | 1 + code/_onclick/item_attack.dm | 6 ++ code/datums/components/squeak.dm | 68 ++++++++++++++++++ code/game/atoms.dm | 16 ++++- code/game/atoms_movable.dm | 3 +- code/game/gamemodes/blob/theblob.dm | 6 +- code/game/objects/items.dm | 3 + .../game/objects/items/weapons/clown_items.dm | 40 ++++------- code/game/objects/structures/watercloset.dm | 4 +- code/game/turfs/turf.dm | 1 + code/modules/clothing/under/jobs/civilian.dm | 8 ++- code/modules/customitems/item_defines.dm | 2 +- .../living/simple_animal/friendly/mouse.dm | 30 ++------ paradise.dme | 1 + sound/items/toysqueak1.ogg | Bin 0 -> 12956 bytes sound/items/toysqueak2.ogg | Bin 0 -> 14781 bytes sound/items/toysqueak3.ogg | Bin 0 -> 13778 bytes 18 files changed, 127 insertions(+), 66 deletions(-) create mode 100644 code/datums/components/squeak.dm create mode 100644 sound/items/toysqueak1.ogg create mode 100644 sound/items/toysqueak2.ogg create mode 100644 sound/items/toysqueak3.ogg diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm index 0a4ac519d9e..3b31e34b2f4 100644 --- a/code/__DEFINES/components.dm +++ b/code/__DEFINES/components.dm @@ -47,9 +47,9 @@ //End positions #define COMPONENT_EXNAME_CHANGED 1 #define COMSIG_ATOM_ENTERED "atom_entered" //from base of atom/Entered(): (atom/movable/entering, /atom) +#define COMSIG_ATOM_EXITED "atom_exited" //from base of atom/Exited(): (atom/movable/exiting, atom/newloc) #define COMSIG_ATOM_EXIT "atom_exit" //from base of atom/Exit(): (/atom/movable/exiting, /atom/newloc) #define COMPONENT_ATOM_BLOCK_EXIT 1 -#define COMSIG_ATOM_EXITED "atom_exited" //from base of atom/Exited(): (atom/movable/exiting, atom/newloc) #define COMSIG_ATOM_EX_ACT "atom_ex_act" //from base of atom/ex_act(): (severity, target) #define COMSIG_ATOM_EMP_ACT "atom_emp_act" //from base of atom/emp_act(): (severity) #define COMSIG_ATOM_FIRE_ACT "atom_fire_act" //from base of atom/fire_act(): (exposed_temperature, exposed_volume) @@ -106,9 +106,9 @@ #define COMSIG_MOVABLE_MOVED "movable_moved" //from base of atom/movable/Moved(): (/atom, dir) #define COMSIG_MOVABLE_CROSS "movable_cross" //from base of atom/movable/Cross(): (/atom/movable) #define COMSIG_MOVABLE_CROSSED "movable_crossed" //from base of atom/movable/Crossed(): (/atom/movable) +#define COMSIG_MOVABLE_UNCROSSED "movable_uncrossed" //from base of atom/movable/Uncrossed(): (/atom/movable) #define COMSIG_MOVABLE_UNCROSS "movable_uncross" //from base of atom/movable/Uncross(): (/atom/movable) #define COMPONENT_MOVABLE_BLOCK_UNCROSS 1 -#define COMSIG_MOVABLE_UNCROSSED "movable_uncrossed" //from base of atom/movable/Uncrossed(): (/atom/movable) #define COMSIG_MOVABLE_BUMP "movable_bump" //from base of atom/movable/Bump(): (/atom) #define COMSIG_MOVABLE_IMPACT "movable_impact" //from base of atom/movable/throw_impact(): (/atom/hit_atom, /datum/thrownthing/throwingdatum) #define COMSIG_MOVABLE_IMPACT_ZONE "item_impact_zone" //from base of mob/living/hitby(): (mob/living/target, hit_zone) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 2862010d316..c2e56d8338c 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -11,6 +11,7 @@ #define isconstruct(A) (istype(A, /mob/living/simple_animal/hostile/construct)) //Objects +#define isitem(A) (istype(A, /obj/item)) #define ismecha(A) (istype(A, /obj/mecha)) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 9e8b9b9c3a6..58e3305a45b 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -7,6 +7,8 @@ // Called when the item is in the active hand, and clicked; alternately, there is an 'activate held object' verb or you can hit pagedown. /obj/item/proc/attack_self(mob/user) + if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_SELF, user) & COMPONENT_NO_INTERACT) + return return /obj/item/proc/pre_attackby(atom/A, mob/living/user, params) //do stuff before attackby! @@ -28,6 +30,8 @@ return I.attack(src, user) /obj/item/proc/attack(mob/living/M, mob/living/user, def_zone) + SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user) + SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user) if(flags & (NOBLUDGEON)) return 0 @@ -74,6 +78,8 @@ //the equivalent of the standard version of attack() but for object targets. /obj/item/proc/attack_obj(obj/O, mob/living/user) + if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_OBJ, O, user) & COMPONENT_NO_ATTACK_OBJ) + return if(flags & (NOBLUDGEON)) return user.changeNext_move(CLICK_CD_MELEE) diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm new file mode 100644 index 00000000000..7691e35ca11 --- /dev/null +++ b/code/datums/components/squeak.dm @@ -0,0 +1,68 @@ +// Squeak component ported over from tg +// Note to future coders: I decided to remove the special case for squeak cooldown on usage and instead opt for a universal 20 ticks cooldown to avoid squeak spam + +/datum/component/squeak + var/static/list/default_squeak_sounds = list('sound/items/toysqueak1.ogg'=1, 'sound/items/toysqueak2.ogg'=1, 'sound/items/toysqueak3.ogg'=1) + var/list/override_squeak_sounds + var/squeak_chance = 100 + var/volume = 30 + + // This is so shoes don't squeak every step + var/steps = 0 + var/step_delay = 1 + + // This is to stop squeak spam (Apply to both usage and normal triggering unlike tg which only apply it to use) + var/last_squeak = 0 + var/squeak_delay = 20 + +/datum/component/squeak/Initialize(custom_sounds, volume_override, chance_override, step_delay_override, squeak_delay_override) + if(!isatom(parent)) + return COMPONENT_INCOMPATIBLE + RegisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY), .proc/play_squeak) + if(ismovableatom(parent)) + RegisterSignal(parent, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_IMPACT), .proc/play_squeak) + RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, .proc/play_squeak_crossed) + if(isitem(parent)) + RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT, COMSIG_ITEM_ATTACK_SELF), .proc/play_squeak) + if(istype(parent, /obj/item/clothing/shoes)) + RegisterSignal(parent, COMSIG_SHOES_STEP_ACTION, .proc/step_squeak) + + override_squeak_sounds = custom_sounds + if(chance_override) + squeak_chance = chance_override + if(volume_override) + volume = volume_override + if(isnum(step_delay_override)) + step_delay = step_delay_override + if(isnum(squeak_delay_override)) + squeak_delay = squeak_delay_override + +/datum/component/squeak/proc/play_squeak() + if(last_squeak + squeak_delay >= world.time) + return + last_squeak = world.time + if(prob(squeak_chance)) + if(!override_squeak_sounds) + playsound(parent, pickweight(default_squeak_sounds), volume, 1, -1) + else + playsound(parent, pickweight(override_squeak_sounds), volume, 1, -1) + +/datum/component/squeak/proc/step_squeak() + if(steps > step_delay) + play_squeak() + steps = 0 + else + steps++ + +/datum/component/squeak/proc/play_squeak_crossed(atom/movable/AM) + if(isitem(AM)) + var/obj/item/I = AM + if(I.flags & ABSTRACT) + return + else if(istype(AM, /obj/item/projectile)) + var/obj/item/projectile/P = AM + if(P.original != parent) + return + var/atom/current_parent = parent + if(isturf(current_parent.loc)) + play_squeak() \ No newline at end of file diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 5ca34ceb57e..457915756bf 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -153,6 +153,7 @@ dir = newdir /atom/proc/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE) + SEND_SIGNAL(src, COMSIG_ATOM_HULK_ATTACK, user) if(does_attack_animation) user.changeNext_move(CLICK_CD_MELEE) add_attack_logs(user, src, "Punched with hulk powers") @@ -305,8 +306,8 @@ /atom/proc/ex_act() return -/atom/proc/blob_act() - return +/atom/proc/blob_act(obj/structure/blob/B) + SEND_SIGNAL(src, COMSIG_ATOM_BLOB_ACT, B) /atom/proc/fire_act() return @@ -734,3 +735,14 @@ var/list/blood_splatter_icons = list() if(!L) return null return L.AllowDrop() ? L : get_turf(L) + +/atom/Entered(atom/movable/AM, atom/oldLoc) + SEND_SIGNAL(src, COMSIG_ATOM_ENTERED, AM, oldLoc) + +/atom/Exit(atom/movable/AM, atom/newLoc) + . = ..() + if(SEND_SIGNAL(src, COMSIG_ATOM_EXIT, AM, newLoc) & COMPONENT_ATOM_BLOCK_EXIT) + return FALSE + +/atom/Exited(atom/movable/AM, atom/newLoc) + SEND_SIGNAL(src, COMSIG_ATOM_EXITED, AM, newLoc) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 36d3ce81ea2..5a081d610da 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -126,10 +126,11 @@ // Previously known as HasEntered() // This is automatically called when something enters your square /atom/movable/Crossed(atom/movable/AM) - return + SEND_SIGNAL(src, COMSIG_MOVABLE_CROSSED, AM) /atom/movable/Bump(atom/A, yes) //the "yes" arg is to differentiate our Bump proc from byond's, without it every Bump() call would become a double Bump(). if(A && yes) + SEND_SIGNAL(src, COMSIG_MOVABLE_BUMP, A) if(throwing) throwing.hit_atom(A) . = 1 diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 6d0084b9000..493c0da90c9 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -19,7 +19,7 @@ src.update_icon() ..(loc) for(var/atom/A in loc) - A.blob_act() + A.blob_act(src) return @@ -126,7 +126,7 @@ qdel(B) for(var/atom/A in T)//Hit everything in the turf - A.blob_act() + A.blob_act(src) return 1 /obj/structure/blob/ex_act(severity) @@ -141,7 +141,7 @@ /obj/structure/blob/Crossed(var/mob/living/L) ..() - L.blob_act() + L.blob_act(src) /obj/structure/blob/tesla_act(power) ..() diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 9af8b04580a..634407cfd02 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -310,6 +310,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d return ..() /obj/item/proc/hit_reaction(mob/living/carbon/human/owner, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) + SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, args) if(prob(final_block_chance)) owner.visible_message("[owner] blocks [attack_text] with [src]!") return 1 @@ -498,6 +499,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d /obj/item/throw_impact(atom/A) if(A && !QDELETED(A)) + SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, A) var/itempush = 1 if(w_class < WEIGHT_CLASS_BULKY) itempush = 0 // too light to push anything @@ -548,6 +550,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d return I == src /obj/item/Crossed(atom/movable/AM) + . = ..() if(prob(trip_chance) && ishuman(AM)) var/mob/living/carbon/human/H = AM on_trip(H) diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 895c2809cca..35ca810541a 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -18,35 +18,24 @@ hitsound = null throwforce = 3 w_class = WEIGHT_CLASS_TINY + var/list/honk_sounds = list('sound/items/bikehorn.ogg' = 1) throw_speed = 3 throw_range = 15 attack_verb = list("HONKED") - var/spam_flag = 0 - var/honk_sound = 'sound/items/bikehorn.ogg' - var/cooldowntime = 20 -/obj/item/bikehorn/attack(mob/living/carbon/M, mob/living/carbon/user) - if(!spam_flag) - playsound(loc, honk_sound, 50, 1, -1) //plays instead of tap.ogg! - return ..() - -/obj/item/bikehorn/attack_self(mob/user) - if(!spam_flag) - spam_flag = 1 - playsound(src.loc, honk_sound, 50, 1) - src.add_fingerprint(user) - spawn(cooldowntime) - spam_flag = 0 - return +/obj/item/bikehorn/Initialize() + . = ..() + AddComponent(/datum/component/squeak, honk_sounds, 50) +/obj/item/bikehorn/Crossed() + . = ..() /obj/item/bikehorn/airhorn name = "air horn" desc = "Damn son, where'd you find this?" icon_state = "air_horn" - honk_sound = 'sound/items/AirHorn2.ogg' - cooldowntime = 50 origin_tech = "materials=4;engineering=4" + honk_sounds = list('sound/items/airhorn2.ogg' = 1) /obj/item/bikehorn/golden name = "golden bike horn" @@ -63,11 +52,10 @@ ..() /obj/item/bikehorn/golden/proc/flip_mobs(mob/living/carbon/M, mob/user) - if(!spam_flag) - var/turf/T = get_turf(src) - for(M in ohearers(7, T)) - if(istype(M, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs) || H.ear_deaf) - continue - M.emote("flip") + var/turf/T = get_turf(src) + for(M in ohearers(7, T)) + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs) || H.ear_deaf) + continue + M.emote("flip") diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index e657e9f8538..b48774eb046 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -507,10 +507,8 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "rubberducky" item_state = "rubberducky" + honk_sounds = list('sound/items/squeaktoy.ogg' = 1) attack_verb = list("quacked", "squeaked") - honk_sound = 'sound/items/squeaktoy.ogg' //credit to DANMITCH3LL of freesound for this - - /obj/structure/sink name = "sink" diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index d7ed44c3c9a..7eb81c589e1 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -136,6 +136,7 @@ /turf/Entered(atom/movable/M, atom/OL, ignoreRest = 0) + ..() if(ismob(M)) var/mob/O = M if(!O.lastarea) diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 76bef3e056b..62ced953ae2 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -69,15 +69,17 @@ item_state = "clown" item_color = "clown" flags_size = ONESIZEFITSALL - var/honk_sound = 'sound/items/bikehorn.ogg' + +/obj/item/clothing/under/rank/clown/Initialize() + . = ..() + AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg' = 1), 50) /obj/item/clothing/under/rank/clown/hit_reaction() - playsound(loc, honk_sound, 50, 1, -1) if(ishuman(loc)) var/mob/living/carbon/human/H = loc if(H.mind && H.mind.assigned_role == "Clown") score_clownabuse++ - return 0 + return ..() /obj/item/clothing/under/rank/head_of_personnel desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"." diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 2c4703967d6..79a8c27b724 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1470,9 +1470,9 @@ icon = 'icons/obj/custom_items.dmi' lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' + honk_sounds = list('sound/items/teri_horn.ogg' = 1) icon_state = "teri_horn" item_state = "teri_horn" - honk_sound = 'sound/items/teri_horn.ogg' /obj/item/clothing/accessory/medal/fluff/elo //V-Force_Bomber: E.L.O. name = "distinguished medal of loyalty and excellence" diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 3ed45508b87..8d644b87c35 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -33,6 +33,10 @@ can_collar = 1 gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY +/mob/living/simple_animal/mouse/Initialize() + . = ..() + AddComponent(/datum/component/squeak, list('sound/effects/mousesqueek.ogg' = 1), 50) + /mob/living/simple_animal/mouse/handle_automated_speech() ..() if(prob(speak_chance)) @@ -81,39 +85,15 @@ get_scooped(M) ..() -//make mice fit under tables etc? this was hacky, and not working -/* -/mob/living/simple_animal/mouse/Move(var/dir) - - var/turf/target_turf = get_step(src,dir) - //CanReachThrough(src.loc, target_turf, src) - var/can_fit_under = 0 - if(target_turf.ZCanPass(get_turf(src),1)) - can_fit_under = 1 - - ..(dir) - if(can_fit_under) - src.loc = target_turf - for(var/d in cardinal) - var/turf/O = get_step(T,d) - //Simple pass check. - if(O.ZCanPass(T, 1) && !(O in open) && !(O in closed) && O in possibles) - open += O - */ - -///mob/living/simple_animal/mouse/restrained() //Hotfix to stop mice from doing things with MouseDrop -// return 1 - /mob/living/simple_animal/mouse/start_pulling(var/atom/movable/AM)//Prevents mouse from pulling things to_chat(src, "You are too small to pull anything.") return /mob/living/simple_animal/mouse/Crossed(AM as mob|obj) - if( ishuman(AM) ) + if(ishuman(AM)) if(!stat) var/mob/M = AM to_chat(M, "[bicon(src)] Squeek!") - M << 'sound/effects/mousesqueek.ogg' ..() /mob/living/simple_animal/mouse/death(gibbed) diff --git a/paradise.dme b/paradise.dme index 12ee7e0948d..ade13f254d7 100644 --- a/paradise.dme +++ b/paradise.dme @@ -260,6 +260,7 @@ #include "code\datums\cache\powermonitor.dm" #include "code\datums\components\_component.dm" #include "code\datums\components\material_container.dm" +#include "code\datums\components\squeak.dm" #include "code\datums\diseases\_disease.dm" #include "code\datums\diseases\_MobProcs.dm" #include "code\datums\diseases\anxiety.dm" diff --git a/sound/items/toysqueak1.ogg b/sound/items/toysqueak1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e64a6fb179d114ab0146593cbfa0c8171504649f GIT binary patch literal 12956 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 BufzZV literal 0 HcmV?d00001 diff --git a/sound/items/toysqueak2.ogg b/sound/items/toysqueak2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..fddf1edfb926c20dbfd01608870b6f09cd8809fd GIT binary patch literal 14781 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 literal 0 HcmV?d00001 diff --git a/sound/items/toysqueak3.ogg b/sound/items/toysqueak3.ogg new file mode 100644 index 0000000000000000000000000000000000000000..338f4d8aa90bb5188cb86eb5a9814974e0634b32 GIT binary patch literal 13778 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 literal 0 HcmV?d00001 From b5425869daf1493bb030cb64859bbde170ab342c Mon Sep 17 00:00:00 2001 From: variableundefined <40092670+variableundefined@users.noreply.github.com> Date: Mon, 5 Nov 2018 21:33:42 +0800 Subject: [PATCH 02/82] Most content fixed, except for blob act. --- code/datums/components/squeak.dm | 17 +++++++++++++++++ code/game/atoms.dm | 1 + code/game/objects/items/weapons/clown_items.dm | 3 --- code/modules/recycling/disposal.dm | 1 + 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm index 7691e35ca11..4a2ef8a0289 100644 --- a/code/datums/components/squeak.dm +++ b/code/datums/components/squeak.dm @@ -24,6 +24,8 @@ RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, .proc/play_squeak_crossed) if(isitem(parent)) RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT, COMSIG_ITEM_ATTACK_SELF), .proc/play_squeak) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) if(istype(parent, /obj/item/clothing/shoes)) RegisterSignal(parent, COMSIG_SHOES_STEP_ACTION, .proc/step_squeak) @@ -54,6 +56,12 @@ else steps++ +/datum/component/squeak/proc/on_equip(datum/source, mob/equipper, slot) + RegisterSignal(equipper, COMSIG_MOVABLE_DISPOSING, .proc/disposing_react, TRUE) + +/datum/component/squeak/proc/on_drop(datum/source, mob/user) + UnregisterSignal(user, COMSIG_MOVABLE_DISPOSING) + /datum/component/squeak/proc/play_squeak_crossed(atom/movable/AM) if(isitem(AM)) var/obj/item/I = AM @@ -65,4 +73,13 @@ return var/atom/current_parent = parent if(isturf(current_parent.loc)) + play_squeak() + +/datum/component/squeak/proc/disposing_react(datum/source, obj/structure/disposalholder/holder, obj/machinery/disposal/source) + //We don't need to worry about unregistering this signal as it will happen for us automaticaly when the holder is qdeleted + RegisterSignal(holder, COMSIG_ATOM_DIR_CHANGE, .proc/holder_dir_change) + +/datum/component/squeak/proc/holder_dir_change(datum/source, old_dir, new_dir) + //If the dir changes it means we're going through a bend in the pipes, let's pretend we bumped the wall + if(old_dir != new_dir) play_squeak() \ No newline at end of file diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 457915756bf..4398229391b 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -150,6 +150,7 @@ //Hook for running code when a dir change occurs /atom/proc/setDir(newdir) + SEND_SIGNAL(src, COMSIG_ATOM_DIR_CHANGE, dir, newdir) dir = newdir /atom/proc/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE) diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 35ca810541a..5854b3db24c 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -27,9 +27,6 @@ . = ..() AddComponent(/datum/component/squeak, honk_sounds, 50) -/obj/item/bikehorn/Crossed() - . = ..() - /obj/item/bikehorn/airhorn name = "air horn" desc = "Damn son, where'd you find this?" diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index f6474c4a16b..d0007ab7266 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -538,6 +538,7 @@ // note AM since can contain mobs or objs for(var/atom/movable/AM in D) AM.loc = src + SEND_SIGNAL(AM, COMSIG_MOVABLE_DISPOSING, src, D) if(istype(AM, /mob/living/carbon/human)) var/mob/living/carbon/human/H = AM if(FAT in H.mutations) // is a human and fat? From 9e5a6698ad4e381fc33c8b2177972ed818b00ed3 Mon Sep 17 00:00:00 2001 From: variableundefined <40092670+variableundefined@users.noreply.github.com> Date: Tue, 13 Nov 2018 09:15:17 +0800 Subject: [PATCH 03/82] Restore original TG cooldown behavior --- code/datums/components/squeak.dm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm index 4a2ef8a0289..e0da1816f27 100644 --- a/code/datums/components/squeak.dm +++ b/code/datums/components/squeak.dm @@ -11,11 +11,11 @@ var/steps = 0 var/step_delay = 1 - // This is to stop squeak spam (Apply to both usage and normal triggering unlike tg which only apply it to use) - var/last_squeak = 0 - var/squeak_delay = 20 + // This is to stop squeak spam from inhand usage + var/last_use = 0 + var/use_delay = 20 -/datum/component/squeak/Initialize(custom_sounds, volume_override, chance_override, step_delay_override, squeak_delay_override) +/datum/component/squeak/Initialize(custom_sounds, volume_override, chance_override, step_delay_override, use_delay_override) if(!isatom(parent)) return COMPONENT_INCOMPATIBLE RegisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY), .proc/play_squeak) @@ -23,7 +23,8 @@ RegisterSignal(parent, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_IMPACT), .proc/play_squeak) RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, .proc/play_squeak_crossed) if(isitem(parent)) - RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT, COMSIG_ITEM_ATTACK_SELF), .proc/play_squeak) + RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT), .proc/play_squeak) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/use_squeak) RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) if(istype(parent, /obj/item/clothing/shoes)) @@ -36,13 +37,10 @@ volume = volume_override if(isnum(step_delay_override)) step_delay = step_delay_override - if(isnum(squeak_delay_override)) - squeak_delay = squeak_delay_override + if(isnum(use_delay_override)) + use_delay = use_delay_override /datum/component/squeak/proc/play_squeak() - if(last_squeak + squeak_delay >= world.time) - return - last_squeak = world.time if(prob(squeak_chance)) if(!override_squeak_sounds) playsound(parent, pickweight(default_squeak_sounds), volume, 1, -1) @@ -75,6 +73,11 @@ if(isturf(current_parent.loc)) play_squeak() +/datum/component/squeak/proc/use_squeak() + if(last_use + use_delay < world.time) + last_use = world.time + play_squeak() + /datum/component/squeak/proc/disposing_react(datum/source, obj/structure/disposalholder/holder, obj/machinery/disposal/source) //We don't need to worry about unregistering this signal as it will happen for us automaticaly when the holder is qdeleted RegisterSignal(holder, COMSIG_ATOM_DIR_CHANGE, .proc/holder_dir_change) From ef3a2ce9c529a686538ce983fab4a68cc624e5ae Mon Sep 17 00:00:00 2001 From: variableundefined <40092670+variableundefined@users.noreply.github.com> Date: Sat, 17 Nov 2018 09:26:13 +0800 Subject: [PATCH 04/82] Adds in missing stub signals --- code/game/atoms_movable.dm | 1 + code/game/objects/items.dm | 2 ++ code/modules/clothing/clothing.dm | 1 + 3 files changed, 4 insertions(+) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 5a081d610da..a5d2366c46c 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -214,6 +214,7 @@ //called when src is thrown into hit_atom /atom/movable/proc/throw_impact(atom/hit_atom, throwingdatum) set waitfor = 0 + SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum) if(!QDELETED(hit_atom)) return hit_atom.hitby(src) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 634407cfd02..c1ff654c246 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -325,6 +325,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d A.Remove(user) if(flags & DROPDEL) qdel(src) + SEND_SIGNAL(src, COMSIG_ITEM_DROPPED,user) // called just as an item is picked up (loc is not yet changed) /obj/item/proc/pickup(mob/user) @@ -352,6 +353,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d // for items that can be placed in multiple slots // note this isn't called during the initial dressing of a player /obj/item/proc/equipped(var/mob/user, var/slot) + SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED, user, slot) for(var/X in actions) var/datum/action/A = X if(item_action_slot_check(slot, user)) //some items only give their actions buttons when in a specific slot. diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index bc6f7259ebc..614b5dc4b9f 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -411,6 +411,7 @@ BLIND // can't see anything ..() /obj/item/clothing/shoes/proc/step_action(var/mob/living/carbon/human/H) //squeek squeek + SEND_SIGNAL(src, COMSIG_SHOES_STEP_ACTION) if(shoe_sound) var/turf/T = get_turf(H) From 5a11c138c723c4658f4d8d8e798463411c407575 Mon Sep 17 00:00:00 2001 From: AffectedArc07 Date: Sat, 17 Nov 2018 14:17:37 +0000 Subject: [PATCH 05/82] NTTC Tweaks --- code/game/machinery/telecomms/ntsl2.dm | 85 ++++++++++++++++++++-- html/nttc/dist/index.html | 4 +- html/nttc/dist/tab_filtering.html | 10 ++- html/nttc/src/html/tabs/tab_filtering.html | 10 ++- 4 files changed, 99 insertions(+), 10 deletions(-) diff --git a/code/game/machinery/telecomms/ntsl2.dm b/code/game/machinery/telecomms/ntsl2.dm index ee9fabd272a..2bdc5306604 100644 --- a/code/game/machinery/telecomms/ntsl2.dm +++ b/code/game/machinery/telecomms/ntsl2.dm @@ -5,16 +5,31 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new()) * as well as allowing users to save and load configurations. */ /datum/nttc_configuration + // ALL JOBS + var/jobs_ai = list("Personal AI", "AI", "Cyborg", "Android", "Robot"); // All Silicon Jobs + var/jobs_command = list("Captain", "Head of Personnel", "Nanotrasen Representative", "Blueshield"); // All command jobs + var/jobs_engineering = list("Chief Engineer", "Station Engineer", "Maintenance Technician", "Engine Technician", "Electrician", "Life Support Specialist", "Atmospheric Technician", "Mechanic"); // All Engineering Jobs + var/jobs_ert = list("Emergency Response Team Officer", "Emergency Response Team Engineer", "Emergency Response Team Medic", "Emergency Response Team Leader", "Emergency Response Team Member"); // All ERT Jobs + var/jobs_medical = list("Chief Medical Officer", "Medical Doctor", "Surgeon", "Nurse", "Coroner", "Chemist", "Pharmacist", "Pharmacologist", "Virologist", "Pathologist", "Microbiologist", "Psychiatrist", "Psychologist", "Therapist", "Paramedic"); // All Medical Jobs + var/jobs_science = list("Research Director", "Geneticist", "Scientist", "Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist", "Chemical Researcher", "Roboticist", "Biomechanical Engineer", "Mechatronic Engineer"); // All Science Jobs + var/jobs_security = list("Internal Affairs Agent", "Human Resources Agent", "Head of Security", "Warden", "Detective", "Magistrate", "Forensic Technician", "Security Officer", "Brig Physician", "Security Pod Pilot"); // All Security Jobs + var/jobs_supply = list("Quartermaster", "Cargo Technician", "Shaft Miner", "Spelunker"); // All Supply Jobs + var/jobs_service = list("Bartender", "Chef", "Cook", "Culinary Artist", "Butcher", "Botanist", "Hydroponicist", "Botanical Researcher", "Clown", "Mime", "Janitor", "Custodial Technician", "Librarian", "Journalist", "Barber", "Hair Stylist", "Beautician", "Chaplain"); // All Service/Support Jobs + + // Just command members + var/heads = list("Captain", "Head of Personnel", "Nanotrasen Representative", "Blueshield", "Chief Engineer", "Chief Medical Officer", "Research Director", "Head of Security") /* Simple Toggles */ var/toggle_activated = TRUE var/toggle_jobs = FALSE var/toggle_timecode = FALSE + var/toggle_command_bold = FALSE // Hack section var/toggle_gibberish = FALSE var/toggle_honk = FALSE /* Strings */ var/setting_language = null + var/job_indicator_type = null /* Tables */ var/list/regex = list() @@ -38,7 +53,9 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new()) var/list/to_serialize = list( "toggle_activated", "toggle_jobs", + "job_indicator_type", "toggle_timecode", + "toggle_command_bold", "toggle_gibberish", "toggle_honk", "setting_language", @@ -50,7 +67,9 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new()) var/list/serialize_sanitize = list( "toggle_activated" = "bool", "toggle_jobs" = "bool", + "job_indicator_type" = "string", "toggle_timecode" = "bool", + "toggle_command_bold" = "bool", "toggle_gibberish" = "bool", "toggle_honk" = "bool", "setting_language" = "string", @@ -58,6 +77,13 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new()) "firewall" = "array" ) + // These are the job card styles + var/list/job_card_styles = list( + "Style 1: Name (Job)", + "Style 2: Name - Job", + "Style 3: \[Job\] Name", + "Style 4: (Job) Name", + ) // Used to determine what languages are allowable for conversion. Generated during runtime. var/list/valid_languages = list("--DISABLE--") @@ -66,12 +92,14 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new()) toggle_activated = initial(toggle_activated) toggle_jobs = initial(toggle_jobs) toggle_timecode = initial(toggle_timecode) + toggle_command_bold = initial(toggle_command_bold) // Hack section toggle_gibberish = initial(toggle_gibberish) toggle_honk = initial(toggle_honk) /* Strings */ setting_language = initial(setting_language) + job_indicator_type = initial(job_indicator_type) /* Tables */ regex = list() @@ -144,10 +172,41 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new()) // These two stack properly. // Simple job indicator switch. - if(toggle_jobs) - var/new_name = signal.data["name"] + " ([signal.data["job"]]) " - signal.data["name"] = new_name - signal.data["realname"] = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on + if(job_indicator_type) + var/new_name = signal.data["name"] + var/job = signal.data["job"] + var/job_color = "#000000" + if(job in jobs_ai) + job_color = "#FF00FF" + if(job in jobs_command) + job_color = "#204090" + if(job in jobs_engineering) + job_color = "#A66300" + if(job in jobs_ert) + job_color = "#5C5C7C" + job = "ERT" + if(job in jobs_medical) + job_color = "#009190" + if(job in jobs_science) + job_color = "#993399F" + if(job in jobs_security) + job_color = "#A30000" + if(job in jobs_supply) + job_color = "#7F6539" + if(job in jobs_service) + job_color = "#80A000" + switch(job_indicator_type) + if("Style 1: Name (Job)") + new_name = signal.data["name"] + " ([job]) " + if("Style 2: Name - Job") + new_name = signal.data["name"] + " - [job] " + if("Style 3: \[Job\] Name") + new_name = "\[[job]\] " + signal.data["name"] + " " + if("Style 4: (Job) Name") + new_name = "([job]) " + signal.data["name"] + " " + if(toggle_jobs) + signal.data["name"] = new_name + signal.data["realname"] = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on // Add the current station time like a time code. if(toggle_timecode) @@ -155,6 +214,12 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new()) signal.data["name"] = new_name signal.data["realname"] = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on + // Makes heads of staff bold + if(toggle_command_bold) + var/job = signal.data["job"] + if((job in jobs_ert) || (job in heads)) + signal.data["message"] = "" + signal.data["message"] + "" + // Hacks! // Censor dat shit like nobody's business if(toggle_gibberish) @@ -169,7 +234,6 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new()) new_message += pick("HoNK!", "HONK", "HOOOoONK", "HONKHONK!", "HoNnnkKK!!!", "HOOOOOOOOOOONK!!!!11!", "henk!") + " " signal.data["message"] = new_message - // Language Conversion if(setting_language && valid_languages[setting_language]) if(setting_language == "--DISABLE--") @@ -183,7 +247,7 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new()) var/new_message = original for(var/reg in regex) var/replacePattern = pencode_to_html(regex[reg]) - var/regex/start = regex(reg, "gi") + var/regex/start = regex("\\b[reg]\\b", "gi") new_message = start.Replace(new_message, replacePattern) signal.data["message"] = new_message @@ -202,6 +266,15 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new()) vars[var_to_toggle] = !vars[var_to_toggle] log_action(user, "toggled NTTC variable [var_to_toggle] [vars[var_to_toggle] ? "on" : "off"]") + // Job Format + if(href_list["setting_job_card_style"]) + var/card_style = input(user, "Pick a job card format.", "Job Card Format") as null|anything in job_card_styles + if(!card_style) + return + job_indicator_type = card_style + to_chat(user, "Jobs will now have the style of [card_style].") + log_action(user, "has set NTTC job card format to [card_style]", TRUE) + // Strings if(href_list["setting_language"]) var/new_language = input(user, "Pick a language to convert messages to.", "Language Conversion") as null|anything in valid_languages diff --git a/html/nttc/dist/index.html b/html/nttc/dist/index.html index 80e7a40ac81..a8a7a17f1e3 100644 --- a/html/nttc/dist/index.html +++ b/html/nttc/dist/index.html @@ -3,7 +3,7 @@ - NTSL + NTTC @@ -12,7 +12,7 @@