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

Jump to bottom

Adds a new Boiler Strain: Sizzler #16843

Open

blackdav123 wants to merge 8 commits into tgstation:master from blackdav123:boiler-strain

+339 −0

Contributor

blackdav123 commented Dec 24, 2024 •

edited

Loading

About The Pull Request

Adds a new boiler strain: Sizzler

Trading long range suppression for mid range disruption, the Sizzler is meant to divide and isolate marines to help its team get better fights.

Same stats as regular boiler, you will still need to be supported by your team.

Changes since first testmerge:

Spit speed is now 0.5, same as spitter.

Abilities

Airburst Spit:
- 15 damage
- 70 plasma
- splits into three 10 damage projectiles that pass through enemies and leave a transparent acid cloud.
Smokescreen Spit:
- 35 damage
- 700 plasma
- 2 stagger
- 3 slowdown
- splits into five 0 damage projectiles that leave a wall of smoke behind the target.
- locks the sizzler out of spitting for 18 seconds
Steam Rush:
- 100 plasma
- 25 second cooldown
- gives a buff for 1.5 seconds that increases speed by -1 and makes slashes deal 10 extra burn damage and reset the timer.
Acid Spray:
- Same as boiler
Primordial: High Pressure Spit
- 50 damage
- 150 plasma
- 25 second cooldown
- fires a single shot that knocks back that stuns, staggers, slows, and knocks back the target 7 tiles
- applies 10 seconds of shatter to the target

Videos

Airburst-spit.mp4

steam-rush.mp4

steam-rush-long.mp4

Smokescreen-spit.mp4

primo-spit.mp4

primo-combo.mp4

To do

Add a primo
Balance it

Why It's Good For The Game

Variety, xeno content, and gives xenos a t3 that is better at dividing a marine ball.

Changelog

🆑
add: Added Sizzler boiler strain
/:cl:


          sizzler

5b1850b

tgstation-server added Sprites Feature labels


          init-fix

a2c7b14

despong commented Dec 24, 2024

cqc boiler is real

Contributor

Clay500z commented Dec 24, 2024

Sprite looks terrible but you're cooking

tttruancy commented Dec 24, 2024 •

edited

Loading

Seems fun I like it, maybe lower the airburst spit projectile speed to make it look a little less crazy

Contributor

Aporhtonoma commented Dec 24, 2024

THE UGL BOILER IS REAL MERGE PLEASE

iforgotmeword commented Dec 24, 2024

is there a way to swap spit types? or are you stuck with acid?

(awful primo idea: root wind-up but makes Airburst Spit rapid fire)

Runian reviewed

View reviewed changes

code/modules/projectiles/ammo_types/xenos/spits_xenoammo.dm Outdated

    
              	added_spit_delay = 14 SECONDS

              	spit_cost = 500

              	damage = 35

              	stagger_stacks = 2

Contributor

Runian Dec 24, 2024 •

edited

Loading

shouldnt stagger_stacks be in seconds? /datum/ammo/xeno/toxin has it in seconds

Contributor Author

blackdav123 Dec 25, 2024

good catch!

Contributor

Technical-l commented Dec 25, 2024

Sprite looks terrible but you're cooking

the boiler


          primo

4016a03

TiviPlus requested changes

View reviewed changes

Member

TiviPlus left a comment

Looks ok from a gander @Kuro020 review walance

code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm Outdated

    
              	add_cooldown()

              /datum/action/ability/activable/xeno/high_pressure_spit/on_cooldown_finish() //Give high pressure spit a proper cooldown notification

              	to_chat(owner, span_xenodanger("Our steam is welling up; we can use high pressure spit again."))

Member

TiviPlus Dec 26, 2024

use balloon alert pls

code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm Outdated

    
              	succeed_activate()

              	add_cooldown()

              /datum/action/ability/activable/xeno/high_pressure_spit/on_cooldown_finish() //Give high pressure spit a proper cooldown notification

Member

TiviPlus Dec 26, 2024

Suggested change

      
            /datum/action/ability/activable/xeno/high_pressure_spit/on_cooldown_finish() //Give high pressure spit a proper cooldown notification
          
            /datum/action/ability/activable/xeno/high_pressure_spit/on_cooldown_finish()

comment is pointless

code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm Outdated

    
              	var/datum/ammo/xeno/acid/heavy/high_pressure_spit/high_pressure_spit = GLOB.ammo_list[/datum/ammo/xeno/acid/heavy/high_pressure_spit]

              	var/obj/projectile/newspit = new /obj/projectile(get_turf(X))

Member

TiviPlus Dec 26, 2024

Suggested change

      
            	var/obj/projectile/newspit = new /obj/projectile(get_turf(X))
          
            	var/obj/projectile/newspit = new(get_turf(X))

code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm Outdated

Comment on lines 508 to 509

    
              	//Shoot at the thing

              	playsound(X.loc, 'sound/voice/alien/hiss2.ogg', 50, 1)

Member

TiviPlus Dec 26, 2024

Suggested change

      
            	//Shoot at the thing
          
            	playsound(X.loc, 'sound/voice/alien/hiss2.ogg', 50, 1)
          
            	playsound(X.loc, 'sound/voice/alien/hiss2.ogg', 50, 1)

code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm Outdated

Comment on lines 457 to 459

    
              	X.remove_movespeed_modifier(MOVESPEED_ID_BOILER_SIZZLER_STEAM_RUSH) //Reset speed

              	X.playsound_local(X, 'sound/voice/alien/hiss2.ogg', 50) //Audio cue

