From 83b66d78e9ef5379395e9358d461aa47cdfd6cc7 Mon Sep 17 00:00:00 2001 From: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com> Date: Sat, 22 Apr 2023 09:42:29 +0100 Subject: [PATCH] SharkWaifu's Donator Item (#203) * SharkWaifu's donator cat * Update cat.dm * Update cat.dm * Should pass unit tests now! --- .../Deltastation/DeltaStation2_bubber.dmm | 9 +++++++++ .../IceBoxStation/IceBoxStation_bubber.dmm | 14 +++++++++++++- .../map_files/MetaStation/MetaStation_bubber.dmm | 9 +++++++++ _maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm | 12 ++++++++++-- .../map_files/tramstation/tramstation_bubber.dmm | 14 +++++++++++++- modular_zubbers/icons/mob/simple/pets.dmi | Bin 0 -> 1295 bytes 6 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 modular_zubbers/icons/mob/simple/pets.dmi diff --git a/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm b/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm index bf7a52a08f2..763be344b09 100644 --- a/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm @@ -82188,6 +82188,15 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/mob/living/simple_animal/pet/cat{ + desc = "Their name is pancake! They're very social, snuggly, and a bit dumb... But nonetheless, a good cat!"; + icon = 'modular_zubbers/icons/mob/simple/pets.dmi'; + icon_dead = "pancake_dead"; + icon_living = "pancake"; + icon_state = "pancake"; + minbodytemp = 0; + name = "Pancake" + }, /turf/open/floor/wood/large, /area/station/medical/psychology) "tUR" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm b/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm index 0aa663e8975..d88d22b36f0 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm @@ -66803,6 +66803,18 @@ /obj/structure/sign/warning/docking/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"uen" = ( +/mob/living/simple_animal/pet/cat{ + desc = "Their name is pancake! They're very social, snuggly, and a bit dumb... But nonetheless, a good cat!"; + icon = 'modular_zubbers/icons/mob/simple/pets.dmi'; + icon_dead = "pancake_dead"; + icon_living = "pancake"; + icon_state = "pancake"; + minbodytemp = 0; + name = "Pancake" + }, +/turf/open/floor/carpet/blue, +/area/station/medical/psychology) "ueo" = ( /obj/machinery/light/warm/directional/south, /obj/structure/cable, @@ -251291,7 +251303,7 @@ iML nHX hRA qAO -rkL +uen uFz kJC sZF diff --git a/_maps/map_files/MetaStation/MetaStation_bubber.dmm b/_maps/map_files/MetaStation/MetaStation_bubber.dmm index c98e3999829..4889ce58390 100644 --- a/_maps/map_files/MetaStation/MetaStation_bubber.dmm +++ b/_maps/map_files/MetaStation/MetaStation_bubber.dmm @@ -62084,6 +62084,15 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, +/mob/living/simple_animal/pet/cat{ + desc = "Their name is pancake! They're very social, snuggly, and a bit dumb... But nonetheless, a good cat!"; + icon = 'modular_zubbers/icons/mob/simple/pets.dmi'; + icon_dead = "pancake_dead"; + icon_living = "pancake"; + icon_state = "pancake"; + minbodytemp = 0; + name = "Pancake" + }, /turf/open/floor/wood/parquet, /area/station/medical/psychology) "vnZ" = ( diff --git a/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm b/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm index 072af941363..c4e97076447 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm @@ -76317,8 +76317,16 @@ dir = 9 }, /obj/structure/bed/dogbed{ - anchored = 1; - name = "Tom's bed" + name = "Pancake's bed" + }, +/mob/living/simple_animal/pet/cat{ + desc = "Their name is pancake! They're very social, snuggly, and a bit dumb... But nonetheless, a good cat!"; + icon = 'modular_zubbers/icons/mob/simple/pets.dmi'; + icon_dead = "pancake_dead"; + icon_living = "pancake"; + icon_state = "pancake"; + minbodytemp = 0; + name = "Pancake" }, /turf/open/floor/carpet, /area/station/medical/psychology) diff --git a/_maps/map_files/tramstation/tramstation_bubber.dmm b/_maps/map_files/tramstation/tramstation_bubber.dmm index 7b5a645019e..370c1680c52 100644 --- a/_maps/map_files/tramstation/tramstation_bubber.dmm +++ b/_maps/map_files/tramstation/tramstation_bubber.dmm @@ -69375,6 +69375,18 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/command/teleporter) +"xzF" = ( +/mob/living/simple_animal/pet/cat{ + desc = "Their name is pancake! They're very social, snuggly, and a bit dumb... But nonetheless, a good cat!"; + icon = 'modular_zubbers/icons/mob/simple/pets.dmi'; + icon_dead = "pancake_dead"; + icon_living = "pancake"; + icon_state = "pancake"; + minbodytemp = 0; + name = "Pancake" + }, +/turf/open/floor/carpet, +/area/station/medical/psychology) "xzI" = ( /obj/machinery/vending/games, /obj/structure/sign/clock/directional/north, @@ -172261,7 +172273,7 @@ rzj qkh bFq rcD -nPe +xzF nPe nPe msF diff --git a/modular_zubbers/icons/mob/simple/pets.dmi b/modular_zubbers/icons/mob/simple/pets.dmi new file mode 100644 index 0000000000000000000000000000000000000000..d536061a06c65ecb0574d7ea20781acff9cdafd3 GIT binary patch literal 1295 zcmV+q1@QWbP) zzmMFVWTa>@?yq;0S|z7vIJI*(=%j}6sfk@%Si{4^+}qmb<>WUV1@rUs|NsB_yu8GS zQMI+T00030|Nke)j57cL00DGTPE!Ct=GbNc004q|R9JLGWpiV4X>fFDZ*Bkpc$`yK zaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KBS zATcjFF*{X>i!&v&s2HS;i!-e#F*g;&HpEaDpOTuGf>3OTUvW`taS73ii!*VmRaS8I za{+q~0NJTR?UtUrKL7v&?MXyIRA_YM|xJR+1hA zi>8R*Mgu&IJK7BMqwn)(GIYu7ecl(0>1Bu{^g6Moh_weW-U)yTCfZ!=08|$zwSE4L zDFOT3DS~zWWeTt}ZU&H3x64qHiWe(n5}{(U3y_pQiZ z;~kQI8DT5=pGI{Ci~o1O*`MK;Y7JHa59QAg^umj;s=*yv!RNI=(y!FOv1@$S^ZJ#3 z!PEx2zju`YX;bc^>D{3!@5EIP8vTw5>I~3Kyy0UByiI` ztDKT*aK$~sJTNc~GMj>#;Y+?|26#iN{YP~nW9nMvm{fYJ##a}y$j;$MT86KMS>vfc z^bh`}u2oj^Fu$2s0E^+-i)$EAL7C6h{MA*81 z`T^~7N@b(-!z}#6)&e|YK*W&39WiPn>Q#ICgcB!D{Ns4)5yT(B+WtR`-`f5^3g-6z zL9n;~4}!h@e^h{~X-d2Oe-u>H?CkL$5uk1oTMsFofWJ?>SN&seef}JDm*A=kU&8