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

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-10-03 07:05:54 -04:00
parent d9c4fe21be 7ee1cd7c06
commit 5e629dff04
517 changed files with 24339 additions and 21253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/space_fauna/garden_gnome.dm
+1 -1
View File
@@ -104,7 +104,7 @@
var/datum/callback/retaliate_callback = CALLBACK(src, PROC_REF(ai_retaliate_behaviour))
chosen_hat_colour = pick_weight(gnome_hat_colours)
apply_colour()
AddElement(/datum/element/death_drops, string_list(list(/obj/effect/gibspawner/generic)))
AddElement(/datum/element/death_drops, /obj/effect/gibspawner/generic)
AddElement(/datum/element/footstep, FOOTSTEP_MOB_SHOE)
AddComponent(/datum/component/ai_retaliate_advanced, retaliate_callback)
AddComponent(/datum/component/swarming)
code/modules/mob/living/basic/space_fauna/ghost.dm
+1 -2
View File
@@ -46,8 +46,7 @@
/mob/living/basic/ghost/Initialize(mapload)
. = ..()
var/static/list/death_loot = list(/obj/item/ectoplasm)
AddElement(/datum/element/death_drops, death_loot)
AddElement(/datum/element/death_drops, /obj/item/ectoplasm)
AddElement(/datum/element/simple_flying)
AddElement(/datum/element/ai_retaliate)
code/modules/mob/living/basic/space_fauna/hivebot/_hivebot.dm
+1 -2
View File
@@ -41,8 +41,7 @@
/mob/living/basic/hivebot/Initialize(mapload)
. = ..()
var/static/list/death_loot = list(/obj/effect/decal/cleanable/blood/gibs/robot_debris)
AddElement(/datum/element/death_drops, death_loot)
AddElement(/datum/element/death_drops, /obj/effect/decal/cleanable/blood/gibs/robot_debris)
AddComponent(/datum/component/appearance_on_aggro, overlay_icon = icon, overlay_state = "[initial(icon_state)]_attack")
if(!ranged_attacker)
return
code/modules/mob/living/basic/space_fauna/lightgeist.dm
+1 -3
View File
@@ -48,13 +48,11 @@
/mob/living/basic/lightgeist/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
ADD_TRAIT(src, TRAIT_MEDICAL_HUD, INNATE_TRAIT)
remove_verb(src, /mob/living/verb/pulled)
remove_verb(src, /mob/verb/me_verb)
var/datum/atom_hud/medical_sensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
medical_sensor.show_to(src)
AddElement(/datum/element/simple_flying)
AddComponent(\
/datum/component/healing_touch,\
code/modules/mob/living/basic/space_fauna/meteor_heart/meteor_heart.dm
+1 -2
View File
@@ -36,8 +36,7 @@
/mob/living/basic/meteor_heart/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_IMMOBILIZED, INNATE_TRAIT)
var/static/list/death_loot = list(/obj/effect/temp_visual/meteor_heart_death)
AddElement(/datum/element/death_drops, death_loot)
AddElement(/datum/element/death_drops, /obj/effect/temp_visual/meteor_heart_death)
AddElement(/datum/element/relay_attackers)
var/static/list/innate_actions = list(
code/modules/mob/living/basic/space_fauna/netherworld/migo.dm
+1 -2
View File
@@ -101,5 +101,4 @@
/mob/living/basic/migo/hatsune/Initialize(mapload)
. = ..()
var/static/list/death_loot = list(/obj/item/instrument/piano_synth)
AddElement(/datum/element/death_drops, death_loot)
AddElement(/datum/element/death_drops, /obj/item/instrument/piano_synth)
code/modules/mob/living/basic/space_fauna/paper_wizard/paper_wizard.dm
+1 -4
View File
@@ -26,9 +26,6 @@
var/datum/action/cooldown/spell/conjure/wizard_summon_minions/summon
///spell to summon clones
var/datum/action/cooldown/spell/pointed/wizard_mimic/mimic
///the loot we will drop
var/static/list/dropped_loot = list(/obj/effect/temp_visual/paperwiz_dying)
/mob/living/basic/paper_wizard/Initialize(mapload)
. = ..()
@@ -46,7 +43,7 @@
grant_actions_by_list(innate_actions)
/mob/living/basic/paper_wizard/proc/grant_loot()
AddElement(/datum/element/death_drops, dropped_loot)
AddElement(/datum/element/death_drops, /obj/effect/temp_visual/paperwiz_dying)
/datum/ai_controller/basic_controller/paper_wizard
blackboard = list(
code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm
+1 -1
View File
@@ -216,7 +216,7 @@
* * atom/lean_target - the target we try to add the spit to
*/
/mob/living/basic/regal_rat/proc/poison_target(atom/target)
if(isnull(target.reagents) || !target.is_injectable(src, allowmobs = TRUE))
if(isnull(target.reagents) || !target.is_injectable(src, /*allowmobs = */TRUE))
return FALSE
visible_message(
code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm
+1 -4
View File
@@ -169,8 +169,6 @@
web_speed = 0.25
web_type = /datum/action/cooldown/mob_cooldown/lay_web/sealer
menu_description = "Avarage speed spider able to heal other spiders and itself together with a fast web laying capability, has low damage and health."
///The health HUD applied to the mob.
var/health_hud = DATA_HUD_MEDICAL_ADVANCED
///Used in the caves away mission.
/mob/living/basic/spider/giant/nurse/away_caves
@@ -179,8 +177,7 @@
/mob/living/basic/spider/giant/nurse/Initialize(mapload)
. = ..()
var/datum/atom_hud/datahud = GLOB.huds[health_hud]
datahud.show_to(src)
ADD_TRAIT(src, TRAIT_MEDICAL_HUD, INNATE_TRAIT)
AddComponent(/datum/component/healing_touch,\
heal_brute = 10,\
code/modules/mob/living/basic/space_fauna/spider/young_spider/young_spider_subtypes.dm
+1 -4
View File
@@ -92,13 +92,10 @@
speed = 0.7
web_speed = 0.5
web_type = /datum/action/cooldown/mob_cooldown/lay_web/sealer
///The health HUD applied to the mob.
var/health_hud = DATA_HUD_MEDICAL_ADVANCED
/mob/living/basic/spider/growing/young/nurse/Initialize(mapload)
. = ..()
var/datum/atom_hud/datahud = GLOB.huds[health_hud]
datahud.show_to(src)
ADD_TRAIT(src, TRAIT_MEDICAL_HUD, INNATE_TRAIT)
AddComponent(/datum/component/healing_touch,\
heal_brute = 15,\
code/modules/mob/living/basic/space_fauna/statue/statue.dm
+1 -2
View File
@@ -156,5 +156,4 @@
/mob/living/basic/statue/frosty/Initialize(mapload)
. = ..()
var/static/list/death_loot = list(/obj/item/dnainjector/geladikinesis)
AddElement(/datum/element/death_drops, death_loot)
AddElement(/datum/element/death_drops, /obj/item/dnainjector/geladikinesis)
code/modules/mob/living/basic/space_fauna/wumborian_fugu/wumborian_fugu.dm
+1 -2
View File
@@ -51,8 +51,7 @@
/mob/living/basic/wumborian_fugu/Initialize(mapload)
. = ..()
AddComponent(/datum/component/seethrough_mob)
var/static/list/death_loot = list(/obj/item/fugu_gland)
AddElement(/datum/element/death_drops, death_loot)
AddElement(/datum/element/death_drops, /obj/item/fugu_gland)
add_traits(list(TRAIT_LAVA_IMMUNE, TRAIT_ASHSTORM_IMMUNE), ROUNDSTART_TRAIT)
expand = new(src)
expand.Grant(src)