mirror of
https://github.com/KabKebab/GS13.git
synced 2026-08-21 03:56:19 +01:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
@@ -315,6 +315,9 @@
|
||||
/atom/proc/examine(mob/user)
|
||||
. = list("[get_examine_string(user, TRUE)].")
|
||||
|
||||
if(!isliving(src))
|
||||
user.visible_message("<span class='notice'>[user] examines [src].</span>",\
|
||||
"<span class='notice'>You examine [src].</span>")
|
||||
if(desc)
|
||||
. += desc
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
var/moving_diagonally = 0 //0: not doing a diagonal move. 1 and 2: doing the first/second step of the diagonal move
|
||||
var/list/client_mobs_in_contents // This contains all the client mobs within this container
|
||||
var/list/acted_explosions //for explosion dodging
|
||||
glide_size = 8
|
||||
glide_size = 4
|
||||
appearance_flags = TILE_BOUND|PIXEL_SCALE|LONG_GLIDE
|
||||
var/datum/forced_movement/force_moving = null //handled soley by forced_movement.dm
|
||||
var/floating = FALSE
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
var/obj/item/assembly/signaler/anomaly/aSignal
|
||||
var/area/impact_area
|
||||
|
||||
var/lifespan = 1190
|
||||
var/lifespan = 1690
|
||||
var/death_time
|
||||
|
||||
var/countdown_colour
|
||||
|
||||
Reference in New Issue
Block a user