mob living - root

This commit is contained in:
deathride58
2018-01-04 01:03:39 -05:00
parent bdd460ed4a
commit 4957aa3cb0
6 changed files with 4 additions and 61 deletions
+1
View File
@@ -27,6 +27,7 @@
if(NOBLOOD in dna.species.species_traits)
bleed_rate = 0
return
if(bodytemperature >= 225 && !(has_disability(DISABILITY_NOCLONE))) //cryosleep or husked people do not pump the blood.
//Blood regeneration if there is some space
-44
View File
@@ -1,18 +1,3 @@
//The code execution of the emote datum is located at code/datums/emotes.dm
/mob/living/emote(act, m_type = null, message = null)
act = lowertext(act)
var/param = message
var/custom_param = findchar(act, " ")
if(custom_param)
param = copytext(act, custom_param + 1, length(act) + 1)
act = copytext(act, 1, custom_param)
var/datum/emote/E
E = E.emote_list[act]
if(!E)
to_chat(src, "<span class='notice'>Unusable emote '[act]'. Say *help for a list.</span>")
return
E.run_emote(src, param, m_type)
/* EMOTE DATUMS */
/datum/emote/living
@@ -143,16 +128,6 @@
restraint_check = TRUE
wing_time = 10
/datum/emote/living/flip
key = "flip"
key_third_person = "flips"
restraint_check = TRUE
/datum/emote/living/flip/run_emote(mob/user, params)
. = ..()
if(.)
user.SpinAnimation(7,1)
/datum/emote/living/frown
key = "frown"
key_third_person = "frowns"
@@ -483,25 +458,6 @@
message_param = "beeps at %t."
sound = 'sound/machines/twobeep.ogg'
/datum/emote/living/spin
key = "spin"
key_third_person = "spins"
restraint_check = TRUE
/datum/emote/living/spin/run_emote(mob/user)
. = ..()
if(.)
user.spin(20, 1)
if(iscyborg(user) && user.has_buckled_mobs())
var/mob/living/silicon/robot/R = user
GET_COMPONENT_FROM(riding_datum, /datum/component/riding, R)
if(riding_datum)
for(var/mob/M in R.buckled_mobs)
riding_datum.force_dismount(M)
else
R.unbuckle_all_mobs()
/datum/emote/living/circle
key = "circle"
key_third_person = "circles"
-11
View File
@@ -413,7 +413,6 @@
cure_nearsighted()
cure_blind()
cure_husk()
disabilities = 0
hallucination = 0
heal_overall_damage(100000, 100000, 0, 0, 1) //heal brute and burn dmg on both organic and robotic limbs, and update health right away.
ExtinguishMob()
@@ -745,15 +744,6 @@
var/obj_temp = oloc.return_temperature()
if(obj_temp != null)
loc_temp = obj_temp
/* if(ismob(loc))
var/mob/living/mloc = loc
var/mob_temp = mloc.return_temperature()
if(mloc == DEAD)
loc_temp = get_turf(loc) //wew
else
loc_temp = mob_temp
*/
//just gunna ommit this for now, it's on the 'to figgur out' list.
else if(isspaceturf(get_turf(src)))
var/turf/heat_turf = get_turf(src)
loc_temp = heat_turf.temperature
@@ -989,7 +979,6 @@
stop_pulling()
else if(has_legs || ignore_legs)
lying = 0
if(buckled)
lying = 90*buckle_lying
else if(!lying)
@@ -26,6 +26,8 @@
var/incorporeal_move = FALSE //FALSE is off, INCORPOREAL_MOVE_BASIC is normal, INCORPOREAL_MOVE_SHADOW is for ninjas
//and INCORPOREAL_MOVE_JAUNT is blocked by holy water/salt
var/list/disabilities = list()
var/list/surgeries = list() //a list of surgery datums. generally empty, they're added when the player wants them.
var/now_pushing = null //used by living/Collide() and living/PushAM() to prevent potential infinite loop.
+1 -1
View File
@@ -4,4 +4,4 @@
ranged_ability.remove_mousepointer(client)
..()
if(!key && mind) //key and mind have become separated.
mind.active = 0 //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.
mind.active = 0 //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.
-5
View File
@@ -284,11 +284,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
return 1
/mob/living/proc/check_emote(message)
if(copytext(message, 1, 2) == "*")
emote(copytext(message, 2))
return 1
/mob/living/proc/get_message_mode(message)
var/key = copytext(message, 1, 2)
if(key == "#")