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

Merge branch 'master' into upstream-feb12-2026

Browse Source
This commit is contained in:
gavla
2026-03-13 21:16:32 -05:00
committed by GitHub
parent 49fc674201 91330a0a9a
commit ee5dc50487
10 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/changelogs/bubber_archive/2026-03.yml
+10
View File
@@ -78,3 +78,13 @@
you.
- bugfix: Fixed the Privacy Policy window showing up after you've already accepted
it once, for real this time.
2026-03-12:
muchatras:
- balance: Tweak the PKA shotgun
2026-03-13:
Danielance, Robwo:
- rscadd: added bomber jacket teshari sprites (all variants)
SomeCabbage:
- bugfix: Icewalkers can now use custom characters again.
- bugfix: Certain real-world figures have once again been spotted in select bitrunning
domains.
modular_zubbers/code/game/objects/items/more_pkas.dm
+2 -1
View File
@@ -55,7 +55,8 @@
item_flags = NONE
obj_flags = UNIQUE_RENAME
weapon_weight = WEAPON_HEAVY
max_mod_capacity = 75
max_mod_capacity = 60
disabled_modkits = list(/obj/item/borg/upgrade/modkit/aoe) // Should cover all AOE variants
/obj/item/gun/energy/recharge/kinetic_accelerator/glock
name = "proto-kinetic pistol"
modular_zubbers/code/modules/bitrunning/spawners.dm
+2
View File
@@ -0,0 +1,2 @@
/obj/effect/mob_spawn/ghost_role/human/virtual_domain/syndie
allow_custom_character = GHOSTROLE_TAKE_PREFS_APPEARANCE
modular_zubbers/code/modules/bitrunning/virtual_domains/ancient_milsim/ghost_spawner.dm
+2
View File
@@ -0,0 +1,2 @@
/obj/effect/mob_spawn/ghost_role/human/ancient_milsim
allow_custom_character = GHOSTROLE_TAKE_PREFS_APPEARANCE
modular_zubbers/code/modules/bitrunning/virtual_domains/island_brawl.dm
+2
View File
@@ -0,0 +1,2 @@
/obj/effect/mob_spawn/ghost_role/human/virtual_domain/islander
allow_custom_character = GHOSTROLE_TAKE_PREFS_APPEARANCE
modular_zubbers/code/modules/clothing/suits/jacket.dm
+2
View File
@@ -849,6 +849,7 @@
desc = "one down, cmon now"
icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi'
worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi'
worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/jacket_teshari.dmi'
icon_state = "bomber"
@@ -866,6 +867,7 @@
icon_state = "bomberatmos"
icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi'
worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi'
worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/jacket_teshari.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
w_class = WEIGHT_CLASS_NORMAL
body_parts_covered = CHEST|ARMS
modular_zubbers/code/modules/power/powerator.dm
+1 -1
View File
@@ -109,7 +109,7 @@
/obj/machinery/powerator/examine(mob/user)
. = ..()
if(panel_open)
. += span_warning("The maintainence panel is currently open, preventing [src] from working!")
. += span_warning("The maintenance panel is currently open, preventing [src] from working!")
if(!anchored)
. += span_warning("The anchors are not bolted to the floor, preventing [src] from working!")
modular_zubbers/code/modules/primitive_catgirls/code/spawner.dm
+2
View File
@@ -0,0 +1,2 @@
/obj/effect/mob_spawn/ghost_role/human/primitive_catgirl
allow_custom_character = GHOSTROLE_TAKE_PREFS_APPEARANCE
modular_zubbers/icons/mob/clothing/suits/jacket_teshari.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

tgstation.dme
+4
View File
@@ -9329,6 +9329,9 @@
#include "modular_zubbers\code\modules\automapper\code\overrides\area_spawn_subsystem.dm"
#include "modular_zubbers\code\modules\beserk_ability_onstation\beserk.dm"
#include "modular_zubbers\code\modules\bitrunning\disks.dm"
#include "modular_zubbers\code\modules\bitrunning\spawners.dm"
#include "modular_zubbers\code\modules\bitrunning\virtual_domains\island_brawl.dm"
#include "modular_zubbers\code\modules\bitrunning\virtual_domains\ancient_milsim\ghost_spawner.dm"
#include "modular_zubbers\code\modules\bodyparts\code\moth_bodyparts.dm"
#include "modular_zubbers\code\modules\borer_hud\borer.dm"
#include "modular_zubbers\code\modules\bow_adjustments\arrow.dm"
@@ -9785,6 +9788,7 @@
#include "modular_zubbers\code\modules\power\singularity\emitter.dm"
#include "modular_zubbers\code\modules\power\supermatter\supermatter_delam.dm"
#include "modular_zubbers\code\modules\power\supermatter\supermatter_gas.dm"
#include "modular_zubbers\code\modules\primitive_catgirls\code\spawner.dm"
#include "modular_zubbers\code\modules\privacy_policy\privacy_policy.dm"
#include "modular_zubbers\code\modules\projectiles\beams.dm"
#include "modular_zubbers\code\modules\projectiles\ammunition\ballistic\pistol.dm"