Member

TiviPlus Dec 26, 2024

Suggested change

      
            	X.remove_movespeed_modifier(MOVESPEED_ID_BOILER_SIZZLER_STEAM_RUSH) //Reset speed
          
            	X.playsound_local(X, 'sound/voice/alien/hiss2.ogg', 50) //Audio cue
          
            	X.remove_movespeed_modifier(MOVESPEED_ID_BOILER_SIZZLER_STEAM_RUSH) 
          
            	X.playsound_local(X, 'sound/voice/alien/hiss2.ogg', 50)

code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm Outdated

Comment on lines 466 to 467

    
              	to_chat(owner, span_xenodanger("Our blood is boiling once more; we can use steam rush again."))

              	owner.playsound_local(owner, 'sound/effects/alien/new_larva.ogg', 25, 0, 1)

Member

TiviPlus Dec 26, 2024

ballon alert pls

code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm Outdated

Comment on lines 447 to 448

    
              	if(steam_rush_ability.steam_rush_duration) //Check if steam rush is active

              		deltimer(steam_rush_ability.steam_rush_duration) //Reset timers

Member

TiviPlus Dec 26, 2024

Suggested change

      
            	if(steam_rush_ability.steam_rush_duration) //Check if steam rush is active
          
            		deltimer(steam_rush_ability.steam_rush_duration) //Reset timers
          
            	if(steam_rush_ability.steam_rush_duration)
          
            		deltimer(steam_rush_ability.steam_rush_duration)

code/modules/projectiles/ammo_types/xenos/spits_xenoammo.dm Outdated

Comment on lines 318 to 319

    
              	///How many

              	var/bonus_projectile_quantity = 3

Member

TiviPlus Dec 26, 2024

Coder was shot dead while writing documentation, this is so sad 💔

code/modules/projectiles/ammo_types/xenos/spits_xenoammo.dm Outdated

Comment on lines 386 to 387

    
              		target_carbon.adjust_stagger(stagger_stacks) //stagger briefly; useful for support

              		target_carbon.add_slowdown(slowdown_stacks) //slow em down

Member

TiviPlus Dec 26, 2024

Suggested change

      
            		target_carbon.adjust_stagger(stagger_stacks) //stagger briefly; useful for support
          
            		target_carbon.add_slowdown(slowdown_stacks) //slow em down
          
            		target_carbon.adjust_stagger(stagger_stacks)
          
            		target_carbon.add_slowdown(slowdown_stacks)

code/modules/projectiles/ammo_types/xenos/spits_xenoammo.dm Outdated

    
              	var/shatter_duration = 10 SECONDS

              /datum/ammo/xeno/acid/heavy/high_pressure_spit/on_hit_mob(mob/target_mob, obj/projectile/proj)

              	if(iscarbon(target_mob))

Member

TiviPlus Dec 26, 2024

early return here pls


          tivi-reviews

1c5d76e

blackdav123 requested a review from TiviPlus

December 27, 2024 00:40

Contributor

PibeCantina commented Dec 27, 2024

The rizzler

github-actions bot added the Merge Conflict label


          Merge remote-tracking branch 'upstream/master' into boiler-strain

edba861

tgstation-server removed the Merge Conflict label

blackdav123 added 2 commits

December 31, 2024 12:09


          oops

a1178bf


          primo-keybinding

ef9a7be

TiviPlus approved these changes

View reviewed changes

Kuro020 added the Test Merge Candidate label

Kuro020 approved these changes

View reviewed changes

comfyorange added a commit that referenced this pull request


          TGS Test Merge (#16843)

04b1bf5

comfyorange added a commit that referenced this pull request


          TGS Test Merge (#16843)

37626a6

comfyorange added a commit that referenced this pull request


          TGS Test Merge (#16843)

4f99e1d


          spit-speed

47d8562

tgstation-server removed the Test Merge Candidate label

Kuro020 added the Test Merge Candidate label

tgstation-server removed the Test Merge Candidate label

comfyorange added a commit that referenced this pull request


          TGS Test Merge (#16843)

36b783f

comfyorange added a commit that referenced this pull request


          TGS Test Merge (#16843)

despong commented Jan 2, 2025 •

edited

Loading

Changing from glob to spittle requires you to have enough plasma to fire again plasma (fucking annoying when i want to swap to spittle after using glob)
Steam glob timer doesn't carry over when you swap to spittle.
Wish the acid glob was like 1-2 tiles bigger? Weird to use when you spit diagonal and it leads pockets in your gas cloud
No balloon for spittle when you want to sprit and you're out of acid (i think)

Looking4bros commented Jan 2, 2025

The smokescreen spit is very nice in it's effect, striking broad instead of one big glob, as it in some instances will permitting the marine to take a few steps towards the xenos, instead of being required to pull out entirely. I find it a very neat ability.

comfyorange added a commit that referenced this pull request


          TGS Test Merge (#16843)

64807c3

Cpol-CzHa mentioned this pull request

Offhand Fire Exploit #16864

Closed

comfyorange added a commit that referenced this pull request


          TGS Test Merge (#16843)

94f586b

comfyorange added a commit that referenced this pull request


          TGS Test Merge (#16843)

df35f5b

comfyorange added a commit that referenced this pull request


          TGS Test Merge (#16843)

38fa0c3

comfyorange added a commit that referenced this pull request


          TGS Test Merge (#16843)

fc85c79

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Feature Sprites