Skip to content

Commit

Permalink
Removes core-code changes
Browse files Browse the repository at this point in the history
  • Loading branch information
MrRomainzZ committed Oct 6, 2024
1 parent ca31c41 commit 9a26e6e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
5 changes: 1 addition & 4 deletions code/modules/projectiles/ammunition/_ammunition.dm
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,7 @@
for(var/obj/item/ammo_casing/bullet in loc)
if (box.stored_ammo.len >= box.max_ammo)
break
// [CELADON-EDIT] - CELADON_ITEMS - Shuffler Addition / mod_celadon\items\code\items.dm
// if (bullet.BB) //CELADON-EDIT - ORIGINAL
if (bullet.BB || box.shuffler)
// [/CELADON-EDIT]
if (bullet.BB)
if (box.give_round(bullet, 0))
boolets++
// [CELADON-ADD] - CELADON_BALANCE
Expand Down
4 changes: 0 additions & 4 deletions code/modules/projectiles/boxes_magazines/_box_magazine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@
///cost of the materials in the magazine/box itself
var/list/base_cost

// [CELADON-ADD] - Shuffler Addition - mod_celadon\items\code\items.dm
var/shuffler = FALSE
// [/CELADON-ADD]

/obj/item/ammo_box/Initialize()
. = ..()
if(!base_icon_state)
Expand Down

0 comments on commit 9a26e6e

Please sign in to comment.