Merge pull request #4244 from LightningIron/master

Ninja bugfixes/minor code cleaning/energy cost changes
This commit is contained in:
DJSnapshot
2014-01-10 13:42:42 -08:00
4 changed files with 25 additions and 19 deletions
+5 -1
View File
@@ -362,7 +362,7 @@ var/list/slot_equipment_priority = list( \
pluralcheck = " [deathtimeminutes] minutes and"
var/deathtimeseconds = round((deathtime - deathtimeminutes * 600) / 10,1)
usr << "You have been dead for[pluralcheck] [deathtimeseconds] seconds."
if (deathtime < 18000)
usr << "You must wait 30 minutes to respawn!"
return
@@ -753,6 +753,10 @@ note dizziness decrements automatically in the mob's Life() proc.
else if( stunned )
// lying = 0
canmove = 0
else if(captured)
anchored = 1
canmove = 0
lying = 0
else
lying = !can_stand
canmove = has_limbs
+1 -1
View File
@@ -158,7 +158,7 @@
var/voice_name = "unidentifiable voice"
var/faction = "neutral" //Used for checking whether hostile simple animals will attack you, possibly more stuff later
var/captured = 0 //Functionally, should give the same effect as being buckled into a chair when true.
//Generic list for proc holders. Only way I can see to enable certain verbs/procs. Should be modified if needed.
var/proc_holder_list[] = list()//Right now unused.