From 0d9bdb9c46e06949a1c55454deccda0c1f03d376 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Mon, 6 Mar 2017 01:49:28 -0500 Subject: [PATCH 1/3] Adds more foxing Adds the captain's fox pet back in, adds resting sprites for foxes and the dastardly syndifox. --- .../mob/living/simple_animal/fluffy.dm | 6 ++++-- .../living/simple_animal/friendly/fox_vr.dm | 16 +++++++++++++++- .../living/simple_animal/simple_animal_vr.dm | 5 +++++ icons/mob/fox_vr.dmi | Bin 6661 -> 6660 bytes maps/virgo/virgo-1.dmm | 2 +- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/fluffy.dm b/code/modules/mob/living/simple_animal/fluffy.dm index f230c5f5c13..0a92b38f128 100644 --- a/code/modules/mob/living/simple_animal/fluffy.dm +++ b/code/modules/mob/living/simple_animal/fluffy.dm @@ -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 diff --git a/code/modules/mob/living/simple_animal/friendly/fox_vr.dm b/code/modules/mob/living/simple_animal/friendly/fox_vr.dm index d58afcb40ef..c5714f65768 100644 --- a/code/modules/mob/living/simple_animal/friendly/fox_vr.dm +++ b/code/modules/mob/living/simple_animal/friendly/fox_vr.dm @@ -52,6 +52,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 +311,12 @@ "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.") - ..() \ No newline at end of file + ..() + +/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" diff --git a/code/modules/mob/living/simple_animal/simple_animal_vr.dm b/code/modules/mob/living/simple_animal/simple_animal_vr.dm index ec0d15bcd7e..4fc93f8a668 100644 --- a/code/modules/mob/living/simple_animal/simple_animal_vr.dm +++ b/code/modules/mob/living/simple_animal/simple_animal_vr.dm @@ -1,3 +1,8 @@ /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/fluffy/lay_down() // Turns sprite into sleeping and back upon using "Rest". + ..() + icon_state = resting ? "fluffy_sleep" : "fluffy" diff --git a/icons/mob/fox_vr.dmi b/icons/mob/fox_vr.dmi index 8321ac9e9856f22805b35962cf118079cf3acee9..96b5164df54cd4b0e20fc6dce8d559be1a563f3c 100644 GIT binary patch delta 206 zcmV;<05SiCG=wy;ZvlU|dQ@0+L}hbha%pgMX>V=-0C=2@Q9%lWFc3UvUlH^wrHQ@v zQk3GMenA4e)!Xlbo&12UIcn3M0XH&McP-!Z-DV4{*XSBQ zq!L&|`rNqZV4ZU0X;gRj2pDQ(M+>mps4IiZ2IK`y3v9KUtYXATM delta 207 zcmV;=05JcAG=(&V=-0C=2JR&a84_w-Y6@%7{?OD!tS z%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DJ{Q3iHkEOv#1!Pg^M$- zC^0t`#5P1x6Q7crn1WDfh*O~vF{T+2Z(Mv)YH7;#m$HJZp9?rH0f;eyrKaiT Jd9yD9)fc0@S@!?{ diff --git a/maps/virgo/virgo-1.dmm b/maps/virgo/virgo-1.dmm index 577649ff610..adabd5ae14f 100644 --- a/maps/virgo/virgo-1.dmm +++ b/maps/virgo/virgo-1.dmm @@ -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) From da6d873ba430337f326a7df310ddc94136d96276 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Mon, 6 Mar 2017 01:51:30 -0500 Subject: [PATCH 2/3] Forgot the syndiresting --- code/modules/mob/living/simple_animal/friendly/fox_vr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/simple_animal/friendly/fox_vr.dm b/code/modules/mob/living/simple_animal/friendly/fox_vr.dm index c5714f65768..3c8fcecc8e7 100644 --- a/code/modules/mob/living/simple_animal/friendly/fox_vr.dm +++ b/code/modules/mob/living/simple_animal/friendly/fox_vr.dm @@ -320,3 +320,4 @@ icon_state = "syndifox" icon_living = "syndifox" icon_dead = "syndifox_dead" + icon_rest = "syndifox_rest" From dea94be3f22b8b2eac5791858ccad1a6cd4933f1 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Mon, 6 Mar 2017 01:59:00 -0500 Subject: [PATCH 3/3] Make more things eat each other --- code/modules/mob/living/simple_animal/friendly/fox_vr.dm | 1 + code/modules/mob/living/simple_animal/simple_animal_vr.dm | 3 +++ 2 files changed, 4 insertions(+) diff --git a/code/modules/mob/living/simple_animal/friendly/fox_vr.dm b/code/modules/mob/living/simple_animal/friendly/fox_vr.dm index 3c8fcecc8e7..3440bd7b0fb 100644 --- a/code/modules/mob/living/simple_animal/friendly/fox_vr.dm +++ b/code/modules/mob/living/simple_animal/friendly/fox_vr.dm @@ -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) diff --git a/code/modules/mob/living/simple_animal/simple_animal_vr.dm b/code/modules/mob/living/simple_animal/simple_animal_vr.dm index 4fc93f8a668..55d35a9af71 100644 --- a/code/modules/mob/living/simple_animal/simple_animal_vr.dm +++ b/code/modules/mob/living/simple_animal/simple_animal_vr.dm @@ -3,6 +3,9 @@ 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"