cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 05:51:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9999 from Baystation12/dev-freeze

Browse Source 
Dev.
This commit is contained in:
PsiOmegaDelta
2015-07-02 21:24:09 +02:00
parent dbbb5cf58c 88b9787ac4
commit 41d86361a0
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/mob/living/carbon/human/say.dm
View File

@@ -129,21 +129,15 @@
return verb
/mob/living/carbon/human/handle_speech_problems(var/message, var/verb)
if(!speech_problem_flag)
return ..()
var/list/returns[3]
speech_problem_flag = 0
if(silent || (sdisabilities & MUTE))
message = ""
speech_problem_flag = 1
if(istype(wear_mask, /obj/item/clothing/mask/horsehead))
else if(istype(wear_mask, /obj/item/clothing/mask/horsehead))
var/obj/item/clothing/mask/horsehead/hoers = wear_mask
if(hoers.voicechange)
if(mind && mind.changeling && department_radio_keys[copytext(message, 1, 3)] != "changeling")
message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
verb = pick("whinnies","neighs", "says")
speech_problem_flag = 1
message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
verb = pick("whinnies","neighs", "says")
speech_problem_flag = 1
if(message != "")
var/list/parent = ..()
@@ -162,6 +156,7 @@
message = uppertext(message)
verb = "yells loudly"
var/list/returns[3]
returns[1] = message
returns[2] = verb
returns[3] = speech_problem_flag

13
code/modules/mob/living/carbon/human/stripping.dm
View File

@@ -59,6 +59,7 @@
return
if(!target_slot.canremove)
user << "<span class='warning'>You cannot remove \the [src]'s [target_slot.name].</span>"
return
stripping = 1
if(stripping)
@@ -73,11 +74,9 @@
return
if(stripping)
attack_log += "\[[time_stamp()]\] <font color='orange'>Has had \the [target_slot] removed by [user.name] ([user.ckey])</font>"
user.attack_log += "\[[time_stamp()]\] <font color='red'>Attempted to remove [name]'s ([ckey]) [target_slot.name]</font>"
drop_from_inventory(target_slot)
else
user.drop_from_inventory(held)
admin_attack_log(user, src, "Attempted to remove \a [target_slot]", "Target of an attempt to remove \a [target_slot].", "attempted to remove \a [target_slot] from")
unEquip(target_slot)
else if(user.unEquip(held))
equip_to_slot_if_possible(held, text2num(slot_to_strip), 0, 1, 1)
if(held.loc != src)
user.put_in_hands(held)
@@ -88,9 +87,9 @@
user << "<span class='warning'>\The [src] has nothing in their pockets.</span>"
return
if(r_store)
drop_from_inventory(r_store)
unEquip(r_store)
if(l_store)
drop_from_inventory(l_store)
unEquip(l_store)
visible_message("<span class='danger'>\The [user] empties \the [src]'s pockets!</span>")
// Modify the current target sensor level.