Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increased damage #715

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/datums/gamemodes/_game_mode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ GLOBAL_VAR(common_report) //Contains common part of roundend report
///if fun tads are enabled by default
var/enable_fun_tads = FALSE

var/xeno_damage_taking_multiplier = 1
var/human_damage_taking_multiplier = 1
var/living_damage_taking_multiplier = 1


/datum/game_mode/New()
initialize_emergency_calls()
Expand Down
1 change: 1 addition & 0 deletions code/datums/gamemodes/distress.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
/datum/job/xenomorph/queen = 1,
/datum/job/survivor/rambo = 1,
)

var/siloless_hive_timer

/datum/game_mode/infestation/distress/post_setup()
Expand Down
8 changes: 8 additions & 0 deletions code/datums/gamemodes/x2damage.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/datum/game_mode/infestation/distress/x2damage
name = "Distress Signal (X2 damage)"
config_tag = "X2damage"
Comment on lines +2 to +3
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
name = "Distress Signal (X2 damage)"
config_tag = "X2damage"
name = "Distress Signal On Meth (X2 damage)"
config_tag = "Distress Signal On Meth (X2 damage)"

config_tag наверное стоит сделать таким же как и название, у того же дистресса сделано также
Также стоит изменить название файла.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

xenorespawn_time = 2 MINUTES

xeno_damage_taking_multiplier = 1.6
human_damage_taking_multiplier = 1.6
living_damage_taking_multiplier = 1.6
3 changes: 3 additions & 0 deletions code/modules/mob/living/carbon/human/human_damage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,9 @@ This function restores all limbs.
if(status_flags & (GODMODE))
return

if(SSticker.mode)
damage *= SSticker.mode.xeno_damage_taking_multiplier

last_damage_source = usr //where my cause_data??? no cause_data? https://media.discordapp.net/attachments/1059662710217908245/1128315728081211412/65939r.png?width=842&height=917

return species.apply_damage(damage, damagetype, def_zone, blocked, sharp, edge, updating_health, penetration, src)
Expand Down
4 changes: 4 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/damage_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@
return
if(damagetype != BRUTE && damagetype != BURN)
return

if(SSticker.mode)
damage *= SSticker.mode.xeno_damage_taking_multiplier

if(isnum(blocked))
damage -= clamp(damage * (blocked - penetration) * 0.01, 0, damage)
else
Expand Down
4 changes: 4 additions & 0 deletions code/modules/mob/living/damage_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
/mob/living/proc/apply_damage(damage = 0, damagetype = BRUTE, def_zone, blocked = 0, sharp = FALSE, edge = FALSE, updating_health = FALSE, penetration)
if(status_flags & (GODMODE))
return

if(SSticker.mode)
damage *= SSticker.mode.living_damage_taking_multiplier

if(isnum(blocked))
damage -= clamp(damage * (blocked - penetration) * 0.01, 0, damage)
else
Expand Down
4 changes: 4 additions & 0 deletions config/modes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ mode Extended
votable 0
endmode

mode X2damage
requiredplayers 30
endmode

mode Combat Patrol
requiredplayers 2
endmode
Expand Down
1 change: 1 addition & 0 deletions tgmc.dme
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,7 @@
#include "code\datums\gamemodes\objective.dm"
#include "code\datums\gamemodes\objective_items.dm"
#include "code\datums\gamemodes\points_defence.dm"
#include "code\datums\gamemodes\x2damage.dm"
#include "code\datums\greyscale\_greyscale_config.dm"
#include "code\datums\greyscale\greyscale_configs.dm"
#include "code\datums\greyscale\layer.dm"
Expand Down
Loading