cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 23:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converts bees to basic mobs (#30662)

Browse Source 
* Converts bees to basic mobs

* Undefs

* Linters
This commit is contained in:
PollardTheDragon
2025-10-28 16:53:18 -04:00
committed by GitHub
parent 5159e73c0d
commit ae4489cb2f
22 changed files with 561 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/bee_briefcase.dm
+3 -2
View File
@@ -65,7 +65,8 @@
//Release up to 5 bees per use. Without using Lazarus Reagent, that means two uses. WITH Lazarus Reagent, you can get more if you don't release the last bee
for(var/bee = min(5, bees_left), bee > 0, bee--)
var/mob/living/simple_animal/hostile/poison/bees/syndi/B = new /mob/living/simple_animal/hostile/poison/bees/syndi(get_turf(user)) // RELEASE THE BEES!
B.master_and_friends = blood_list.Copy() //Doesn't automatically add the person who opens the case, so the bees will attack the user unless they gave their blood
var/mob/living/basic/bee/syndi/B = new /mob/living/basic/bee/syndi(get_turf(user)) // RELEASE THE BEES!
for(var/mob/living/fren in blood_list)
B.befriend(fren)
bees_released++
bees_left -= bees_released
code/game/objects/items/weapons/melee/melee_misc.dm
+2 -2
View File
@@ -50,11 +50,11 @@
/obj/item/melee/flyswatter/Initialize(mapload)
. = ..()
strong_against = typecacheof(list(
/mob/living/simple_animal/hostile/poison/bees/,
/mob/living/basic/bee/,
/mob/living/basic/butterfly,
/mob/living/basic/cockroach,
/obj/item/queen_bee))
strong_against -= /mob/living/simple_animal/hostile/poison/bees/syndi // Syndi-bees have special anti-flyswatter tech installed
strong_against -= /mob/living/basic/bee/syndi // Syndi-bees have special anti-flyswatter tech installed
/obj/item/melee/flyswatter/attack__legacy__attackchain(mob/living/M, mob/living/user, def_zone)
. = ..()