cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 15:45:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds hiding and passtable to small simple_animals

Browse Source
This commit is contained in:
ZomgPonies
2013-12-18 00:00:25 -05:00
parent 61c150c5d5
commit 7e4da2e1ee
12 changed files with 41 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/borer.dm
+1 -13
View File
@@ -39,6 +39,7 @@
friendly = "prods"
wander = 0
pass_flags = PASSTABLE
can_hide = 1
var/chemicals = 10 // Chemicals used for reproduction and spitting neurotoxin.
var/mob/living/carbon/human/host // Human host for the brain worm.
@@ -356,19 +357,6 @@ mob/living/simple_animal/borer/proc/detatch()
src << "\blue You must be standing on or beside an air vent to enter it."
return
//copy paste from alien/larva, if that func is updated please update this one alsoghost
/mob/living/simple_animal/borer/verb/hide()
set name = "Hide"
set desc = "Allows to hide beneath tables or certain items. Toggled on or off."
set category = "Alien"
if (layer != TURF_LAYER+0.2)
layer = TURF_LAYER+0.2
src << text("\blue You are now hiding.")
else
layer = MOB_LAYER
src << text("\blue You have stopped hiding.")
//Procs for grabbing players.
mob/living/simple_animal/borer/proc/request_player()
for(var/mob/dead/observer/O in player_list)
code/modules/mob/living/simple_animal/friendly/crab.dm
+1
View File
@@ -19,6 +19,7 @@
friendly = "pinches"
var/obj/item/inventory_head
var/obj/item/inventory_mask
can_hide = 1
/mob/living/simple_animal/crab/Life()
..()
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+2
View File
@@ -168,6 +168,7 @@
var/amount_grown = 0
pass_flags = PASSTABLE | PASSGRILLE
small = 1
can_hide = 1
/mob/living/simple_animal/chick/New()
..()
@@ -210,6 +211,7 @@ var/global/chicken_count = 0
var/_color
pass_flags = PASSTABLE
small = 1
can_hide = 1
/mob/living/simple_animal/chicken/New()
..()
code/modules/mob/living/simple_animal/friendly/lizard.dm
+3 -1
View File
@@ -15,4 +15,6 @@
melee_damage_upper = 2
response_help = "pets"
response_disarm = "shoos"
response_harm = "stomps on"
response_harm = "stomps on"
pass_flags = PASSTABLE
can_hide = 1
code/modules/mob/living/simple_animal/friendly/mouse.dm
+1 -23
View File
@@ -27,6 +27,7 @@
minbodytemp = 223 //Below -50 Degrees Celcius
maxbodytemp = 323 //Above 50 Degrees Celcius
universal_speak = 0
can_hide = 1
/mob/living/simple_animal/mouse/Life()
..()
@@ -121,29 +122,6 @@
src << "\blue You must be standing on or beside an air vent to enter it."
return
//copy paste from alien/larva, if that func is updated please update this one alsoghost
/mob/living/simple_animal/mouse/verb/hide()
set name = "Hide"
set desc = "Allows to hide beneath tables or certain items. Toggled on or off."
set category = "Mouse"
if (layer != TURF_LAYER+0.2)
layer = TURF_LAYER+0.2
src << text("\blue You are now hiding.")
/*
for(var/mob/O in oviewers(src, null))
if ((O.client && !( O.blinded )))
O << text("<B>[] scurries to the ground!</B>", src)
*/
else
layer = MOB_LAYER
src << text("\blue You have stopped hiding.")
/*
for(var/mob/O in oviewers(src, null))
if ((O.client && !( O.blinded )))
O << text("[] slowly peaks up from the ground...", src)
*/
//make mice fit under tables etc? this was hacky, and not working
/*
/mob/living/simple_animal/mouse/Move(var/dir)
code/modules/mob/living/simple_animal/friendly/mushroom.dm
+3 -1
View File
@@ -13,4 +13,6 @@
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "whacks the"
harm_intent_damage = 5
harm_intent_damage = 5
pass_flags = PASSTABLE
can_hide = 1
code/modules/mob/living/simple_animal/friendly/slime.dm
+1
View File
@@ -13,6 +13,7 @@
response_harm = "stomps on"
emote_see = list("jiggles", "bounces in place")
var/colour = "grey"
pass_flags = PASSTABLE
/mob/living/simple_animal/slime/Bump(atom/movable/AM as mob|obj, yes)
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+1 -13
View File
@@ -40,6 +40,7 @@
//pass_flags = PASSTABLE //Maybe griefy?
small = 1
speak_emote = list("beeps","clicks","chirps")
can_hide = 1
/mob/living/simple_animal/spiderbot/attackby(var/obj/item/O as obj, var/mob/user as mob)
@@ -260,19 +261,6 @@
src << "\blue You must be standing on or beside an air vent to enter it."
return
//copy paste from alien/larva, if that func is updated please update this one alsoghost
/mob/living/simple_animal/spiderbot/verb/hide()
set name = "Hide"
set desc = "Allows to hide beneath tables or certain items. Toggled on or off."
set category = "Spiderbot"
if (layer != TURF_LAYER+0.2)
layer = TURF_LAYER+0.2
src << text("\blue You are now hiding.")
else
layer = MOB_LAYER
src << text("\blue You have stopped hiding.")
//Cannibalized from the parrot mob. ~Zuhayr
/mob/living/simple_animal/spiderbot/verb/drop_held_item()
code/modules/mob/living/simple_animal/friendly/tomato.dm
+3 -1
View File
@@ -12,4 +12,6 @@
response_help = "prods the"
response_disarm = "pushes aside the"
response_harm = "smacks the"
harm_intent_damage = 5
harm_intent_damage = 5
pass_flags = PASSTABLE
can_hide = 1
code/modules/mob/living/simple_animal/powers.dm
+20
View File
@@ -0,0 +1,20 @@
/mob/living/simple_animal/verb/hide()
set name = "Hide"
set desc = "Allows to hide beneath tables or certain items. Toggled on or off."
set category = "Animal"
if(stat != CONSCIOUS)
return
if (layer != TURF_LAYER+0.2)
layer = TURF_LAYER+0.2
src << text("\green You are now hiding.")
for(var/mob/O in oviewers(src, null))
if ((O.client && !( O.blinded )))
O << text("<B>[] scurries to the ground!</B>", src)
else
layer = MOB_LAYER
src << text("\green You have stopped hiding.")
for(var/mob/O in oviewers(src, null))
if ((O.client && !( O.blinded )))
O << text("[] slowly peaks up from the ground...", src)
code/modules/mob/living/simple_animal/simple_animal.dm
+4
View File
@@ -55,10 +55,14 @@
var/wall_smash = 0 //if they can smash walls
var/speed = 0 //LETS SEE IF I CAN SET SPEEDS FOR SIMPLE MOBS WITHOUT DESTROYING EVERYTHING. Higher speed is slower, negative speed is faster
var/can_hide = 0
/mob/living/simple_animal/New()
..()
verbs -= /mob/verb/observe
if(!can_hide)
verbs -= /mob/living/simple_animal/verb/hide
/mob/living/simple_animal/Login()
if(src && src.client)