shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'citadel/master' into typing_indicators

Browse Source
This commit is contained in:
kevinz000
2020-04-24 22:49:54 -07:00
parent d4c6148a11 21619b1ee3
commit 07dedea81a
1620 changed files with 189752 additions and 47787 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob_defines.dm
+2 -2
View File
@@ -8,6 +8,8 @@
pressure_resistance = 8
mouse_drag_pointer = MOUSE_ACTIVE_POINTER
throwforce = 10
blocks_emissive = EMISSIVE_BLOCK_GENERIC
var/lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE
var/datum/mind/mind
var/list/datum/action/actions = list()
@@ -84,8 +86,6 @@
/// The last mob/living/carbon to push/drag/grab this mob (mostly used by slimes friend recognition)
var/datum/weakref/LAssailant
var/list/obj/user_movement_hooks //Passes movement in client/Move() to these!
var/list/mob_spell_list = list() //construct spells and mime spells. Spells that do not transfer from one mob to another and can not be lost in mindswap.