Merge branch 'master' of https://github.com/PolarisSS13/Polaris into PulseBasedReagentProcessing

This commit is contained in:
Mechoid
2019-04-13 23:53:11 -07:00
27 changed files with 201 additions and 55 deletions
+1 -1
View File
@@ -1387,7 +1387,7 @@
/mob/living/carbon/human/proc/process_glasses(var/obj/item/clothing/glasses/G)
if(G && G.active)
see_in_dark += G.darkness_view
if(G.overlay)
if(G.overlay && client)
client.screen |= G.overlay
if(G.vision_flags)
sight |= G.vision_flags
+5 -1
View File
@@ -904,7 +904,11 @@ default behaviour is:
/mob/living/proc/escape_buckle()
if(buckled)
buckled.user_unbuckle_mob(src, src)
if(istype(buckled, /obj/vehicle))
var/obj/vehicle/vehicle = buckled
vehicle.unload()
else
buckled.user_unbuckle_mob(src, src)
/mob/living/proc/resist_grab()
var/resisting = 0
+4 -1
View File
@@ -299,7 +299,10 @@ var/list/ai_verbs_default = list(
/obj/machinery/ai_powersupply/New(var/mob/living/silicon/ai/ai=null)
powered_ai = ai
powered_ai.psupply = src
forceMove(powered_ai.loc)
if(istype(powered_ai,/mob/living/silicon/ai/announcer)) //Don't try to get a loc for a nullspace announcer mob, just put it into it
forceMove(powered_ai)
else
forceMove(powered_ai.loc)
..()
use_power(1) // Just incase we need to wake up the power system.