Alien Ruin fix, various cherrypicked upstream fixes

Also adds new buildmode
This commit is contained in:
Poojawa
2018-09-13 22:55:11 -05:00
parent 46e805af28
commit 42db44b39e
63 changed files with 3437 additions and 2219 deletions
-3
View File
@@ -10,9 +10,6 @@
Note that AI have no need for the adjacency proc, and so this proc is a lot cleaner.
*/
/mob/living/silicon/ai/DblClickOn(var/atom/A, params)
if(check_click_intercept(params,A))
return
if(control_disabled || incapacitated())
return
+1
View File
@@ -272,6 +272,7 @@
animals lunging, etc.
*/
/mob/proc/RangedAttack(atom/A, params)
SEND_SIGNAL(src, COMSIG_MOB_ATTACK_RANGED, A, params)
/*
Restrained ClickOn
+2 -1
View File
@@ -56,6 +56,7 @@
/obj/item/proc/attack(mob/living/M, mob/living/user)
SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user)
SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user)
if(item_flags & NOBLUDGEON)
return
@@ -139,7 +140,7 @@
// Click parameters is the params string from byond Click() code, see that documentation.
/obj/item/proc/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
SEND_SIGNAL(src, COMSIG_ITEM_AFTERATTACK, target, user, proximity_flag, click_parameters)
SEND_SIGNAL(user, COMSIG_MOB_ITEM_AFTERATTACK, target, user, proximity_flag, click_parameters)
/obj/item/proc/get_clamped_volume()
if(w_class)
-3
View File
@@ -1,7 +1,4 @@
/mob/dead/observer/DblClickOn(var/atom/A, var/params)
if(check_click_intercept(params,A))
return
if(can_reenter_corpse && mind && mind.current)
if(A == mind.current || (mind.current in A)) // double click your corpse or whatever holds it
reenter_corpse() // (cloning scanner, body bag, closet, mech, etc)
+2
View File
@@ -86,6 +86,7 @@
return 0
/mob/living/carbon/human/RangedAttack(atom/A, mouseparams)
. = ..()
if(gloves)
var/obj/item/clothing/gloves/G = gloves
if(istype(G) && G.Touch(A,0)) // for magic gloves
@@ -96,6 +97,7 @@
if(isturf(A) && get_dist(src,A) <= 1)
src.Move_Pulled(A)
return
/*
Animals & All Unspecified