Resolves compile errors with the exception of map errors.

This commit is contained in:
Cameron653
2019-01-12 21:09:29 -05:00
parent fb6f5e33ca
commit 9dd973221d
140 changed files with 1223 additions and 1211 deletions
+2 -2
View File
@@ -331,12 +331,12 @@
return
//Actual escaping
forceMove(get_turf(src)) //Just move me up to the turf, let's not cascade through bellies, there's been a problem, let's just leave.
for(var/mob/living/simple_animal/SA in range(10))
for(var/mob/living/simple_mob/SA in range(10))
SA.prey_excludes[src] = world.time
log_and_message_admins("[key_name(src)] used the OOC escape button to get out of [key_name(B.owner)] ([B.owner ? "<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[B.owner.x];Y=[B.owner.y];Z=[B.owner.z]'>JMP</a>" : "null"])")
if(isanimal(B.owner))
var/mob/living/simple_animal/SA = B.owner
var/mob/living/simple_mob/SA = B.owner
SA.update_icons()
//You're in a dogborg!
+11 -9
View File
@@ -1,20 +1,20 @@
///////////////////// Simple Animal /////////////////////
/mob/living/simple_animal
/mob/living/simple_mob
var/swallowTime = 30 //How long it takes to eat its prey in 1/10 of a second. The default is 3 seconds.
var/list/prey_excludes = list() //For excluding people from being eaten.
//
// Simple nom proc for if you get ckey'd into a simple_animal mob! Avoids grabs.
// Simple nom proc for if you get ckey'd into a simple_mob mob! Avoids grabs.
//
/mob/living/simple_animal/proc/animal_nom(var/mob/living/T in living_mobs(1))
/mob/living/simple_mob/proc/animal_nom(var/mob/living/T in living_mobs(1))
set name = "Animal Nom"
set category = "IC"
set desc = "Since you can't grab, you get a verb!"
if (stat != CONSCIOUS)
return
if (istype(src,/mob/living/simple_animal/mouse) && T.ckey == null)
return
//if (istype(src,/mob/living/simple_mob/mouse) && T.ckey == null) //VORESTATION AI TEMPORARY REMOVAL
// return //VORESTATION AI TEMPORARY REMOVAL
if (client && IsAdvancedToolUser())
to_chat(src,"<span class='warning'>Put your hands to good use instead!</span>")
return
@@ -25,7 +25,8 @@
//
// Simple proc for animals to have their digestion toggled on/off externally
//
/mob/living/simple_animal/verb/toggle_digestion()
/*
/mob/living/simple_mob/verb/toggle_digestion()
set name = "Toggle Animal's Digestion"
set desc = "Enables digestion on this mob for 20 minutes."
set category = "OOC"
@@ -47,8 +48,9 @@
var/confirm = alert(user, "This mob is currently set to process all stomach contents. Do you want to disable this?", "Disabling [name]'s Digestion", "Disable", "Cancel")
if(confirm == "Disable")
vore_selected.digest_mode = DM_HOLD
/mob/living/simple_animal/attackby(var/obj/item/O, var/mob/user)
*/ //VORESTATION AI TEMPORARY REMOVAL
/*
/mob/living/simple_mob/attackby(var/obj/item/O, var/mob/user)
if (istype(O, /obj/item/weapon/newspaper) && !(ckey || (hostile && faction != user.faction)) && isturf(user.loc))
if (retaliate && prob(vore_pounce_chance/2)) // This is a gamble!
user.Weaken(5) //They get tackled anyway whether they're edible or not.
@@ -72,5 +74,5 @@
if(src && L)
prey_excludes -= L
else
..()
..() */ //VORESTATION AI TEMPORARY REMOVAL
@@ -234,14 +234,14 @@
has_items = list(
/obj/item/clothing/accessory/medal/bronze_heart,
/obj/item/clothing/gloves/ring/seal/signet/fluff/vietsi)
/* //VORESTATION AI TEMPORARY REMOVAL
// Tabiranth: Ascian
/obj/item/weapon/grenade/spawnergrenade/spirit
name = "spirit's pet carrier"
desc = "Contains kitten."
spawner_type = /mob/living/simple_animal/cat/fluff/tabiranth
spawner_type = /mob/living/simple_mob/cat/fluff/tabiranth
deliveryamt = 1
*/
/*
Swimsuits, for general use, to avoid arriving to work with your swimsuit.
*/
+1 -1
View File
@@ -11,7 +11,7 @@
/hook/human_new
/hook/simple_animal_new
/hook/simple_mob_new
//Hooks for interactions
/hook/living_attackby
+1 -1
View File
@@ -132,7 +132,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
if(!istype(M))
return 0
if(isanimal(M))
var/mob/living/simple_animal/SA = M
var/mob/living/simple_mob/SA = M
if(!SA.has_hands)
return 0
if(M.buckled)