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
+1
View File
@@ -142,6 +142,7 @@
hud_used.throw_icon.icon_state = "act_throw_on"
/mob/proc/throw_item(atom/target)
SEND_SIGNAL(src, COMSIG_MOB_THROW, target)
return
/mob/living/carbon/throw_item(atom/target)
@@ -1470,6 +1470,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
log_combat(M, H, "attempted to touch")
H.visible_message("<span class='warning'>[M] attempted to touch [H]!</span>")
return 0
SEND_SIGNAL(M, COMSIG_MOB_ATTACK_HAND, M, H, attacker_style)
switch(M.a_intent)
if("help")
help(M, H, attacker_style)
+4 -2
View File
@@ -41,12 +41,14 @@
update_client_colour()
update_mouse_pointer()
if(client)
client.click_intercept = null
client.change_view(CONFIG_GET(string/default_view)) // Resets the client.view in case it was changed.
if(client.player_details.player_actions.len)
for(var/datum/action/A in client.player_details.player_actions)
A.Grant(src)
for(var/foo in client.player_details.post_login_callbacks)
var/datum/callback/CB = foo
CB.Invoke()
log_message("Client [key_name(src)] has taken ownership of mob [src]([src.type])", LOG_OWNERSHIP)
+5
View File
@@ -9,4 +9,9 @@
if(loc)
loc.on_log(FALSE)
if(client)
for(var/foo in client.player_details.post_logout_callbacks)
var/datum/callback/CB = foo
CB.Invoke()
return TRUE