mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Merge pull request #3231 from CHOMPStation2/upstream-merge-11831
[MIRROR] operation RAD APES
This commit is contained in:
@@ -85,6 +85,8 @@
|
||||
|
||||
|
||||
/obj/item/weapon/gun/magnetic/matfed/attackby(var/obj/item/thing, var/mob/user)
|
||||
. = ..()
|
||||
update_rating_mod()
|
||||
if(removable_components)
|
||||
if(thing.is_crowbar())
|
||||
if(!manipulator)
|
||||
@@ -112,7 +114,6 @@
|
||||
update_rating_mod()
|
||||
return
|
||||
|
||||
|
||||
if(is_type_in_list(thing, load_type))
|
||||
var/obj/item/stack/material/M = thing
|
||||
var/success = FALSE
|
||||
@@ -147,7 +148,6 @@
|
||||
playsound(src, 'sound/weapons/flipblade.ogg', 50, 1)
|
||||
update_icon()
|
||||
return
|
||||
. = ..()
|
||||
|
||||
#define GEN_STARTING -1
|
||||
#define GEN_OFF 0
|
||||
|
||||
Reference in New Issue
Block a user