Merge pull request #1111 from VOREStation/aro-foxins

Adds more foxing
This commit is contained in:
Arokha Sieyes
2017-03-06 02:09:28 -05:00
committed by GitHub
5 changed files with 30 additions and 4 deletions
@@ -5,6 +5,7 @@
icon_state = "fluffy"
icon_living = "fluffy"
icon_dead = "fluffy_dead"
icon_rest = "fluffy_sleep"
speak = list("Squee","Arf arf","Awoo","Squeak")
speak_emote = list("squeaks", "barks")
emote_hear = list("howls","squeals")
@@ -39,6 +40,7 @@
else if(prob(5))
audible_emote("snuffles.")
/mob/living/simple_animal/fluffy/lay_down() // Turns sprite into sleeping and back upon using "Rest".
/mob/living/simple_animal/fluffy/lay_down()
..()
icon_state = resting ? "fluffy_sleep" : "fluffy"
if(icon_rest)
icon_state = resting ? icon_rest : icon_living
@@ -23,6 +23,7 @@
minbodytemp = 223 //Below -50 Degrees Celcius
maxbodytemp = 323 //Above 50 Degrees Celcius
mob_size = MOB_TINY
isPredator = 1
/mob/living/simple_animal/fox/New()
if(!vore_organs.len)
@@ -52,6 +53,12 @@
"With a loud glorp, the stomach spills more acids onto you.")
..()
//For resting sprites
/mob/living/simple_animal/fox/lay_down()
..()
if(icon_rest)
icon_state = resting ? icon_rest : icon_living
// All them complicated fox procedures.
/mob/living/simple_animal/fox/Life()
//MICE!
@@ -305,4 +312,13 @@
"A thick glob of acids drip down from above, adding to the pool of caustic fluids in Renault's belly.",
"There's a loud gurgle as the stomach declares the intent to make you a part of Renault.")
..()
..()
/mob/living/simple_animal/fox/syndicate
name = "syndi-fox"
desc = "It's a DASTARDLY fox! The horror! Call the shuttle!"
icon = 'icons/mob/fox_vr.dmi'
icon_state = "syndifox"
icon_living = "syndifox"
icon_dead = "syndifox_dead"
icon_rest = "syndifox_rest"
@@ -1,3 +1,11 @@
/mob/living/simple_animal
// List of targets excluded (for now) from being eaten by this mob.
var/list/prey_exclusions = list()
var/icon_rest
/mob/living/simple_animal/cat
isPredator = 1
/mob/living/simple_animal/fluffy/lay_down() // Turns sprite into sleeping and back upon using "Rest".
..()
icon_state = resting ? "fluffy_sleep" : "fluffy"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

+1 -1
View File
@@ -5346,7 +5346,7 @@
"bYP" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/bridge_hallway)
"bYQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/door/firedoor,/obj/machinery/door/blast/shutters{dir = 8; id = "cap_office"; layer = 3.1; name = "Captain's Shutters"},/turf/simulated/floor/plating,/area/bridge_hallway)
"bYR" = (/obj/structure/bed/chair/comfy/brown{dir = 1},/turf/simulated/floor/carpet,/area/crew_quarters/captain)
"bYS" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/wood,/area/crew_quarters/captain)
"bYS" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/mob/living/simple_animal/fox/fluff/Renault,/turf/simulated/floor/wood,/area/crew_quarters/captain)
"bYT" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain)
"bYU" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/captain)
"bYV" = (/obj/structure/filingcabinet,/obj/machinery/light{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain)