mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 22:50:26 +01:00
[MIRROR] Consistency for station pets. (#277)
* Consistency for station pets. (#52717) * Station pets! * Makes Lia and Sgt Araneus actual subtypes. * Fixes some vars. * Turns on AI for Cayenne and Lia, makes Lia neutral faction. * Gives Lamarr a description. * Pettable status and emotes for HoS and syndicate pet.. * Tom the mouse consistency. * Comment correction. * Consistency for station pets. Co-authored-by: uomo <51800976+uomo91@users.noreply.github.com>
This commit is contained in:
SkyratBot
@@ -9816,6 +9816,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable,
|
||||
/mob/living/simple_animal/hostile/lizard/wags_his_tail,
|
||||
/turf/open/floor/plating,
|
||||
/area/janitor)
|
||||
"awE" = (
|
||||
@@ -31244,7 +31245,6 @@
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/security/main)
|
||||
"bkz" = (
|
||||
/obj/structure/bed/dogbed/cayenne,
|
||||
/obj/machinery/computer/security/telescreen/entertainment{
|
||||
pixel_y = 32
|
||||
},
|
||||
@@ -31261,6 +31261,7 @@
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/bed/dogbed/lia,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/crew_quarters/heads/hos)
|
||||
"bkA" = (
|
||||
@@ -32221,17 +32222,7 @@
|
||||
/area/crew_quarters/heads/hos)
|
||||
"bmu" = (
|
||||
/obj/structure/cable,
|
||||
/mob/living/simple_animal/hostile/carp/cayenne{
|
||||
desc = "A failed experiment of Nanotrasen to create weaponised carp technology. This less than intimidating carp now serves as an authority figure's pet.";
|
||||
health = 200;
|
||||
icon_dead = "magicarp_dead";
|
||||
icon_gib = "magicarp_gib";
|
||||
icon_living = "magicarp";
|
||||
icon_state = "magicarp";
|
||||
maxHealth = 200;
|
||||
name = "Lia";
|
||||
random_color = 0
|
||||
},
|
||||
/mob/living/simple_animal/hostile/carp/cayenne/lia,
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/crew_quarters/heads/hos)
|
||||
"bmv" = (
|
||||
@@ -47894,19 +47885,9 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/warden)
|
||||
"bNo" = (
|
||||
/obj/structure/rack,
|
||||
/obj/item/storage/box/handcuffs,
|
||||
/obj/item/storage/box/flashbangs{
|
||||
pixel_x = 3;
|
||||
pixel_y = -3
|
||||
},
|
||||
/obj/item/radio/intercom{
|
||||
pixel_x = 26
|
||||
},
|
||||
/obj/item/clothing/mask/gas/sechailer,
|
||||
/obj/item/clothing/mask/gas/sechailer,
|
||||
/obj/item/flashlight/seclite,
|
||||
/obj/item/flashlight/seclite,
|
||||
/obj/effect/turf_decal/tile/red{
|
||||
dir = 1
|
||||
},
|
||||
@@ -47914,6 +47895,8 @@
|
||||
/obj/effect/turf_decal/tile/red{
|
||||
dir = 4
|
||||
},
|
||||
/mob/living/simple_animal/pet/dog/pug/mcgriff,
|
||||
/obj/structure/bed/dogbed/mcgriff,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/warden)
|
||||
"bNp" = (
|
||||
@@ -56503,6 +56486,8 @@
|
||||
/obj/effect/turf_decal/tile/red{
|
||||
dir = 8
|
||||
},
|
||||
/obj/item/storage/box/flashbangs,
|
||||
/obj/item/storage/box/handcuffs,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/warden)
|
||||
"cbG" = (
|
||||
@@ -112681,7 +112666,7 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/prison/safe)
|
||||
"jwH" = (
|
||||
/mob/living/simple_animal/mouse/brown,
|
||||
/mob/living/simple_animal/mouse/brown/tom,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/prison)
|
||||
"jAK" = (
|
||||
|
||||
@@ -1607,6 +1607,8 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/structure/cable,
|
||||
/obj/structure/bed/dogbed/lia,
|
||||
/mob/living/simple_animal/hostile/carp/cayenne/lia,
|
||||
/turf/open/floor/carpet,
|
||||
/area/crew_quarters/heads/hos)
|
||||
"adO" = (
|
||||
@@ -2119,16 +2121,8 @@
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/rack,
|
||||
/obj/item/clothing/mask/gas/sechailer{
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
/obj/item/clothing/mask/gas/sechailer,
|
||||
/obj/item/clothing/mask/gas/sechailer{
|
||||
pixel_x = 3;
|
||||
pixel_y = -3
|
||||
},
|
||||
/obj/structure/bed/dogbed/mcgriff,
|
||||
/mob/living/simple_animal/pet/dog/pug/mcgriff,
|
||||
/turf/open/floor/plasteel/showroomfloor,
|
||||
/area/security/warden)
|
||||
"aeX" = (
|
||||
@@ -48831,10 +48825,7 @@
|
||||
/area/maintenance/port/aft)
|
||||
"cAL" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/mob/living/simple_animal/hostile/lizard{
|
||||
name = "Wags-His-Tail";
|
||||
real_name = "Wags-His-Tail"
|
||||
},
|
||||
/mob/living/simple_animal/hostile/lizard/wags_his_tail,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/janitor)
|
||||
"cAN" = (
|
||||
|
||||
@@ -3231,29 +3231,7 @@
|
||||
"aha" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/obj/structure/cable,
|
||||
/mob/living/simple_animal/hostile/retaliate/bat{
|
||||
desc = "A fierce companion for any person of power, this spider has been carefully trained by Nanotrasen specialists. Its beady, staring eyes send shivers down your spine.";
|
||||
emote_hear = list("chitters");
|
||||
faction = list("spiders");
|
||||
harm_intent_damage = 3;
|
||||
health = 200;
|
||||
icon_dead = "guard_dead";
|
||||
icon_gib = "guard_dead";
|
||||
icon_living = "guard";
|
||||
icon_state = "guard";
|
||||
maxHealth = 250;
|
||||
max_co2 = 5;
|
||||
max_tox = 2;
|
||||
melee_damage_lower = 15;
|
||||
melee_damage_upper = 20;
|
||||
min_oxy = 5;
|
||||
movement_type = 1;
|
||||
name = "Sergeant Araneus";
|
||||
real_name = "Sergeant Araneus";
|
||||
response_help_continuous = "pets";
|
||||
response_help_simple = "pet";
|
||||
turns_per_move = 10
|
||||
},
|
||||
/mob/living/simple_animal/hostile/retaliate/bat/sgt_araneus,
|
||||
/turf/open/floor/carpet,
|
||||
/area/crew_quarters/heads/hos)
|
||||
"ahb" = (
|
||||
@@ -4274,10 +4252,7 @@
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 4
|
||||
},
|
||||
/mob/living/simple_animal/hostile/lizard{
|
||||
name = "Wags-His-Tail";
|
||||
real_name = "Wags-His-Tail"
|
||||
},
|
||||
/mob/living/simple_animal/hostile/lizard/wags_his_tail,
|
||||
/turf/open/floor/plating,
|
||||
/area/janitor)
|
||||
"ajl" = (
|
||||
@@ -73024,6 +72999,8 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable,
|
||||
/mob/living/simple_animal/pet/dog/pug/mcgriff,
|
||||
/obj/structure/bed/dogbed/mcgriff,
|
||||
/turf/open/floor/plasteel/showroomfloor,
|
||||
/area/security/warden)
|
||||
"mEn" = (
|
||||
|
||||
@@ -5351,6 +5351,7 @@
|
||||
/obj/effect/turf_decal/tile/red{
|
||||
dir = 4
|
||||
},
|
||||
/mob/living/simple_animal/hostile/retaliate/bat/sgt_araneus,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/crew_quarters/heads/hos)
|
||||
"anT" = (
|
||||
@@ -5481,16 +5482,14 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/brig)
|
||||
"aop" = (
|
||||
/obj/structure/bed/dogbed,
|
||||
/obj/machinery/requests_console{
|
||||
department = "Security";
|
||||
departmentType = 5;
|
||||
pixel_x = -32
|
||||
},
|
||||
/obj/structure/cable,
|
||||
/mob/living/simple_animal/pet/dog/pug{
|
||||
name = "McGriff"
|
||||
},
|
||||
/mob/living/simple_animal/pet/dog/pug/mcgriff,
|
||||
/obj/structure/bed/dogbed/mcgriff,
|
||||
/turf/open/floor/plasteel/showroomfloor,
|
||||
/area/security/warden)
|
||||
"aoq" = (
|
||||
@@ -44848,6 +44847,11 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/tcommsat/computer)
|
||||
"clK" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
|
||||
/mob/living/simple_animal/mouse/brown/tom,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/security/prison)
|
||||
"clL" = (
|
||||
/turf/closed/wall,
|
||||
/area/tcommsat/computer)
|
||||
@@ -52646,6 +52650,11 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/library/artgallery)
|
||||
"kHO" = (
|
||||
/mob/living/simple_animal/pet/fox/renault,
|
||||
/obj/structure/bed/dogbed/renault,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/crew_quarters/heads/captain)
|
||||
"kHP" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/machinery/button/door{
|
||||
@@ -54684,6 +54693,11 @@
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/storage/primary)
|
||||
"oAk" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/mob/living/simple_animal/hostile/lizard/wags_his_tail,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/janitor)
|
||||
"oAw" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 4
|
||||
@@ -56507,6 +56521,10 @@
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/engine/engineering)
|
||||
"sql" = (
|
||||
/mob/living/simple_animal/sloth/paperwork,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/quartermaster/storage)
|
||||
"sqQ" = (
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/disposal)
|
||||
@@ -80073,7 +80091,7 @@ aeF
|
||||
aeV
|
||||
afq
|
||||
afF
|
||||
agb
|
||||
clK
|
||||
agb
|
||||
agA
|
||||
agA
|
||||
@@ -84497,7 +84515,7 @@ aXO
|
||||
aYM
|
||||
aZP
|
||||
baY
|
||||
aZP
|
||||
oAk
|
||||
bdh
|
||||
bed
|
||||
aVS
|
||||
@@ -88072,7 +88090,7 @@ aAy
|
||||
aBp
|
||||
aCC
|
||||
aDG
|
||||
aBm
|
||||
kHO
|
||||
aFz
|
||||
aGm
|
||||
awR
|
||||
@@ -99912,7 +99930,7 @@ aTn
|
||||
aUx
|
||||
aVA
|
||||
aTm
|
||||
aTm
|
||||
sql
|
||||
aTj
|
||||
aZr
|
||||
baD
|
||||
|
||||
@@ -7635,6 +7635,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/mob/living/simple_animal/hostile/carp/cayenne,
|
||||
/obj/structure/bed/dogbed/cayenne,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/syndicate_mothership/control)
|
||||
"rh" = (
|
||||
@@ -36800,11 +36801,11 @@ ll
|
||||
pF
|
||||
qa
|
||||
pZ
|
||||
pZ
|
||||
sh
|
||||
sh
|
||||
pZ
|
||||
rg
|
||||
sh
|
||||
sh
|
||||
pZ
|
||||
pZ
|
||||
Qd
|
||||
wo
|
||||
tZ
|
||||
|
||||
@@ -179,12 +179,21 @@
|
||||
desc = "Seems kind of... fishy."
|
||||
name = "Cayenne's bed"
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/bed/dogbed/lia
|
||||
desc = "Seems kind of... fishy."
|
||||
name = "Lia's bed"
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/bed/dogbed/renault
|
||||
desc = "Renault's bed! Looks comfy. A foxy person needs a foxy pet."
|
||||
name = "Renault's bed"
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/bed/dogbed/mcgriff
|
||||
desc = "McGriff's bed, because even crimefighters sometimes need a nap."
|
||||
name = "McGriff's bed"
|
||||
|
||||
/obj/structure/bed/dogbed/runtime
|
||||
desc = "A comfy-looking cat bed. You can even strap your pet in, in case the gravity turns off."
|
||||
name = "Runtime's bed"
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
|
||||
/obj/item/clothing/mask/facehugger/lamarr
|
||||
name = "Lamarr"
|
||||
desc = "The Research Director's pet, a domesticated and debeaked xenomorph facehugger. Friendly, but may still try to couple with your head."
|
||||
sterile = 1
|
||||
|
||||
/obj/item/clothing/mask/facehugger/dead
|
||||
|
||||
@@ -128,6 +128,10 @@
|
||||
collar_type = "pug"
|
||||
held_state = "pug"
|
||||
|
||||
/mob/living/simple_animal/pet/dog/pug/mcgriff
|
||||
name = "McGriff"
|
||||
desc = "This dog can tell someting smells around here, and that something is CRIME!"
|
||||
|
||||
/mob/living/simple_animal/pet/dog/corgi/exoticcorgi
|
||||
name = "Exotic Corgi"
|
||||
desc = "As cute as it is colorful!"
|
||||
|
||||
@@ -54,3 +54,7 @@
|
||||
unsuitable_atmos_damage = 0
|
||||
minbodytemp = TCMB
|
||||
maxbodytemp = T0C + 40
|
||||
|
||||
/mob/living/simple_animal/hostile/lizard/wags_his_tail
|
||||
name = "Wags-His-Tail"
|
||||
desc = "The janitorial department's trusty pet lizard."
|
||||
|
||||
@@ -163,6 +163,8 @@
|
||||
response_harm_continuous = "splats"
|
||||
response_harm_simple = "splat"
|
||||
gold_core_spawnable = NO_SPAWN
|
||||
pet_bonus = TRUE
|
||||
pet_bonus_emote = "squeaks happily!"
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/deadmouse
|
||||
name = "dead mouse"
|
||||
|
||||
@@ -222,15 +222,30 @@
|
||||
|
||||
/mob/living/simple_animal/hostile/carp/cayenne
|
||||
name = "Cayenne"
|
||||
real_name = "Cayenne"
|
||||
desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot."
|
||||
gender = FEMALE
|
||||
speak_emote = list("squeaks")
|
||||
gold_core_spawnable = NO_SPAWN
|
||||
faction = list(ROLE_SYNDICATE)
|
||||
AIStatus = AI_OFF
|
||||
rarechance = 10
|
||||
food_type = list()
|
||||
tame_chance = 0
|
||||
bonus_tame_chance = 0
|
||||
pet_bonus = TRUE
|
||||
pet_bonus_emote = "bloops happily!"
|
||||
|
||||
/mob/living/simple_animal/hostile/carp/cayenne/lia
|
||||
name = "Lia"
|
||||
real_name = "Lia"
|
||||
desc = "A failed experiment of Nanotrasen to create weaponised carp technology. This less than intimidating carp now serves as the Head of Security's pet."
|
||||
faction = list("neutral")
|
||||
health = 200
|
||||
icon_dead = "magicarp_dead"
|
||||
icon_gib = "magicarp_gib"
|
||||
icon_living = "magicarp"
|
||||
icon_state = "magicarp"
|
||||
maxHealth = 200
|
||||
random_color = FALSE
|
||||
|
||||
#undef REGENERATION_DELAY
|
||||
|
||||
@@ -33,8 +33,6 @@
|
||||
var/max_co2 = 0 //to be removed once metastation map no longer use those for Sgt Araneus
|
||||
var/min_oxy = 0
|
||||
var/max_tox = 0
|
||||
|
||||
|
||||
//Space bats need no air to fly in.
|
||||
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
|
||||
minbodytemp = 0
|
||||
@@ -42,3 +40,28 @@
|
||||
/mob/living/simple_animal/hostile/retaliate/bat/Initialize()
|
||||
. = ..()
|
||||
ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
|
||||
|
||||
/mob/living/simple_animal/hostile/retaliate/bat/sgt_araneus //Despite being a bat for... reasons, this is now a spider, and is one of the HoS' pets.
|
||||
name = "Sergeant Araneus"
|
||||
real_name = "Sergeant Araneus"
|
||||
desc = "A fierce companion of the Head of Security, this spider has been carefully trained by Nanotrasen specialists. Its beady, staring eyes send shivers down your spine."
|
||||
emote_hear = list("chitters")
|
||||
faction = list("spiders")
|
||||
harm_intent_damage = 3
|
||||
health = 200
|
||||
icon_dead = "guard_dead"
|
||||
icon_gib = "guard_dead"
|
||||
icon_living = "guard"
|
||||
icon_state = "guard"
|
||||
maxHealth = 250
|
||||
max_co2 = 5
|
||||
max_tox = 2
|
||||
melee_damage_lower = 15
|
||||
melee_damage_upper = 20
|
||||
min_oxy = 5
|
||||
movement_type = GROUND
|
||||
response_help_continuous = "pets"
|
||||
response_help_simple = "pet"
|
||||
turns_per_move = 10
|
||||
pet_bonus = TRUE
|
||||
pet_bonus_emote = "chitters proudly!"
|
||||
|
||||
Reference in New Issue
Block a user