Merge remote-tracking branch 'citadel/master' into mobility_flags

This commit is contained in:
kevinz000
2020-01-27 23:35:35 -07:00
323 changed files with 16725 additions and 11570 deletions
+1
View File
@@ -310,6 +310,7 @@
trap_damage = 0
item_flags = DROPDEL
flags_1 = NONE
breakouttime = 50
/obj/item/restraints/legcuffs/beartrap/energy/New()
..()