cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gets rid of ignored_factions (#94972)

Browse Source 
## About The Pull Request

Tin, this is redundant now that faction has been moved to the atom. Also
fixes a misc runtime that can occur if someone clicks an ashwalker egg
before team datums are created

## Why It's Good For The Game

Updates code

## Changelog

Not player-facing
This commit is contained in:
Bloop
2026-01-24 17:58:22 -05:00
committed by GitHub
parent 7f999279c5
commit 4a58cdcc44
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/pellet_cloud.dm
+4 -2
View File
@@ -112,7 +112,8 @@
var/original_speed = shell.loaded_projectile.speed
var/original_wounds_bonus = shell.loaded_projectile.wound_bonus
var/original_bare_wounds_bonus = shell.loaded_projectile.exposed_wound_bonus
var/original_ignored_faction = shell.loaded_projectile.ignored_factions
var/original_ignored_faction = shell.loaded_projectile.get_faction()
var/original_ignored_allies = shell.loaded_projectile.allies
for(var/i in 1 to num_pellets)
shell.ready_proj(target, user, SUPPRESSED_VERY, zone_override, fired_from)
@@ -129,7 +130,8 @@
shell.loaded_projectile.speed = original_speed
shell.loaded_projectile.wound_bonus = original_wounds_bonus
shell.loaded_projectile.exposed_wound_bonus = original_bare_wounds_bonus
shell.loaded_projectile.ignored_factions = original_ignored_faction
shell.loaded_projectile.set_faction(original_ignored_faction)
shell.loaded_projectile.set_allies(original_ignored_allies)
pellets += shell.loaded_projectile
var/turf/current_loc = get_turf(fired_from)
if (!istype(target_loc) || !istype(current_loc) || !(shell.loaded_projectile))