From b06b1d16a8d345c13fed90fb1dfeea9d81c88f69 Mon Sep 17 00:00:00 2001 From: Spades Date: Sat, 28 Apr 2018 13:37:41 -0400 Subject: [PATCH 1/2] Makes file pathing for mobs not complete autism --- .../structures/crates_lockers/largecrate_vr.dm | 4 ++-- .../vore/{badboi.dm => corrupt_hounds.dm} | 12 ++++++------ .../living/simple_animal/vore/{rous.dm => rat.dm} | 4 ++-- .../simple_animal/vore/{wah.dm => redpanda.dm} | 6 +++--- maps/tether/submaps/aerostat/_aerostat.dm | 4 ++-- maps/tether/tether_things.dm | 4 ++-- vorestation.dme | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) rename code/modules/mob/living/simple_animal/vore/{badboi.dm => corrupt_hounds.dm} (91%) rename code/modules/mob/living/simple_animal/vore/{rous.dm => rat.dm} (93%) rename code/modules/mob/living/simple_animal/vore/{wah.dm => redpanda.dm} (92%) diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index 014b49b522..4215d3d538 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -54,7 +54,7 @@ /mob/living/simple_animal/hostile/bear/brown;0.5, /mob/living/simple_animal/hostile/carp, /mob/living/simple_animal/hostile/mimic, - /mob/living/simple_animal/hostile/rous, + /mob/living/simple_animal/hostile/rat, /mob/living/simple_animal/otie;0.5) ..() @@ -73,7 +73,7 @@ /mob/living/simple_animal/hostile/alien/sentinel, /mob/living/simple_animal/hostile/alien/queen, /mob/living/simple_animal/otie/feral, - /mob/living/simple_animal/hostile/badboi) + /mob/living/simple_animal/hostile/corrupthound) ..() /obj/structure/largecrate/animal/guardbeast diff --git a/code/modules/mob/living/simple_animal/vore/badboi.dm b/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm similarity index 91% rename from code/modules/mob/living/simple_animal/vore/badboi.dm rename to code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm index 7a48eed575..26aede0557 100644 --- a/code/modules/mob/living/simple_animal/vore/badboi.dm +++ b/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/hostile/badboi +/mob/living/simple_animal/hostile/corrupthound name = "corrupt hound" desc = "Good boy machine broke. This is definitely no good news for the organic lifeforms in vicinity." icon = 'icons/mob/vore64x32.dmi' @@ -57,7 +57,7 @@ loot_list = list(/obj/item/borg/upgrade/syndicate = 6, /obj/item/borg/upgrade/vtec = 6, /obj/item/weapon/material/knife/ritual = 6, /obj/item/weapon/disk/nifsoft/compliance = 6) -/mob/living/simple_animal/hostile/badboi/prettyboi +/mob/living/simple_animal/hostile/corrupthound/prettyboi name = "corrupt corrupt hound" desc = "Bad boy machine broke as well. Seems an attempt was made to achieve a less threatening look, and this one is definitely having some conflicting feelings about it." icon_state = "prettyboi" @@ -76,18 +76,18 @@ say_got_target = list("HERE COMES BIG MEAN HUG MACHINE!", "I'LL BE GENTLE!", "FUEL ME FRIEND!", "I*M SO SORRY!", "YUMMY TREAT DETECTED!", "LOVE ME!", "Not again. NOT AGAIN!") -/mob/living/simple_animal/hostile/badboi/isSynthetic() +/mob/living/simple_animal/hostile/corrupthound/isSynthetic() return TRUE -/mob/living/simple_animal/hostile/badboi/speech_bubble_appearance() +/mob/living/simple_animal/hostile/corrupthound/speech_bubble_appearance() return "synthetic_evil" -/mob/living/simple_animal/hostile/badboi/PunchTarget() +/mob/living/simple_animal/hostile/corrupthound/PunchTarget() if(istype(target_mob,/mob/living/simple_animal/mouse)) return EatTarget() else ..() -/mob/living/simple_animal/hostile/badboi/death(gibbed, deathmessage = "shudders and collapses!") +/mob/living/simple_animal/hostile/corrupthound/death(gibbed, deathmessage = "shudders and collapses!") .=..() resting = 0 icon_state = icon_dead diff --git a/code/modules/mob/living/simple_animal/vore/rous.dm b/code/modules/mob/living/simple_animal/vore/rat.dm similarity index 93% rename from code/modules/mob/living/simple_animal/vore/rous.dm rename to code/modules/mob/living/simple_animal/vore/rat.dm index 9b47810f36..804e5b107c 100644 --- a/code/modules/mob/living/simple_animal/vore/rous.dm +++ b/code/modules/mob/living/simple_animal/vore/rat.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/hostile/rous +/mob/living/simple_animal/hostile/rat name = "giant rat" desc = "In what passes for a hierarchy among verminous rodents, this one is king." tt_desc = "Mus muscular" @@ -41,6 +41,6 @@ vore_pounce_chance = 45 vore_icons = SA_ICON_LIVING | SA_ICON_REST -/mob/living/simple_animal/hostile/rous/death() +/mob/living/simple_animal/hostile/rat/death() playsound(src, 'sound/effects/mouse_squeak_loud.ogg', 50, 1) ..() diff --git a/code/modules/mob/living/simple_animal/vore/wah.dm b/code/modules/mob/living/simple_animal/vore/redpanda.dm similarity index 92% rename from code/modules/mob/living/simple_animal/vore/wah.dm rename to code/modules/mob/living/simple_animal/vore/redpanda.dm index 316441edd7..6047425f18 100644 --- a/code/modules/mob/living/simple_animal/vore/wah.dm +++ b/code/modules/mob/living/simple_animal/vore/redpanda.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/wah +/mob/living/simple_animal/redpanda name = "red panda" desc = "It's a wah! Beware of doom pounce!" tt_desc = "Ailurus fulgens" @@ -29,7 +29,7 @@ emote_see = list("trundles around","rears up onto their hind legs and pounces a bug") // Activate Noms! -/mob/living/simple_animal/wah +/mob/living/simple_animal/redpanda vore_active = 1 vore_bump_chance = 10 vore_bump_emote = "playfully lunges at" @@ -37,7 +37,7 @@ vore_default_mode = DM_HOLD // above will only matter if someone toggles it anyway vore_icons = SA_ICON_LIVING -/mob/living/simple_animal/wah/fae +/mob/living/simple_animal/redpanda/fae name = "dark wah" desc = "Ominous, but still cute!" tt_desc = "Ailurus brattus" diff --git a/maps/tether/submaps/aerostat/_aerostat.dm b/maps/tether/submaps/aerostat/_aerostat.dm index 0200052956..6b754e8593 100644 --- a/maps/tether/submaps/aerostat/_aerostat.dm +++ b/maps/tether/submaps/aerostat/_aerostat.dm @@ -67,7 +67,7 @@ /mob/living/simple_animal/hostile/hivebot/range = 3, /mob/living/simple_animal/hostile/hivebot/range/ion = 3, /mob/living/simple_animal/hostile/hivebot/range/laser = 3, - /mob/living/simple_animal/hostile/badboi = 1 + /mob/living/simple_animal/hostile/corrupthound = 1 ) /obj/tether_away_spawner/aerostat_surface @@ -80,7 +80,7 @@ mobs_to_pick_from = list( /mob/living/simple_animal/hostile/jelly = 3, /mob/living/simple_animal/hostile/viscerator = 2, - /mob/living/simple_animal/hostile/badboi = 1 + /mob/living/simple_animal/hostile/corrupthound = 1 ) /obj/structure/old_roboprinter diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index 46177a74c7..eecf90edff 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -420,8 +420,8 @@ var/global/list/latejoin_tram = list() prob_fall = 50 guard = 20 mobs_to_pick_from = list( - /mob/living/simple_animal/hostile/badboi = 1, - /mob/living/simple_animal/hostile/rous = 1, + /mob/living/simple_animal/hostile/corrupthound = 1, + /mob/living/simple_animal/hostile/rat = 1, /mob/living/simple_animal/hostile/mimic = 1 ) diff --git a/vorestation.dme b/vorestation.dme index 1ba0d0925a..2f781c10e7 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2197,10 +2197,10 @@ #include "code\modules\mob\living\simple_animal\slime\slime.dm" #include "code\modules\mob\living\simple_animal\slime\subtypes.dm" #include "code\modules\mob\living\simple_animal\vore\awoo.dm" -#include "code\modules\mob\living\simple_animal\vore\badboi.dm" #include "code\modules\mob\living\simple_animal\vore\bee.dm" #include "code\modules\mob\living\simple_animal\vore\carp.dm" #include "code\modules\mob\living\simple_animal\vore\catgirl.dm" +#include "code\modules\mob\living\simple_animal\vore\corrupt_hounds.dm" #include "code\modules\mob\living\simple_animal\vore\deathclaw.dm" #include "code\modules\mob\living\simple_animal\vore\dino.dm" #include "code\modules\mob\living\simple_animal\vore\dragon.dm" @@ -2211,11 +2211,11 @@ #include "code\modules\mob\living\simple_animal\vore\jelly.dm" #include "code\modules\mob\living\simple_animal\vore\otie.dm" #include "code\modules\mob\living\simple_animal\vore\panther.dm" -#include "code\modules\mob\living\simple_animal\vore\rous.dm" +#include "code\modules\mob\living\simple_animal\vore\rat.dm" +#include "code\modules\mob\living\simple_animal\vore\redpanda.dm" #include "code\modules\mob\living\simple_animal\vore\snake.dm" #include "code\modules\mob\living\simple_animal\vore\solargrub.dm" #include "code\modules\mob\living\simple_animal\vore\solargrub_larva.dm" -#include "code\modules\mob\living\simple_animal\vore\wah.dm" #include "code\modules\mob\living\simple_animal\vore\wolf.dm" #include "code\modules\mob\living\simple_animal\vore\zz_vore_overrides.dm" #include "code\modules\mob\living\simple_animal\vore\shadekin\_defines.dm" From 02f0eda79352f2674025d6a207acf25099671d92 Mon Sep 17 00:00:00 2001 From: Spades Date: Sun, 29 Apr 2018 07:54:16 -0400 Subject: [PATCH 2/2] Fixed spa.dmm --- maps/tether/submaps/admin_use/spa.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/tether/submaps/admin_use/spa.dmm b/maps/tether/submaps/admin_use/spa.dmm index ded0c7995e..b8784719b3 100644 --- a/maps/tether/submaps/admin_use/spa.dmm +++ b/maps/tether/submaps/admin_use/spa.dmm @@ -623,7 +623,7 @@ }, /area/space) "bW" = ( -/mob/living/simple_animal/wah, +/mob/living/simple_animal/redpanda, /turf/simulated/floor/grass, /area/submap/spa) "bX" = (