Merge pull request #13096 from Michiyamenotehifunana/possum

Ports Opossums from Desert Rose
This commit is contained in:
silicons
2020-08-11 16:19:42 -07:00
committed by GitHub
11 changed files with 137 additions and 14 deletions
+10 -2
View File
@@ -56023,6 +56023,10 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/theatre)
"kEm" = (
/mob/living/simple_animal/opossum/poppy,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"kEY" = (
/obj/effect/landmark/stationroom/box/engine,
/turf/open/space/basic,
@@ -58150,6 +58154,10 @@
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plating,
/area/maintenance/fore)
"rtU" = (
/mob/living/simple_animal/opossum,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"ruo" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -85334,7 +85342,7 @@ bVI
bTA
xgk
bHE
bHE
kEm
bHE
bHE
bHE
@@ -104279,7 +104287,7 @@ anf
anf
alP
alP
anf
rtU
alP
alP
alP
+13 -2
View File
@@ -126384,6 +126384,13 @@
},
/turf/open/space,
/area/engine/atmos)
"kqo" = (
/obj/structure/cable/white{
icon_state = "4-8"
},
/mob/living/simple_animal/opossum,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"ktK" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -127042,6 +127049,10 @@
dir = 1
},
/area/science/circuit)
"pok" = (
/mob/living/simple_animal/opossum/poppy,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/theatre/abandoned)
"poI" = (
/obj/structure/bed,
/obj/item/tank/internals/anesthetic,
@@ -164027,7 +164038,7 @@ aof
aky
aky
aky
arD
kqo
asZ
aui
avF
@@ -178786,7 +178797,7 @@ dCX
dEj
dFq
dGJ
dGJ
pok
dJy
dGJ
dGJ
+7 -1
View File
@@ -78498,6 +78498,7 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/mob/living/simple_animal/opossum/poppy,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
@@ -84902,6 +84903,11 @@
/obj/machinery/light,
/turf/open/floor/plating/airless,
/area/hallway/secondary/entry)
"jGN" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/opossum,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"jHJ" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 9
@@ -125028,7 +125034,7 @@ bAP
bCf
bhQ
bhQ
bAM
jGN
bGH
bOc
bHZ
+11 -2
View File
@@ -80285,6 +80285,11 @@
},
/turf/open/space/basic,
/area/engine/engineering)
"eCO" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/opossum/poppy,
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard/aft)
"eDP" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 8
@@ -82038,6 +82043,10 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"vDO" = (
/mob/living/simple_animal/opossum,
/turf/open/floor/plating,
/area/maintenance/fore)
"vDW" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -107578,7 +107587,7 @@ aaA
abY
ayy
acw
acw
vDO
acw
acw
aeG
@@ -135197,7 +135206,7 @@ bPp
ccJ
clR
bQh
clN
eCO
bPp
bQh
bYx
+12 -1
View File
@@ -10324,6 +10324,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"atd" = (
/mob/living/simple_animal/opossum,
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -82149,6 +82150,16 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"pbc" = (
/obj/structure/light_construct/small{
dir = 4
},
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = 30
},
/mob/living/simple_animal/opossum/poppy,
/turf/open/floor/wood,
/area/maintenance/port/aft)
"pbF" = (
/obj/machinery/portable_atmospherics/canister,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -100175,7 +100186,7 @@ csT
dux
cxQ
ckS
cmi
pbc
cnk
ckP
cmi
+16 -2
View File
@@ -41988,6 +41988,16 @@
},
/turf/open/floor/plasteel,
/area/hydroponics)
"saI" = (
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/mob/living/simple_animal/opossum,
/turf/open/floor/plating,
/area/maintenance/starboard)
"scn" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -45205,6 +45215,10 @@
/obj/effect/landmark/carpspawn,
/turf/open/space,
/area/space/station_ruins)
"uXV" = (
/mob/living/simple_animal/opossum/poppy,
/turf/open/floor/wood,
/area/maintenance/port/aft)
"ver" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 10
@@ -79446,7 +79460,7 @@ aFM
aOH
aOT
aPV
aRm
uXV
aSI
aRC
aKm
@@ -92526,7 +92540,7 @@ aSD
aRz
aRz
aRz
sGY
saI
aRz
sIb
bsD
+20 -2
View File
@@ -54046,6 +54046,20 @@
},
/turf/open/floor/plasteel,
/area/construction/mining/aux_base)
"fgS" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/mob/living/simple_animal/opossum/poppy,
/turf/open/floor/plasteel/dark,
/area/maintenance/department/engine)
"fhM" = (
/obj/item/storage/secure/safe{
pixel_x = -22
@@ -58645,6 +58659,10 @@
"pyw" = (
/turf/open/space/basic,
/area/hallway/secondary/entry)
"pzF" = (
/mob/living/simple_animal/opossum,
/turf/open/floor/wood,
/area/maintenance/department/crew_quarters/dorms)
"pBD" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -83454,7 +83472,7 @@ bHP
bJb
bJb
bJb
bJb
fgS
bJb
bJb
bPp
@@ -99823,7 +99841,7 @@ akh
alc
alR
amF
alb
pzF
alb
anm
ajv
+10 -2
View File
@@ -18912,6 +18912,10 @@
},
/turf/open/floor/plasteel,
/area/storage/primary)
"ihL" = (
/mob/living/simple_animal/opossum,
/turf/open/floor/plating,
/area/maintenance/aft/secondary)
"ihX" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -24053,6 +24057,10 @@
"luo" = (
/turf/open/floor/plasteel/white,
/area/science/misc_lab)
"lwl" = (
/mob/living/simple_animal/opossum/poppy,
/turf/open/floor/plating,
/area/engine/engineering)
"lwH" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -83466,7 +83474,7 @@ tRe
tRe
tRe
bWf
bVa
ihL
kXG
sqx
owj
@@ -98024,7 +98032,7 @@ xUL
xUL
dKF
ijZ
ijZ
lwl
bnU
oJa
cNE
@@ -0,0 +1,37 @@
/mob/living/simple_animal/opossum
name = "opossum"
desc = "It's an opossum, a small scavenging marsupial."
icon_state = "possum"
icon_living = "possum"
icon_dead = "possum_dead"
speak = list("Hiss!","HISS!","Hissss?")
speak_emote = list("hisses")
emote_hear = list("hisses.")
emote_see = list("runs in a circle.", "shakes.")
speak_chance = 1
turns_per_move = 3
blood_volume = 250
see_in_dark = 5
maxHealth = 15
health = 15
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 1)
response_help_continuous = "pets"
response_help_simple = "pet"
response_disarm_continuous = "gently pushes aside"
response_disarm_simple = "gently push aside"
response_harm_continuous = "stamps on"
response_harm_simple = "stamp"
density = FALSE
ventcrawler = VENTCRAWLER_ALWAYS
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC|MOB_BEAST
gold_core_spawnable = FRIENDLY_SPAWN
/mob/living/simple_animal/opossum/poppy
name = "Poppy the Safety Possum"
desc = "Safety first!"
icon_state = "poppypossum"
icon_living = "poppypossum"
icon_dead = "poppypossum_dead"
butcher_results = list(/obj/item/clothing/head/hardhat = 1)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 275 KiB

After

Width:  |  Height:  |  Size: 283 KiB

+1
View File
@@ -2622,6 +2622,7 @@
#include "code\modules\mob\living\simple_animal\friendly\penguin.dm"
#include "code\modules\mob\living\simple_animal\friendly\pet.dm"
#include "code\modules\mob\living\simple_animal\friendly\plushie.dm"
#include "code\modules\mob\living\simple_animal\friendly\possum.dm"
#include "code\modules\mob\living\simple_animal\friendly\sloth.dm"
#include "code\modules\mob\living\simple_animal\friendly\snake.dm"
#include "code\modules\mob\living\simple_animal\friendly\drone\_drone.dm"