cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-11 08:06:33 +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/game/objects/effects/spawners/costume.dm
+2 -2
View File
@@ -30,7 +30,7 @@
/obj/effect/spawner/costume/madscientist
name = "mad scientist costume spawner"
items = list(
/obj/item/clothing/under/rank/captain/suit,
/obj/item/clothing/under/costume/captain,
/obj/item/clothing/head/flatcap,
/obj/item/clothing/suit/toggle/labcoat/mad,
)
@@ -38,7 +38,7 @@
/obj/effect/spawner/costume/elpresidente
name = "el presidente costume spawner"
items = list(
/obj/item/clothing/under/rank/captain/suit,
/obj/item/clothing/under/costume/captain,
/obj/item/clothing/head/flatcap,
/obj/item/cigarette/cigar/havana,
/obj/item/clothing/shoes/jackboots,
code/game/objects/effects/spawners/random/armory.dm
+27
View File
@@ -62,6 +62,33 @@
icon_state = "laser_gun"
loot = list(/obj/item/gun/energy/laser)
/obj/effect/spawner/random/armory/laser_pistol
name = "laser pistol spawner"
icon_state = "laser_gun"
spawn_loot_count = 6
loot = list(/obj/item/gun/energy/laser/pistol)
/obj/effect/spawner/random/armory/laser_carbine
name = "laser_carbine spawner"
icon_state = "laser_gun"
loot = list(/obj/item/gun/energy/laser/carbine)
/obj/effect/spawner/random/armory/assault_laser
name = "assault laser gun spawner"
icon_state = "laser_gun"
spawn_loot_count = 1
loot = list(/obj/item/gun/energy/laser/assault)
/obj/effect/spawner/random/armory/pick_laser_loadout
name = "laser gun type randomizer"
icon_state = "laser_gun"
spawn_loot_count = 1
loot = list(
/obj/effect/spawner/random/armory/laser_gun = 30,
/obj/effect/spawner/random/armory/laser_carbine = 30,
/obj/effect/spawner/random/armory/laser_pistol = 10,
)
/obj/effect/spawner/random/armory/e_gun
name = "energy gun spawner"
icon_state = "e_gun"