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

[MIRROR] Implements AddTraits and RemoveTraits procs for adding/removing multiple traits + swag unit test [MDB IGNORE] (#19959)

Browse Source 
* Implements AddTraits and RemoveTraits procs for adding/removing multiple traits + swag unit test

* MISSED MIRROR https://github.com/tgstation/tgstation/pull/71606

* Update modules_supply.dm

* Update tgstation.dme

---------

Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-03-27 03:26:52 +01:00
committed by GitHub
co-authored by san7890 Gandalf
parent 3b750f4ea7
commit 6e029611ac
95 changed files with 542 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/lavaland/mining.dm
+1 -2
View File
@@ -9,6 +9,5 @@
/mob/living/basic/mining/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_LAVA_IMMUNE, INNATE_TRAIT)
ADD_TRAIT(src, TRAIT_ASHSTORM_IMMUNE, INNATE_TRAIT)
add_traits(list(TRAIT_LAVA_IMMUNE, TRAIT_ASHSTORM_IMMUNE), INNATE_TRAIT)
AddElement(/datum/element/mob_killed_tally, "mobs_killed_mining")
code/modules/mob/living/basic/space_fauna/carp/carp.dm
+1 -3
View File
@@ -86,9 +86,7 @@
/mob/living/basic/carp/Initialize(mapload, mob/tamer)
. = ..()
apply_colour()
ADD_TRAIT(src, TRAIT_HEALS_FROM_CARP_RIFTS, INNATE_TRAIT)
ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
ADD_TRAIT(src, TRAIT_FREE_HYPERSPACE_MOVEMENT, INNATE_TRAIT)
add_traits(list(TRAIT_HEALS_FROM_CARP_RIFTS, TRAIT_SPACEWALK, TRAIT_FREE_HYPERSPACE_MOVEMENT), INNATE_TRAIT)
if (cell_line)
AddElement(/datum/element/swabable, cell_line, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
code/modules/mob/living/basic/space_fauna/garden_gnome.dm
+1 -2
View File
@@ -109,8 +109,7 @@
AddComponent(/datum/component/swarming)
AddComponent(/datum/component/ground_sinking, target_icon_state = icon_state, outline_colour = chosen_hat_colour, damage_res_sinked = resistance_when_sinked)
AddComponent(/datum/component/caltrop, min_damage = 5, max_damage = 10, paralyze_duration = 1 SECONDS, flags = CALTROP_BYPASS_SHOES)
ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
add_traits(list(TRAIT_SPACEWALK, TRAIT_VENTCRAWLER_ALWAYS), INNATE_TRAIT)
/mob/living/basic/garden_gnome/proc/apply_colour()
if(!greyscale_config)
code/modules/mob/living/basic/space_fauna/wumborian_fugu/wumborian_fugu.dm
+1 -2
View File
@@ -50,8 +50,7 @@
/mob/living/basic/wumborian_fugu/Initialize(mapload)
. = ..()
AddElement(/datum/element/death_drops, loot = list(/obj/item/fugu_gland))
ADD_TRAIT(src, TRAIT_LAVA_IMMUNE, ROUNDSTART_TRAIT)
ADD_TRAIT(src, TRAIT_ASHSTORM_IMMUNE, ROUNDSTART_TRAIT)
add_traits(list(TRAIT_LAVA_IMMUNE, TRAIT_ASHSTORM_IMMUNE), ROUNDSTART_TRAIT)
expand = new(src)
expand.Grant(src)
ai_controller.blackboard[BB_FUGU_INFLATE] = WEAKREF(expand)