cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-16 10:35:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-12

Browse Source
This commit is contained in:
Roxy
2025-11-12 16:42:38 -05:00
parent b4dbcc9db1 44b3075544
commit 71faa643bf
379 changed files with 37535 additions and 33147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mod/mod_theme.dm
+1
View File
@@ -128,6 +128,7 @@
part.set_armor(armor_type)
part.resistance_flags = resistance_flags
part.flags_1 |= atom_flags //flags like initialization or admin spawning are here, so we cant set, have to add
part.item_flags |= DO_NOT_WARDROBE
part.heat_protection = NONE
part.cold_protection = NONE
part.max_heat_protection_temperature = max_heat_protection_temperature
code/modules/mod/modules/modules_ninja.dm
+1 -1
View File
@@ -291,7 +291,7 @@
/obj/item/mod/module/emp_shield/pulse/on_use(mob/activator)
playsound(src, 'sound/effects/empulse.ogg', 60, TRUE)
empulse(src, heavy_range = 4, light_range = 6)
empulse(src, heavy_range = 4, light_range = 6, emp_source = src)
drain_power(use_energy_cost)
/// Ninja Status Readout - Like the normal status display (see the base type), but with a clock.