Skip to content

Commit

Permalink
Add spacecat
Browse files Browse the repository at this point in the history
Fixes a revert in my last crate PR, spacecat added to asteroid
secret room (previously included a cat critter crate)
  • Loading branch information
neersighted committed Feb 10, 2016
1 parent a16f554 commit e4f3045
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 20 deletions.
2 changes: 1 addition & 1 deletion code/game/asteroid.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ var/global/max_secret_rooms = 6
if("organharvest")
walltypes = list(/turf/simulated/wall/r_wall=2,/turf/simulated/wall=2,/turf/simulated/mineral/random/high_chance=1)
floortypes = list(/turf/simulated/floor/plasteel,/turf/simulated/floor/engine)
treasureitems = list(/mob/living/simple_animal/bot/medbot/mysterious=1, /obj/item/weapon/circular_saw=1, /obj/structure/closet/crate/critter=2)
treasureitems = list(/mob/living/simple_animal/bot/medbot/mysterious=1, /obj/item/weapon/circular_saw=1, /obj/structure/closet/crate/critter=2, /mob/living/simple_animal/pet/cat/space=1)
fluffitems = list(/obj/effect/decal/cleanable/blood=5,/obj/item/organ/internal/appendix=2,/obj/structure/closet/crate/freezer=2,
/obj/structure/table/optable=1,/obj/item/weapon/scalpel=1,/obj/item/weapon/storage/firstaid/regular=3,
/obj/item/weapon/tank/internals/anesthetic=1, /obj/item/weapon/surgical_drapes=2, /obj/item/device/mass_spectrometer/adv=1,/obj/item/clothing/glasses/hud/health=1)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/crates_lockers/closets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
var/breakout_time = 2
var/lastbang
var/can_weld_shut = TRUE
var/horizontal = TRUE
var/horizontal = FALSE
var/allow_objects = FALSE
var/allow_dense = FALSE
var/max_mob_size = MOB_SIZE_HUMAN //Biggest mob_size accepted by the container
Expand Down
46 changes: 28 additions & 18 deletions code/modules/mob/living/simple_animal/friendly/cat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,27 @@
var/mob/living/simple_animal/mouse/movement_target
gold_core_spawnable = 2

/mob/living/simple_animal/pet/cat/space
name = "space cat"
desc = "It's a cat... in space!"
icon_state = "spacecat"
icon_living = "spacecat"
icon_dead = "spacecat_dead"
unsuitable_atmos_damage = 0
minbodytemp = TCMB
maxbodytemp = T0C + 40

/mob/living/simple_animal/pet/cat/kitten
name = "kitten"
desc = "D'aaawwww"
icon_state = "kitten"
icon_living = "kitten"
icon_dead = "kitten_dead"
gender = NEUTER
density = 0
pass_flags = PASSMOB
mob_size = MOB_SIZE_SMALL

//RUNTIME IS ALIVE! SQUEEEEEEEE~
/mob/living/simple_animal/pet/cat/Runtime
name = "Runtime"
Expand All @@ -40,6 +61,10 @@
gender = FEMALE
gold_core_spawnable = 0

/mob/living/simple_animal/pet/cat/Proc
name = "Proc"
gold_core_spawnable = 0

/mob/living/simple_animal/pet/cat/Life()
//MICE!
if((src.loc) && isturf(src.loc))
Expand Down Expand Up @@ -79,34 +104,19 @@
stop_automated_movement = 1
walk_to(src,movement_target,0,3)

/mob/living/simple_animal/pet/cat/Proc
name = "Proc"
gold_core_spawnable = 0

/mob/living/simple_animal/pet/cat/kitten
name = "kitten"
desc = "D'aaawwww"
icon_state = "kitten"
icon_living = "kitten"
icon_dead = "kitten_dead"
gender = NEUTER
density = 0
pass_flags = PASSMOB
mob_size = MOB_SIZE_SMALL

/mob/living/simple_animal/pet/cat/attack_hand(mob/living/carbon/human/M)
. = ..()
switch(M.a_intent)
if("help")
wuv(1,M)
wuv(1, M)
if("harm")
wuv(-1,M)
wuv(-1, M)

/mob/living/simple_animal/pet/cat/proc/wuv(change, mob/M)
if(change)
if(change > 0)
if(M && stat != DEAD)
flick_overlay(image('icons/mob/animal.dmi',src,"heart-ani2",MOB_LAYER+1), list(M.client), 20)
flick_overlay(image('icons/mob/animal.dmi', src, "heart-ani2", MOB_LAYER+1), list(M.client), 20)
emote("me", 1, "purrs!")
else
if(M && stat != DEAD)
Expand Down
Binary file modified icons/mob/pets.dmi
Binary file not shown.

0 comments on commit e4f3045

Please sign in to comment.