cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 12:47:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Howl'n

Browse Source
This commit is contained in:
Repede
2020-01-12 14:36:47 -05:00
committed by GitHub
parent 879ba15398 fd079561ad
commit e671d2d799
19 changed files with 770 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
+6
View File
@@ -154,3 +154,9 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have?
speak = list("Cherp.","Cherp?","Chirrup.","Cheep!")
emote_hear = list("cheeps")
emote_see = list("pecks at the ground","flaps its tiny wings")
/mob/living/simple_mob/animal/passive/chicken/clucky
name = "Commander Clucky"
real_name = "Commander Clucky"
desc = "It's Commander Clucky!"
code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm
+1 -1
View File
@@ -68,7 +68,7 @@
icon_living = "guard"
icon_dead = "guard_dead"
has_eye_glow = TRUE
minbodytemp = 175 //yw edit, Makes mobs survive cryogaia temps
faction = "awaymission" //yw edit, Makes away mobs be on the same fuckin' side.
maxHealth = 200
health = 200
code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm
+1 -1
View File
@@ -28,7 +28,7 @@
maxHealth = 25
health = 25
minbodytemp = 175 //yw edit, Makes mobs survive cryogaia temps
movement_cooldown = 0
melee_damage_lower = 2
code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm
+3 -1
View File
@@ -29,10 +29,12 @@
icon_rest = "firefly_dead"
icon = 'icons/mob/animal.dmi'
has_eye_glow = TRUE
heat_resist = -0.50
cold_resist = 0.75
maxHealth = 65
health = 65
minbodytemp = 175 //yw edit, Makes mobs survive cryogaia temps
pass_flags = PASSTABLE
var/energy = 100
code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm
+1 -1
View File
@@ -33,7 +33,7 @@
default_pixel_x = -16
pixel_x = -16
minbodytemp = 175 //yw edit, Makes mobs survive cryogaia temps
maxHealth = 200
health = 200
code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
+1 -1
View File
@@ -33,7 +33,7 @@
status_flags = CANPUSH
pass_flags = PASSTABLE
minbodytemp = 175 //yw edit, Makes mobs survive cryogaia temps
maxHealth = 100
health = 100
code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm
+1 -1
View File
@@ -29,7 +29,7 @@
health = 50
has_hands = TRUE
humanoid_hands = TRUE
minbodytemp = 175
pass_flags = PASSTABLE
universal_understand = 1
code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm
+4 -3
View File
@@ -30,9 +30,10 @@
maxHealth = 125
health = 125
minbodytemp = 175 //yw edit, Makes mobs survive cryogaia temps
movement_cooldown = 0.5 SECONDS
heat_resist = -0.50
cold_resist = 0.75
melee_damage_lower = 15
melee_damage_upper = 35
attack_armor_pen = 15
@@ -66,4 +67,4 @@
set desc = "Enrage and become vastly stronger for a period of time, however you will be weaker afterwards."
set category = "Abilities"
add_modifier(/datum/modifier/berserk, 30 SECONDS)
add_modifier(/datum/modifier/berserk, 30 SECONDS)
code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm
+3 -2
View File
@@ -42,9 +42,10 @@
"bio" = 0,
"rad" = 0
)
heat_resist = -0.50
cold_resist = 0.75
movement_cooldown = 5
minbodytemp = 175 //yw edit, Makes mobs survive cryogaia temps
melee_damage_lower = 6
melee_damage_upper = 14
base_attack_cooldown = 1 SECOND