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

[(99.5%) MODULAR] Marine ERT Rework: Pass The Ammunition (#14321)

Browse Source 
* marine modsuit code

* modsuit icons pt1

* marine icons pt2

* modified equipment

* modified gear

* stray space

* module updates

* moar icons!

* creatin' custom fire sounds!!

* m44a firing noise

* fixin' stuff

* m44a pulse rifle

* m44a variants

* fixin' shit

* more fixes

* one line fix

* woo more fixes

* final fixes(?)

* honestly quite incredible

* mag icon fixes

* m44a ammo belt

* marine survival box

* pulse rifles for everyone!

* more updates

* honestly quite incredible

* honestly quite incredible

* balancing

* underbarrel shotgun adjustments

* buckshot > slugs

* buckshot again

* god bless buckshot, yo

* crowbar dont fit

* ninety-nine > 99

* hammer time

* hammer time

* woot

* marine smartgun

* smartgunner modsuit

* blessing from god

* cleaning code

* icon fixes

* dme checks

* more icon fixes

* << massive idiot

* << lol

* goodbye old turret

* use more gun™️

* we did it boys, syndicate smartgun is no more

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* we did it boys, syndicate smartgun is more

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* we did it boys, attack_item is more

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* single letter subtype? cringe!

* see above

* YEP

* linter issue (ツ)

* stray s moment

* merge master of upstream

* fix the dme

* Revert "Fixing14321"

* //

* woo

* refactor these nuts

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* sniping’s a good job mate

* shieldin’

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* fuck (fuck)

* fuck

* UNGA

* req changes

Co-authored-by: John Doe <gamingskeleton3@gmail.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: nevimer <foxmail@protonmail.com>
This commit is contained in:
dawsonkeyes
2022-06-26 09:18:20 -07:00
committed by GitHub
co-authored by Zonespace John Doe nevimer
parent c27c24b01a
commit 889effe7ff
33 changed files with 475 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile.dm
+6 -1
View File
@@ -182,6 +182,11 @@
var/static/list/projectile_connections = list(
COMSIG_ATOM_ENTERED = .proc/on_entered,
)
//SKYRAT ADDITION START
/// If this should be able to hit the target even on direct firing when `ignored_factions` applies
var/ignore_direct_target = FALSE
//SKYRAT ADDITION END
/// If true directly targeted turfs can be hit
var/can_hit_turfs = FALSE
@@ -505,7 +510,7 @@
var/mob/M = firer
if((target == firer) || ((target == firer.loc) && ismecha(firer.loc)) || (target in firer.buckled_mobs) || (istype(M) && (M.buckled == target)))
return FALSE
if(ignored_factions?.len && ismob(target) && !direct_target)
if(ignored_factions?.len && ismob(target) && (!direct_target || ignore_direct_target)) //SKYRAT EDIT: ignore_direct_target
var/mob/target_mob = target
if(faction_check(target_mob.faction, ignored_factions))
return FALSE