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

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-09-24 10:13:01 -04:00
parent ae8d35f963 5fdb6d3618
commit b308ee9d78
313 changed files with 6548 additions and 4624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/bitrunning/objects/gimmick_disks/sports_disk.dm
+1 -1
View File
@@ -94,6 +94,6 @@
/obj/item/modular_computer/laptop/gamer/install_default_programs()
// Only install starting programs, we don't want the software downloading program from default programs
for(var/programs as anything in starting_programs)
for(var/programs in starting_programs)
var/datum/computer_file/program/program_type = new programs
store_file(program_type)
code/modules/bitrunning/outfits.dm
+1 -1
View File
@@ -43,7 +43,7 @@
/// Corresponding ammo
var/list/corresponding_ammo = list(
/obj/item/ammo_box/magazine/m9mm,
/obj/item/ammo_box/strilka310,
/obj/item/ammo_box/speedloader/strilka310,
/obj/item/ammo_box/magazine/uzim9mm,
/obj/item/ammo_box/magazine/m50,
/obj/item/food/pizzaslice/dank, // more silly, less destructive