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

Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit

Browse Source
This commit is contained in:
Waterpig
2024-09-08 00:59:39 +02:00
parent 410024afef 4b4ae0958f
commit 4c4930c71d
1728 changed files with 273718 additions and 2237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/random/ai_module.dm
+3
View File
@@ -39,9 +39,12 @@
/obj/item/ai_module/supplied/quarantine,
/obj/item/ai_module/core/full/yesman,
/obj/item/ai_module/remove,
<<<<<<< HEAD
/obj/item/ai_module/core/full/dagothbot, // SKYRAT EDIT - EDITION
/obj/item/ai_module/core/full/texas, // SKYRAT EDIT - EDITION
/obj/item/ai_module/core/full/emperor, // SKYRAT EDIT - EDITION
=======
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
)
/obj/effect/spawner/random/aimodule/harmful
code/game/objects/effects/spawners/random/decoration.dm
+23
View File
@@ -114,6 +114,29 @@
/obj/item/flashlight/glowstick/pink,
)
<<<<<<< HEAD
=======
/obj/effect/spawner/random/decoration/glowstick/on
name = "random colored glowstick (on)"
icon_state = "glowstick"
loot = list(
/obj/item/flashlight/glowstick,
/obj/item/flashlight/glowstick/red,
/obj/item/flashlight/glowstick/blue,
/obj/item/flashlight/glowstick/cyan,
/obj/item/flashlight/glowstick/orange,
/obj/item/flashlight/glowstick/yellow,
/obj/item/flashlight/glowstick/pink,
)
/obj/effect/spawner/random/decoration/glowstick/on/make_item(spawn_loc, type_path_to_make)
. = ..()
var/obj/item/flashlight/glowstick = .
glowstick.set_light_on(TRUE)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
/obj/effect/spawner/random/decoration/paint
name = "paint spawner"
icon_state = "paint"
code/game/objects/effects/spawners/random/medical.dm
+4
View File
@@ -70,7 +70,11 @@
icon_state = "xeno_egg"
loot = list(
/obj/effect/decal/remains/xeno = 49,
<<<<<<< HEAD
/obj/item/clothing/mask/facehugger/toy = 1, // SKYRAT EDIT - They should be handled by dynamic - ORIGIGNAL: /obj/effect/spawner/xeno_egg_delivery = 1,
=======
/obj/effect/spawner/xeno_egg_delivery = 1,
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
)
/obj/effect/spawner/random/medical/surgery_tool
code/game/objects/effects/spawners/random/structure.dm
+4
View File
@@ -23,6 +23,10 @@
/obj/effect/spawner/random/trash/mess = 30,
/obj/item/kirbyplants/fern = 20,
/obj/structure/closet/crate/decorations = 15,
<<<<<<< HEAD
=======
/obj/effect/decal/remains/human/smokey/maintenance = 7,
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
/obj/structure/destructible/cult/pants_altar = 1,
)
code/game/objects/effects/spawners/random/trash.dm
+3
View File
@@ -89,7 +89,10 @@
/obj/item/trash/cnds = 1,
/obj/item/trash/syndi_cakes = 1,
/obj/item/trash/shrimp_chips = 1,
<<<<<<< HEAD
/obj/item/trash/waffles = 1,
=======
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
/obj/item/trash/tray = 1,
)