mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-21 04:48:18 +01:00
SoundScopes' bugfixes - 01SEP2016 (#848)
This commit is contained in:
@@ -598,6 +598,10 @@ Traitors and the like can also be revived with the previous role mostly intact.
|
||||
return
|
||||
|
||||
if (alert(src, "Are you sure you want to delete:\n[O]\nat ([O.x], [O.y], [O.z])?", "Confirmation", "Yes", "No") == "Yes")
|
||||
if (istype(O, /mob/dead/observer))
|
||||
var/mob/dead/observer/M = O
|
||||
if (M.client && alert(src, "They are still connected. Are you sure, they will loose connection.", "Confirmation", "Yes", "No") != "Yes")
|
||||
return
|
||||
log_admin("[key_name(usr)] deleted [O] at ([O.x],[O.y],[O.z])")
|
||||
message_admins("[key_name_admin(usr)] deleted [O] at ([O.x],[O.y],[O.z])", 1)
|
||||
feedback_add_details("admin_verb","DEL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||
|
||||
@@ -38,6 +38,9 @@
|
||||
set name = "Adjust welding mask"
|
||||
set src in usr
|
||||
|
||||
if(!base_state)
|
||||
base_state = icon_state
|
||||
|
||||
if(usr.canmove && !usr.stat && !usr.restrained())
|
||||
if(src.up)
|
||||
src.up = !src.up
|
||||
@@ -150,7 +153,7 @@
|
||||
|
||||
var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kittyinner")
|
||||
ears.Blend(earbit, ICON_OVERLAY)
|
||||
|
||||
|
||||
item_icons[icon_head] = ears
|
||||
|
||||
/obj/item/clothing/head/richard
|
||||
@@ -158,4 +161,4 @@
|
||||
desc = "You can hear the distant sounds of rhythmic electronica."
|
||||
icon_state = "richard"
|
||||
body_parts_covered = HEAD|FACE
|
||||
flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
|
||||
flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/mob/living/carbon/human/proc/handle_strip(var/slot_to_strip,var/mob/living/user)
|
||||
|
||||
if(!slot_to_strip || !istype(user))
|
||||
if(!slot_to_strip || !istype(user) || isanimal(user) || !istype(user, /mob/living/simple_animal/hostile))
|
||||
return 0
|
||||
|
||||
// TODO : Change to incapacitated() on merge.
|
||||
@@ -72,7 +72,7 @@
|
||||
else
|
||||
visible_message("<span class='danger'>\The [user] is trying to put \a [held] on \the [src]!</span>")
|
||||
|
||||
if(!do_after(user,HUMAN_STRIP_DELAY))
|
||||
if(!do_mob(user,src,HUMAN_STRIP_DELAY))
|
||||
return 0
|
||||
|
||||
if(!stripping && user.get_active_hand() != held)
|
||||
|
||||
@@ -280,6 +280,21 @@
|
||||
return
|
||||
..()
|
||||
|
||||
/mob/living/silicon/robot/drone/Bump(var/atom/movable/AM, yes)
|
||||
|
||||
if(istype(AM,/obj/machinery/door)) // check for doors first as that will be most common
|
||||
return ..(AM,yes)
|
||||
|
||||
if(!(istype(AM,/obj/item/pipe) || istype(AM,/obj/structure/disposalconstruct)))
|
||||
if(istype(AM,/obj/item)) //Would this even be possible? Someone try to activate that message
|
||||
var/obj/item/O = AM
|
||||
if(O.w_class > can_pull_size)
|
||||
src << "<span class='warning'>You are too small to push that.</span>"
|
||||
return 0
|
||||
else if(istype(AM,/obj))
|
||||
return 0
|
||||
..(AM,yes)
|
||||
|
||||
/mob/living/silicon/robot/drone/add_robot_verbs()
|
||||
src.verbs |= silicon_subsystems
|
||||
|
||||
|
||||
@@ -107,9 +107,11 @@
|
||||
else
|
||||
set_dir(SOUTH)
|
||||
|
||||
if(isturf(movement_target.loc) )
|
||||
|
||||
UnarmedAttack(movement_target)
|
||||
if(isturf(movement_target.loc))
|
||||
for(var/direction in alldirs)
|
||||
var/turf/T = get_step(src, direction)
|
||||
if(T == movement_target.loc)
|
||||
UnarmedAttack(movement_target)
|
||||
else if(ishuman(movement_target.loc) && prob(20))
|
||||
visible_emote("stares at the [movement_target] that [movement_target.loc] has with sad puppy eyes.")
|
||||
else
|
||||
|
||||
@@ -38,10 +38,10 @@ Put (mob/proc)s here that are in dire need of a code cleanup.
|
||||
if(force_species_check)
|
||||
var/fail = 1
|
||||
for(var/name in virus.affected_species)
|
||||
var/mob_type = text2path("/mob/living/carbon/[lowertext(name)]")
|
||||
if(mob_type && istype(src, mob_type))
|
||||
fail = 0
|
||||
break
|
||||
if(istype(src, /mob/living/carbon))
|
||||
if(src:species && src:species.name == name)
|
||||
fail = 0
|
||||
break
|
||||
if(fail) return
|
||||
|
||||
if(skip_this == 1)
|
||||
|
||||
@@ -580,7 +580,7 @@ proc/is_blind(A)
|
||||
name = realname
|
||||
|
||||
for(var/mob/M in player_list)
|
||||
if(M.client && ((!istype(M, /mob/new_player) && M.stat == DEAD) || (M.client.holder && check_rights(R_MOD|R_ADMIN, 0, M))) && (M.client.prefs.toggles & CHAT_DEAD))
|
||||
if(M.client && ((!istype(M, /mob/new_player) && M.stat == DEAD) || (M.client.holder && check_rights(R_DEV|R_MOD|R_ADMIN, 0, M))) && (M.client.prefs.toggles & CHAT_DEAD))
|
||||
var/follow
|
||||
var/lname
|
||||
if(subject)
|
||||
|
||||
@@ -310,6 +310,9 @@
|
||||
|
||||
return 1
|
||||
|
||||
/obj/vehicle/user_unbuckle_mob(var/mob/user)
|
||||
unload(user)
|
||||
return
|
||||
|
||||
/obj/vehicle/proc/unload(var/mob/user, var/direction)
|
||||
if(!load)
|
||||
|
||||
Reference in New Issue
Block a user