diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index cbda257f..0e01be99 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -19,12 +19,12 @@ var/atom/inertia_last_loc var/inertia_moving = 0 var/inertia_next_move = 0 - var/inertia_move_delay = 3 + var/inertia_move_delay = 7 var/pass_flags = 0 var/moving_diagonally = 0 //0: not doing a diagonal move. 1 and 2: doing the first/second step of the diagonal move var/list/client_mobs_in_contents // This contains all the client mobs within this container var/list/acted_explosions //for explosion dodging - glide_size = 7 + glide_size = 14 appearance_flags = TILE_BOUND|PIXEL_SCALE var/datum/forced_movement/force_moving = null //handled soley by forced_movement.dm var/floating = FALSE diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 4f9b1abd..ec31093e 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -702,7 +702,7 @@ clear_fullscreen("critvision") //Oxygen damage overlay - var/windedup = getOxyLoss() + getStaminaLoss() * 0.2 + stamdamageoverlaytemp + var/windedup = getOxyLoss() + getStaminaLoss() * 0.2 if(windedup) var/severity = 0 switch(windedup) diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 49e39f2f..f5b00200 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -61,6 +61,6 @@ var/next_hallucination = 0 var/cpr_time = 1 //CPR cooldown. var/damageoverlaytemp = 0 - var/stamdamageoverlaytemp = 0 + var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 3efcf5e5..cedad66d 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1783,7 +1783,6 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(CLONE) H.adjustCloneLoss(damage * hit_percent * H.physiology.clone_mod) if(STAMINA) - H.stamdamageoverlaytemp = 20 if(BP) if(damage > 0 ? BP.receive_damage(0, 0, damage * hit_percent * H.physiology.stamina_mod) : BP.heal_damage(0, 0, abs(damage * hit_percent * H.physiology.stamina_mod), only_robotic = FALSE, only_organic = FALSE)) H.update_stamina() diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 2ef5f2f7..7b8d8a99 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -4,9 +4,8 @@ if(notransform) return - if(damageoverlaytemp || stamdamageoverlaytemp) + if(damageoverlaytemp) damageoverlaytemp = 0 - stamdamageoverlaytemp = 0 update_damage_hud() if(!IsInStasis()) diff --git a/code/world.dm b/code/world.dm index 344ca9be..ab3b32b6 100644 --- a/code/world.dm +++ b/code/world.dm @@ -8,7 +8,7 @@ view = "15x15" hub = "Exadv1.spacestation13" name = "/tg/ Station 13" - fps = 20 + fps = 10 #ifdef FIND_REF_NO_CHECK_TICK loop_checks = FALSE #endif diff --git a/config/config.txt b/config/config.txt index a01f5424..5dda144c 100644 --- a/config/config.txt +++ b/config/config.txt @@ -291,10 +291,10 @@ TICK_LIMIT_MC_INIT 500 ##Defines the ticklag for the world. Ticklag is the amount of time between game ticks (aka byond ticks) (in 1/10ths of a second). ## This also controls the client network update rate, as well as the default client fps -TICKLAG 0.5 +#TICKLAG 0.5 ##Can also be set as per-second value, the following value is identical to the above. -#FPS 20 +FPS 10 ## Comment this out to disable automuting #AUTOMUTE_ON diff --git a/config/game_options.txt b/config/game_options.txt index 2e346ce0..7f373657 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -92,6 +92,7 @@ PROBABILITY SECRET_EXTENDED 0 PROBABILITY DEVIL 0 PROBABILITY DEVIL_AGENTS 0 PROBABILITY CLOWNOPS 0 +PROBABILITY WEREWOLF 1 ## You probably want to keep sandbox off by default for secret and random. PROBABILITY SANDBOX 0 @@ -114,6 +115,7 @@ CONTINUOUS CLOCKWORK_CULT CONTINUOUS CHANGELING CONTINUOUS WIZARD #CONTINUOUS MONKEY +#CONTINUOUS WEREWOLF ##Note: do not toggle continuous off for these modes, as they have no antagonists and would thus end immediately! @@ -136,6 +138,7 @@ MIDROUND_ANTAG CLOCKWORK_CULT MIDROUND_ANTAG CHANGELING MIDROUND_ANTAG WIZARD #MIDROUND_ANTAG MONKEY +#MIDROUND_ANTAG WEREWOLF ## Uncomment these for overrides of the minimum / maximum number of players in a round type. ## If you set any of these occasionally check to see if you still need them as the modes @@ -176,6 +179,9 @@ MIDROUND_ANTAG WIZARD #MIN_POP MONKEY 20 #MAX_POP MONKEY -1 +#MIN_POP WEREWOLF 20 +#MAX_POP WEREWOLF -1 + #MIN_POP METEOR 0 #MAX_POP METEOR -1 diff --git a/hyperstation/code/mobs/mimic.dm b/hyperstation/code/mobs/mimic.dm index 12a22b65..ec0ccf2e 100644 --- a/hyperstation/code/mobs/mimic.dm +++ b/hyperstation/code/mobs/mimic.dm @@ -1,6 +1,5 @@ /mob/living/simple_animal/hostile/mimic name = "Mimic" - desc = "A creature with the ability to take the form of other objects." icon = 'hyperstation/icons/mobs/mimic.dmi' icon_state = "mimic" icon_living = "mimic" @@ -10,54 +9,50 @@ turns_per_move = 5 maxHealth = 30 health = 30 - see_in_dark = 7 - response_help = "pokes" - response_disarm = "shoves" - response_harm = "hits" + see_in_dark = 3 butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/killertomato = 2) response_help = "prods" response_disarm = "pushes aside" response_harm = "smacks" melee_damage_lower = 8 melee_damage_upper = 12 - move_to_delay = 9 attacktext = "slams" attack_sound = 'sound/weapons/punch1.ogg' ventcrawler = VENTCRAWLER_ALWAYS - faction = list("mimic") - var/unstealth = FALSE + faction = list("plants") - atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) - minbodytemp = 150 - maxbodytemp = 500 - gold_core_spawnable = HOSTILE_SPAWN + var/unstealth = FALSE /mob/living/simple_animal/hostile/mimic/Initialize() // When initialized, make sure they take the form of something. unstealth = FALSE + Mimictransform() +/mob/living/simple_animal/hostile/mimic/proc/Mimictransform() + var/transformitem = rand(1,3) -/mob/living/simple_animal/hostile/mimic/proc/activate() - if(!unstealth) - visible_message("[src] starts to move!") - unstealth = TRUE + if (unstealth == FALSE) + switch(transformitem) + if(1) + //Glass + icon = 'icons/obj/drinks.dmi' + icon_state = "glass_empty" + aggro_vision_range = 0 + if(2) + //Glass + icon = 'icons/obj/drinks.dmi' + icon_state = "glass_empty" + aggro_vision_range = 0 -/mob/living/simple_animal/hostile/mimic/LoseTarget() - ..() - icon_state = initial(icon_state) //when lost target, return into stealth form. - unstealth = FALSE - -/mob/living/simple_animal/hostile/mimic/crate/ListTargets() - if(unstealth) - return ..() - return ..(1) - - //If stealthed, do not target - - -/mob/living/simple_animal/hostile/mimic/adjustHealth(amount, updating_health = TRUE, forced = FALSE) - activate() - //if taking damage, trigger. \ No newline at end of file + if(3) + //Glass + icon = 'icons/obj/drinks.dmi' + icon_state = "glass_empty" + aggro_vision_range = 0 + else + //back to normal + icon = 'hyperstation/icons/mobs/mimic.dmi' + icon_state = "mimic" \ No newline at end of file diff --git a/hyperstation/icons/mobs/mimic.dmi b/hyperstation/icons/mobs/mimic.dmi index e8a4df57..181b534f 100644 Binary files a/hyperstation/icons/mobs/mimic.dmi and b/hyperstation/icons/mobs/mimic.dmi differ diff --git a/icons/obj/lighting_overlay.dmi b/icons/obj/lighting_overlay.dmi index c8c0ffbf..1d98894d 100644 Binary files a/icons/obj/lighting_overlay.dmi and b/icons/obj/lighting_overlay.dmi differ diff --git a/icons/turf/walls/wall.dmi b/icons/turf/walls/wall.dmi index 6dfe1ecd..d4f44c1e 100644 Binary files a/icons/turf/walls/wall.dmi and b/icons/turf/walls/wall.dmi differ diff --git a/tgstation.dme b/tgstation.dme index edb473ea..a6331662 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2832,7 +2832,10 @@ #include "code\modules\VR\vr_sleeper.dm" #include "code\modules\zombie\items.dm" #include "code\modules\zombie\organs.dm" +#include "hyperstation\code\gamemode\werewolf\werewolf.dm" #include "hyperstation\code\mobs\mimic.dm" +#include "hyperstation\code\mobs\werewolf.dm" +#include "hyperstation\code\modules\antagonists\werewolf\werewolf.dm" #include "interface\interface.dm" #include "interface\menu.dm" #include "interface\stylesheet.dm"