mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-07-12 16:53:35 +01:00
Major map change+misc changes
Moves holodeck next to AI core, expands botany and kitchen, adds fishfarm Adds photocopiers and pappershredders about. Fixes some bad cameras, adds detective pistol back in, Why wasn't it there prior? Adds ballestics back in.
This commit is contained in:
@@ -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!"
|
||||
@@ -29,6 +29,8 @@
|
||||
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
|
||||
|
||||
@@ -32,7 +32,8 @@
|
||||
health = 125
|
||||
|
||||
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)
|
||||
|
||||
@@ -42,7 +42,8 @@
|
||||
"bio" = 0,
|
||||
"rad" = 0
|
||||
)
|
||||
|
||||
heat_resist = -0.50
|
||||
cold_resist = 0.75
|
||||
movement_cooldown = 5
|
||||
|
||||
melee_damage_lower = 6
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
icon_state = "[initial(icon_state)]-e"
|
||||
|
||||
/obj/item/weapon/gun/projectile/colt/detective
|
||||
desc = "A Martian recreation of an old pistol. Uses .45 rounds."
|
||||
desc = "A Martian recreation of a Colt M1911. Uses .45 rounds."
|
||||
magazine_type = /obj/item/ammo_magazine/m45/rubber
|
||||
|
||||
/obj/item/weapon/gun/projectile/colt/detective/verb/rename_gun()
|
||||
|
||||
Reference in New Issue
Block a user