cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-14 17:45:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into pupstream-2025-09-07

Browse Source 
# Conflicts:
#	README.md
#	code/__DEFINES/admin.dm
#	code/__DEFINES/melee.dm
#	code/_globalvars/traits/_traits.dm
#	code/controllers/subsystem/economy.dm
#	code/datums/components/crafting/crafting.dm
#	code/datums/elements/crusher_loot.dm
#	code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
#	code/modules/clothing/suits/_suits.dm
#	code/modules/escape_menu/leave_body.dm
#	code/modules/jobs/job_types/_job.dm
#	code/modules/mining/equipment/mineral_scanner.dm
#	code/modules/mob/living/living.dm
#	code/modules/plumbing/plumbers/pill_press.dm
#	tgui/packages/tgui/interfaces/Vending.tsx
This commit is contained in:
nevimer
2025-09-07 00:37:52 -04:00
parent f5bbea9cc9 f4360e2da5
commit b348b617a3
362 changed files with 82084 additions and 106117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/bitrunning/objects/gimmick_disks/dungeon_disk.dm
+4 -4
View File
@@ -109,15 +109,15 @@
granted_items = list(
/obj/item/clothing/under/color/black,
/obj/item/clothing/shoes/sneakers/black,
/obj/item/clothing/shoes/sneakers/black/rogue,
/obj/item/clothing/mask/facescarf/rogue,
/obj/item/clothing/glasses/eyepatch,
/obj/item/clothing/glasses/eyepatch/rogue,
/obj/item/bedsheet/black/rogue_cape,
/obj/item/storage/belt/fannypack/black/rogue,
/obj/item/knife/combat/survival,
)
/obj/item/clothing/shoes/sneakers/black
/obj/item/clothing/shoes/sneakers/black/rogue
name = "sneaker of SNEAKING"
/obj/item/clothing/mask/facescarf/rogue
@@ -125,7 +125,7 @@
icon_state = "/obj/item/clothing/mask/facescarf/rogue"
greyscale_colors = "#292929"
/obj/item/clothing/glasses/eyepatch
/obj/item/clothing/glasses/eyepatch/rogue
name = "eyepatch of SEALING"
/obj/item/bedsheet/black/rogue_cape