From 82a4dedf5d9c99f569926ef5c34c70e88e8f58ad Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 12 Aug 2013 21:17:38 -0700 Subject: [PATCH 1/3] Snowflake check for Soghun. FIX THE WHITELIST THING, HEAD. --- code/modules/client/preferences.dm | 2 +- code/modules/mob/new_player/new_player.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 92f30dc8f36..1809cfd205d 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -806,7 +806,7 @@ datum/preferences if(config.usealienwhitelist) //If we're using the whitelist, make sure to check it! for(var/S in whitelisted_species) - if(is_alien_whitelisted(user,S)) + if(is_alien_whitelisted(user,S) || (S == "Unathi" && is_alien_whitelisted(user,"Soghun"))) new_species += S whitelisted = 1 if(!whitelisted) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 7bb662f91ea..ca9e3078246 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -351,7 +351,7 @@ if(client.prefs.species) chosen_species = all_species[client.prefs.species] if(chosen_species) - if(is_alien_whitelisted(src, client.prefs.species) || !config.usealienwhitelist || !(chosen_species.flags & WHITELISTED)) + if(is_alien_whitelisted(src, client.prefs.species) || (client.prefs.species == "Unathi" && is_alien_whitelisted(src, "Soghun")) || !config.usealienwhitelist || !(chosen_species.flags & WHITELISTED)) new_character.set_species(client.prefs.species) if(chosen_species.language) new_character.add_language(chosen_species.language) From 5476ae192d77f61b188262b3998464b0d9dc7c67 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 12 Aug 2013 22:44:57 -0700 Subject: [PATCH 2/3] Attempting to reduce incidence of clickspam against mobs. --- code/game/gamemodes/events/biomass.dm | 3 +++ code/modules/mob/living/carbon/carbon.dm | 6 ++++++ code/modules/mob/living/carbon/monkey/monkey.dm | 2 ++ code/modules/mob/mob.dm | 3 ++- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/events/biomass.dm b/code/game/gamemodes/events/biomass.dm index d1508221f7c..7bc6cf92568 100644 --- a/code/game/gamemodes/events/biomass.dm +++ b/code/game/gamemodes/events/biomass.dm @@ -22,6 +22,9 @@ /obj/effect/biomass/attackby(obj/item/weapon/W as obj, mob/user as mob) if (!W || !user || !W.type) return + + user.delay_click(10) + switch(W.type) if(/obj/item/weapon/circular_saw) del src if(/obj/item/weapon/kitchen/utensil/knife) del src diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 061f06fe7d8..2347ca6b23c 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -49,7 +49,11 @@ . = ..() /mob/living/carbon/attack_hand(mob/M as mob) + if(!istype(M, /mob/living/carbon)) return + + M.delay_click(10) + if (hasorgans(M)) var/datum/organ/external/temp = M:organs_by_name["r_hand"] if (M.hand) @@ -76,6 +80,8 @@ /mob/living/carbon/attack_paw(mob/M as mob) if(!istype(M, /mob/living/carbon)) return + M.delay_click(10) + for(var/datum/disease/D in viruses) if(D.spread_by_touch()) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index a073dfa10d5..add85c9d034 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -217,6 +217,8 @@ M << "No attacking people at spawn, you jackass." return + M.delay_click(10) + if(M.gloves && istype(M.gloves,/obj/item/clothing/gloves)) var/obj/item/clothing/gloves/G = M.gloves if(G.cell) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 3600b8b0f7b..9801ea9f6c5 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -83,6 +83,7 @@ //This is awful /mob/attackby(obj/item/weapon/W as obj, mob/user as mob) + user.delay_click(10) //Holding a balloon will shield you from an item that is_sharp() ... cause that makes sense if (user.intent != "harm") if (istype(src.l_hand,/obj/item/latexballon) && src.l_hand:air_contents && is_sharp(W)) @@ -960,4 +961,4 @@ mob/verb/yank_out_object() pinned -= O if(!pinned.len) anchored = 0 - return 1 + return 1 From 44aa77f7de17cefb37cf35553b2c0e950d979ad2 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 12 Aug 2013 22:51:27 -0700 Subject: [PATCH 3/3] Adds a delay to the RCD when building. --- code/game/objects/items/weapons/RCD.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index a80a892af6f..6308189d8c2 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -86,6 +86,8 @@ RCD if(!(istype(A, /turf) || istype(A, /obj/machinery/door/airlock))) return 0 + user.delay_click(10) + switch(mode) if(1) if(istype(A, /turf/space))