@@ -90,7 +90,6 @@ GLOBAL_LIST_INIT(battleroyale_armour, list(
9090 // weight of 0 - all round good things
9191 / obj / item/ shield/ riot = 0 ,
9292 / obj / item/ clothing/ suit/ armor/ elder_atmosian = 0 ,
93- / obj / item/ clothing/ head/ det_hat/ evil = 0 ,
9493 / obj / item/ clothing/ suit/ space/ hardsuit/ mining = 0 ,
9594 / obj / item/ clothing/ suit/ armor/ bulletproof = 0 ,
9695 / obj / item/ clothing/ head/ helmet/ space/ pirate = 0 ,
@@ -274,6 +273,7 @@ GLOBAL_LIST_INIT(battleroyale_weapon, list(
274273 / obj / item/ gun/ ballistic/ automatic/ ar = - 5 ,
275274 / obj / item/ gun/ ballistic/ automatic/ lwt650 = - 5 ,
276275 / obj / item/ gun/ ballistic/ automatic/ k41s = - 5 ,
276+ / obj / item/ clothing/ head/ det_hat/ evil = - 5 , // infinite ammo ranged weapon with high dps
277277
278278 / obj / item/ gun/ energy/ beam_rifle = - 6 ,
279279 / obj / item/ gun/ ballistic/ rifle/ sniper_rifle = - 6 ,
@@ -411,8 +411,7 @@ GLOBAL_LIST_INIT(battleroyale_utility, list(//bombs, explosives, anything that's
411411 / obj / item/ autosurgeon/ syndicate/ spinalspeed = - 6 , // No opportunity cost speed boost
412412
413413 / obj / item/ storage/ belt/ wands/ full = - 7 , // not quite spellbook, but some of these wands are FUCKED
414-
415- / obj / item/ spellbook = - 8 , // literally auto-win
414+ / obj / item/ spellbook = - 7 , // literally auto-win IF you have the time to use it (a lot of spells are robe locked too)
416415 ))
417416
418417/ obj / structure/ closet/ crate/ battleroyale
@@ -509,7 +508,7 @@ GLOBAL_LIST_INIT(battleroyale_utility, list(//bombs, explosives, anything that's
509508 to_chat (user,span_warning(" You already know [ user. mind. martial_art. name] !" ))
510509 return
511510
512- if (do_after(user, 6 SECONDS , user))
511+ if (do_after(user, 2 SECONDS , user))
513512 var /datum /martial_art/MA = new martial
514513 user. set_species(species)
515514 MA . teach(user)
0 commit comments