mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 08:08:49 +01:00
Merge git://github.com/tgstation/-tg-station into critter_crates
Conflicts: icons/obj/storage.dmi
This commit is contained in:
@@ -47,4 +47,5 @@
|
||||
new /obj/item/clothing/mask/gas(src)
|
||||
new /obj/item/clothing/suit/armor/reactive(src)
|
||||
new /obj/item/device/flash(src)
|
||||
new /obj/item/device/laser_pointer(src)
|
||||
return
|
||||
Reference in New Issue
Block a user