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.

Sign up for GitHub

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

Light CN20 Adjustment, axes leftover FS issues #526

Merged
merged 2 commits into from
Oct 28, 2024
Merged

Light CN20 Adjustment, axes leftover FS issues #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a94c6e1
rebalances CN Mortar a bit, also removes old accidental dupe FS menu …
GriffinMan4455 Oct 27, 2024
ff316b3
Mild CN20 nerf, to make short maskless exposure survivable even if yo…
GriffinMan4455 Oct 27, 2024
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
11 changes: 6 additions & 5 deletions code/game/objects/effects/effect_system/smoke.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,24 +423,25 @@
xeno_creature.AddComponent(/datum/component/status_effect/interference, 10, 10)
xeno_creature.blinded = TRUE
else
creature.apply_damage(12, TOX)
creature.apply_damage(2, BRAIN)
lungs.take_damage(2)
creature.apply_damage(18, TOX)
creature.apply_damage(0.75, BRAIN)
creature.apply_damage(1, OXY)
lungs.take_damage(1)

creature.SetEarDeafness(max(creature.ear_deaf, floor(effect_amt*1.5))) //Paralysis of hearing system, aka deafness
if(!xeno_creature) //Eye exposure damage
to_chat(creature, SPAN_DANGER("Your eyes sting. You can't see!"))
creature.SetEyeBlind(floor(effect_amt/3))

eyes.take_damage(2)
eyes.take_damage(1)
if(human_creature && creature.coughedtime < world.time && !creature.stat) //Coughing/gasping
creature.coughedtime = world.time + 1.5 SECONDS
if(prob(50))
creature.emote("cough")
else
creature.emote("gasp")

var/stun_chance = 20
var/stun_chance = 10
if(xeno_affecting)
stun_chance = 35
if(prob(stun_chance))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/game_master/extra_buttons/fire_support_menu.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

//Various ordnance selections
#define ORDNANCE_OPTIONS list("Banshee Missile", "CN-20 Missile", "Harpoon Missile", "Keeper Missile", "Napalm Missile", "Thermobaric Missile", "Widowmaker Missile", "Laser", "Minirocket", "Incendiary Minirocket", "Sentry Drop", "GAU-21", "Heavy GAU-21", "High Explosive", "Incendiary", "Cluster", "High Explosive","Nerve Gas OB", "Incendiary", "Fragmentation", "Flare", "Nerve Gas Mortar")
#define MISSILE_ORDNANCE list("Banshee Missile", "CN-20 Missile", "Harpoon Missile", "Keeper Missile", "Napalm Missile", "Thermobaric Missile", "Widowmaker Missile")
#define MISSILE_ORDNANCE list("Banshee Missile", "Harpoon Missile", "Keeper Missile", "Napalm Missile", "Thermobaric Missile", "Widowmaker Missile")
#define ORBITAL_ORDNANCE list("High Explosive OB", "Incendiary OB", "Cluster OB")
#define MORTAR_ORDNANCE list("High Explosive Shell", "Incendiary Shell", "Fragmentation Shell", "Flare Shell")
#define CHEMICAL_ORDNANCE list("CN-20 Missile", "Nerve Gas OB", "Nerve Gas Shell")
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_marines/equipment/mortar/mortar_shells.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
icon_state = "mortar_ammo_inc"

/obj/item/mortar_shell/nerve/detonate(turf/T)
explosion(T, 0, 2, 4, 7, explosion_cause_data = cause_data)
cell_explosion(T, 65, 95, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, null)
spawn(5)
var/datum/effect_system/smoke_spread/cn20/cn20 = new()
cn20.set_up(5, 0, T, null)
Expand Down
Loading