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

Merge remote-tracking branch 'tgstation/master' into upstream-2025-11-29

Browse Source 
# Conflicts:
#	_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
#	_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm
#	_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
#	_maps/map_files/tramstation/tramstation.dmm
#	code/_onclick/hud/new_player.dm
#	code/datums/components/squashable.dm
#	code/datums/diseases/advance/symptoms/heal.dm
#	code/datums/diseases/chronic_illness.dm
#	code/datums/status_effects/buffs.dm
#	code/datums/status_effects/debuffs/drunk.dm
#	code/datums/status_effects/debuffs/stamcrit.dm
#	code/game/machinery/computer/crew.dm
#	code/game/objects/items/devices/scanners/health_analyzer.dm
#	code/game/objects/items/wall_mounted.dm
#	code/game/turfs/closed/indestructible.dm
#	code/modules/admin/view_variables/filterrific.dm
#	code/modules/antagonists/heretic/influences.dm
#	code/modules/cargo/orderconsole.dm
#	code/modules/client/preferences.dm
#	code/modules/events/space_vines/vine_mutations.dm
#	code/modules/mob/dead/new_player/new_player.dm
#	code/modules/mob/living/carbon/human/death.dm
#	code/modules/mob/living/carbon/human/species_types/jellypeople.dm
#	code/modules/mob/living/damage_procs.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob_spawn/ghost_roles/mining_roles.dm
#	code/modules/mob_spawn/mob_spawn.dm
#	code/modules/projectiles/ammunition/energy/laser.dm
#	code/modules/projectiles/guns/ballistic/launchers.dm
#	code/modules/projectiles/guns/energy/laser.dm
#	code/modules/reagents/chemistry/machinery/chem_dispenser.dm
#	code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
#	code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
#	code/modules/reagents/chemistry/reagents/medicine_reagents.dm
#	code/modules/surgery/healing.dm
#	code/modules/unit_tests/designs.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	tgui/packages/tgui/interfaces/ChemDispenser.tsx
This commit is contained in:
nevimer
2025-11-29 22:49:21 -05:00
parent 4519d710d3 2bf063c693
commit baf3837ae8
1185 changed files with 39068 additions and 32028 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/autodrobe.dm
+2 -2
View File
@@ -165,8 +165,8 @@ GLOBAL_LIST_INIT(autodrobe_entretainers_items, list(
))
GLOBAL_LIST_INIT(autodrobe_fancy_items, list(
/obj/item/clothing/under/rank/captain/suit = 1,
/obj/item/clothing/under/rank/captain/suit/skirt = 1,
/obj/item/clothing/under/costume/captain = 1,
/obj/item/clothing/under/costume/captain/skirt = 1,
/obj/item/clothing/under/costume/seifuku = 3,
/obj/item/clothing/under/costume/seifuku/red = 3,
/obj/item/clothing/under/costume/seifuku/teal = 3,
code/modules/vending/clothesmate.dm
+2 -2
View File
@@ -120,8 +120,8 @@
/obj/item/clothing/suit/costume/poncho = 3,
/obj/item/clothing/under/dress/skirt = 3,
/obj/item/clothing/under/suit/white/skirt = 3,
/obj/item/clothing/under/rank/captain/suit/skirt = 2,
/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2,
/obj/item/clothing/under/costume/captain/skirt = 2,
/obj/item/clothing/under/costume/head_of_personnel/skirt = 2,
/obj/item/clothing/under/rank/civilian/purple_bartender = 2,
/obj/item/clothing/suit/jacket/miljacket = 3,
/obj/item/clothing/suit/apron/overalls = 3,
code/modules/vending/custom.dm
+2 -4
View File
@@ -1,5 +1,5 @@
///This unique key decides how items are stacked on the UI. We separate them based on name,price & type
#define ITEM_HASH(item)("[item.name][item.custom_price][item.type]")
///This unique key decides how items are stacked on the UI. We separate them based on name, price & type
#define ITEM_HASH(item)(sanitize_css_class_name("[item.name][item.custom_price][item.type]"))
/obj/machinery/vending/custom
name = "Custom Vendor"
@@ -275,8 +275,6 @@
if(ITEM_HASH(product) == dispensed_item)
dispensed_item = product
break
if(QDELETED(dispensed_item))
return
var/obj/item/card/id/id_card = user.get_idcard(TRUE)
if(QDELETED(id_card))
code/modules/vending/wardrobes.dm
+5 -4
View File
@@ -330,10 +330,10 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
/obj/item/clothing/glasses/regular/jamjar = 1,
/obj/item/clothing/under/rank/civilian/curator = 1,
/obj/item/clothing/under/rank/civilian/curator/skirt = 1,
/obj/item/clothing/under/rank/captain/suit = 1,
/obj/item/clothing/under/rank/captain/suit/skirt = 1,
/obj/item/clothing/under/rank/civilian/head_of_personnel/suit = 1,
/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 1,
/obj/item/clothing/under/costume/captain = 1,
/obj/item/clothing/under/costume/captain/skirt = 1,
/obj/item/clothing/under/costume/head_of_personnel = 1,
/obj/item/clothing/under/costume/head_of_personnel/skirt = 1,
/obj/item/clothing/suit/toggle/lawyer/greyscale = 1,
/obj/item/storage/backpack/satchel/explorer = 1,
/obj/item/storage/backpack/messenger/explorer = 1,
@@ -425,6 +425,7 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
)
premium = list(
/obj/item/storage/box/dishdrive = 1,
/obj/item/construction/plumbing/service = 1,
)
refill_canister = /obj/item/vending_refill/wardrobe/bar_wardrobe
payment_department = ACCOUNT_MED