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

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-25-02a

Browse Source
This commit is contained in:
Majkl-J
2025-02-20 00:00:19 -08:00
parent 719fa8a30e 5414cc325c
commit b6b8306fda
7388 changed files with 94693 additions and 418558 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/random/ai_module.dm
+1
View File
@@ -29,6 +29,7 @@
name = "neutral AI module spawner"
loot = list( // These shouldn't allow the AI to start butchering people without reason
/obj/item/ai_module/core/full/reporter,
/obj/item/ai_module/core/full/thinkermov,
/obj/item/ai_module/core/full/hulkamania,
/obj/item/ai_module/core/full/overlord,
/obj/item/ai_module/core/full/tyrant,
code/game/objects/effects/spawners/random/armory.dm
+18
View File
@@ -24,6 +24,24 @@
icon_state = "rubbershot"
loot = list(/obj/item/storage/box/rubbershot)
/obj/effect/spawner/random/armory/buckshot
name = "buckshot spawner"
icon_state = "buckshot"
loot = list(/obj/item/storage/box/lethalshot)
/obj/effect/spawner/random/armory/buckshot/sketchy
name = "sketchy buckshot spawner"
icon_state = "buckshot"
loot = list(
/obj/item/storage/box/lethalshot = 4,
/obj/item/storage/box/lethalshot/old = 2,
)
/obj/effect/spawner/random/armory/slug
name = "slug shell spawner"
icon_state = "buckshot"
loot = list(/obj/item/storage/box/slugs)
// Weapons
/obj/effect/spawner/random/armory/disablers
name = "disabler spawner"
code/game/objects/effects/spawners/random/contraband.dm
+2
View File
@@ -23,6 +23,7 @@
/obj/item/storage/box/donkpockets = 10,
/obj/effect/spawner/random/contraband/plus = 10,
/obj/item/reagent_containers/pill/maintenance = 5,
/obj/item/survivalcapsule/fishing = 5,
)
@@ -42,6 +43,7 @@
/obj/item/reagent_containers/cup/blastoff_ampoule = 5,
/obj/item/food/drug/moon_rock = 5,
/obj/item/grenade/empgrenade = 5,
/obj/item/survivalcapsule/fishing/hacked = 1,
/obj/effect/spawner/random/contraband/armory = 1,
)
code/game/objects/effects/spawners/random/medical.dm
+31 -31
View File
@@ -25,20 +25,20 @@
icon_state = "eyes"
spawn_loot_count = 3
loot = list(
/obj/item/organ/internal/heart/gland/egg = 7,
/obj/item/organ/internal/heart/gland/plasma = 7,
/obj/item/organ/internal/heart/gland/chem = 5,
/obj/item/organ/internal/heart/gland/mindshock = 5,
/obj/item/organ/internal/heart/gland/transform = 5,
/obj/item/organ/internal/heart/gland/spiderman = 5,
/obj/item/organ/internal/heart/gland/slime = 4,
/obj/item/organ/internal/heart/gland/trauma = 4,
/obj/item/organ/internal/heart/gland/electric = 3,
/obj/item/organ/internal/monster_core/regenerative_core = 2,
/obj/item/organ/internal/monster_core/rush_gland = 2,
/obj/item/organ/internal/monster_core/brimdust_sac = 2,
/obj/item/organ/internal/heart/gland/ventcrawling = 1,
/obj/item/organ/internal/body_egg/alien_embryo = 1,
/obj/item/organ/heart/gland/egg = 7,
/obj/item/organ/heart/gland/plasma = 7,
/obj/item/organ/heart/gland/chem = 5,
/obj/item/organ/heart/gland/mindshock = 5,
/obj/item/organ/heart/gland/transform = 5,
/obj/item/organ/heart/gland/spiderman = 5,
/obj/item/organ/heart/gland/slime = 4,
/obj/item/organ/heart/gland/trauma = 4,
/obj/item/organ/heart/gland/electric = 3,
/obj/item/organ/monster_core/regenerative_core = 2,
/obj/item/organ/monster_core/rush_gland = 2,
/obj/item/organ/monster_core/brimdust_sac = 2,
/obj/item/organ/heart/gland/ventcrawling = 1,
/obj/item/organ/body_egg/alien_embryo = 1,
)
/obj/effect/spawner/random/medical/memeorgans
@@ -46,23 +46,23 @@
icon_state = "eyes"
spawn_loot_count = 5
loot = list(
/obj/item/organ/internal/ears/penguin,
/obj/item/organ/internal/ears/cat,
/obj/item/organ/internal/eyes/moth,
/obj/item/organ/internal/eyes/snail,
/obj/item/organ/internal/tongue/bone,
/obj/item/organ/internal/tongue/fly,
/obj/item/organ/internal/tongue/snail,
/obj/item/organ/internal/tongue/lizard,
/obj/item/organ/internal/tongue/alien,
/obj/item/organ/internal/tongue/ethereal,
/obj/item/organ/internal/tongue/robot,
/obj/item/organ/internal/tongue/zombie,
/obj/item/organ/internal/appendix,
/obj/item/organ/internal/liver/fly,
/obj/item/organ/internal/lungs/plasmaman,
/obj/item/organ/external/tail/cat,
/obj/item/organ/external/tail/lizard,
/obj/item/organ/ears/penguin,
/obj/item/organ/ears/cat,
/obj/item/organ/eyes/moth,
/obj/item/organ/eyes/snail,
/obj/item/organ/tongue/bone,
/obj/item/organ/tongue/fly,
/obj/item/organ/tongue/snail,
/obj/item/organ/tongue/lizard,
/obj/item/organ/tongue/alien,
/obj/item/organ/tongue/ethereal,
/obj/item/organ/tongue/robot,
/obj/item/organ/tongue/zombie,
/obj/item/organ/appendix,
/obj/item/organ/liver/fly,
/obj/item/organ/lungs/plasmaman,
/obj/item/organ/tail/cat,
/obj/item/organ/tail/lizard,
)
/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner
code/game/objects/effects/spawners/random/structure.dm
+103 -8
View File
@@ -260,22 +260,117 @@
)
/obj/effect/spawner/random/structure/shipping_container
name = "shipping container spawner"
name = "random shipping container spawner"
icon = 'icons/obj/fluff/containers.dmi'
icon_state = "random_container"
loot = list(
/obj/structure/shipping_container = 3,
/obj/structure/shipping_container/amsco = 3,
/obj/structure/shipping_container/blue = 3,
/obj/structure/shipping_container/conarex = 3,
/obj/structure/shipping_container/deforest = 3,
/obj/structure/shipping_container/kahraman = 3,
/obj/structure/shipping_container/kahraman/alt = 3,
/obj/structure/shipping_container/defaced = 3,
/obj/structure/shipping_container/great_northern = 3,
/obj/structure/shipping_container/green = 3,
/obj/structure/shipping_container/kahraman = 2,
/obj/structure/shipping_container/kahraman/alt = 1,
/obj/structure/shipping_container/kosmologistika = 3,
/obj/structure/shipping_container/interdyne = 3,
/obj/structure/shipping_container/magenta = 3,
/obj/structure/shipping_container/nakamura = 3,
/obj/structure/shipping_container/nanotrasen = 3,
/obj/structure/shipping_container/nthi = 3,
/obj/structure/shipping_container/vitezstvi = 3,
/obj/structure/shipping_container/ntfid = 2,
/obj/structure/shipping_container/ntfid/defaced = 1,
/obj/structure/shipping_container/nthi = 1,
/obj/structure/shipping_container/nthi/minor = 1,
/obj/structure/shipping_container/nthi/precious = 1,
/obj/structure/shipping_container/orange = 3,
/obj/structure/shipping_container/purple = 3,
/obj/structure/shipping_container/red = 3,
/obj/structure/shipping_container/sunda = 3,
/obj/structure/shipping_container/vitezstvi = 2,
/obj/structure/shipping_container/vitezstvi/flags = 1,
/obj/structure/shipping_container/yellow = 3,
/obj/structure/shipping_container/biosustain = 3,
/obj/structure/shipping_container/cybersun = 2,
/obj/structure/shipping_container/donk_co = 2,
/obj/structure/shipping_container/gorlex = 1,
/obj/structure/shipping_container/cybersun/defaced = 1,
/obj/structure/shipping_container/donk_co = 3,
/obj/structure/shipping_container/exagon = 1,
/obj/structure/shipping_container/exagon/minor = 1,
/obj/structure/shipping_container/exagon/precious = 1,
/obj/structure/shipping_container/gorlex = 2,
/obj/structure/shipping_container/gorlex/red = 1,
/obj/structure/shipping_container/interdyne = 3,
/obj/structure/shipping_container/oms = 3,
/obj/structure/shipping_container/tiger_coop = 2,
/obj/structure/shipping_container/tiger_coop = 1,
)
/obj/effect/spawner/random/structure/shipping_container/blank
name = "random blank shipping container spawner"
loot = list(
/obj/structure/shipping_container = 3,
/obj/structure/shipping_container/blue = 3,
/obj/structure/shipping_container/green = 3,
/obj/structure/shipping_container/magenta = 3,
/obj/structure/shipping_container/orange = 3,
/obj/structure/shipping_container/purple = 3,
/obj/structure/shipping_container/red = 3,
/obj/structure/shipping_container/yellow = 3,
)
/obj/effect/spawner/random/structure/syndicate //syndicate containers only
name = "random syndicate shipping container spawner"
loot = list(
/obj/structure/shipping_container/biosustain = 3,
/obj/structure/shipping_container/cybersun = 2,
/obj/structure/shipping_container/cybersun/defaced = 1,
/obj/structure/shipping_container/donk_co = 3,
/obj/structure/shipping_container/exagon = 1,
/obj/structure/shipping_container/exagon/minor = 1,
/obj/structure/shipping_container/exagon/precious = 1,
/obj/structure/shipping_container/gorlex = 2,
/obj/structure/shipping_container/gorlex/red = 1,
/obj/structure/shipping_container/interdyne = 3,
/obj/structure/shipping_container/oms = 3,
/obj/structure/shipping_container/tiger_coop = 2,
/obj/structure/shipping_container/tiger_coop = 1,
)
/obj/effect/spawner/random/structure/shipping_container/station_appropriate //places extra emphasis on NT containers, excludes syndicate companies (except Donk. Co.) entirely
name = "station-appropriate shipping container spawner"
loot = list(
/obj/structure/shipping_container/nanotrasen = 5,
/obj/structure/shipping_container/nthi = 1,
/obj/structure/shipping_container/nthi/minor = 1,
/obj/structure/shipping_container/nthi/precious = 1,
/obj/structure/shipping_container/ntfid = 3,
/obj/structure/shipping_container/nakamura = 2,
/obj/structure/shipping_container/deforest = 2,
/obj/structure/shipping_container/kosmologistika = 2,
/obj/structure/shipping_container/donk_co = 2,
/obj/structure/shipping_container/amsco = 1,
/obj/structure/shipping_container/conarex = 1,
/obj/structure/shipping_container/kahraman = 1,
/obj/structure/shipping_container/kahraman/alt = 1,
/obj/structure/shipping_container/sunda = 1,
/obj/structure/shipping_container/vitezstvi = 1,
)
/obj/effect/spawner/random/structure/shipping_container/reefer //reefers only
name = "random reefer container spawner"
loot = list(
/obj/structure/shipping_container/reefer = 3,
/obj/structure/shipping_container/reefer/biosustain = 3,
/obj/structure/shipping_container/reefer/deforest = 3,
/obj/structure/shipping_container/reefer/interdyne = 3,
)
/obj/effect/spawner/random/structure/shipping_container/gas //gas cisterns only
name = "random gas cistern spawner"
loot = list(
/obj/structure/shipping_container/gas = 3,
/obj/structure/shipping_container/gas/apda = 3,
/obj/structure/shipping_container/gas/apda/hydrogen = 3,
/obj/structure/shipping_container/gas/exagon = 3,
/obj/structure/shipping_container/gas/nthi = 3,
)
code/game/objects/effects/spawners/random/techstorage.dm
+1 -1
View File
@@ -74,7 +74,7 @@
name = "engineering circuit board spawner"
loot = list(
/obj/item/circuitboard/computer/atmos_alert,
/obj/item/circuitboard/computer/stationalert,
/obj/item/circuitboard/computer/station_alert,
/obj/item/circuitboard/computer/powermonitor,
)
code/game/objects/effects/spawners/random/trash.dm
+6
View File
@@ -53,6 +53,12 @@
/obj/effect/spawner/random/entertainment/cigar = 1,
/obj/item/stack/ore/gold = 1,
)
/obj/effect/spawner/random/trash/deluxe_garbage/Initialize(mapload)
if(mapload)
var/turf/location = get_turf(loc)
if(location.initial_gas_mix != OPENTURF_DEFAULT_ATMOS && location.initial_gas_mix != OPENTURF_DIRTY_ATMOS)
loot -= /mob/living/basic/mouse
return ..()
/obj/effect/spawner/random/trash/cigbutt
name = "cigarette butt spawner"