mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-18 03:26:31 +01:00
Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync
This commit is contained in:
@@ -0,0 +1,3 @@
|
||||
/obj/item/ammo_box/a357/@SUBTYPES : /obj/item/ammo_box/speedloader/c357/@SUBTYPES{@OLD}
|
||||
/obj/item/ammo_box/c38/@SUBTYPES : /obj/item/ammo_box/speedloader/c38/@SUBTYPES{@OLD}
|
||||
/obj/item/ammo_box/strilka310/@SUBTYPES : /obj/item/ammo_box/speedloader/strilka310/@SUBTYPES{@OLD}
|
||||
@@ -0,0 +1 @@
|
||||
/obj/structure/lattice/lava : /obj/structure/lattice/catwalk/lava
|
||||
@@ -0,0 +1,3 @@
|
||||
/obj/item/borg/sight/meson : @DELETE
|
||||
|
||||
/obj/item/borg/sight/thermal : @DELETE
|
||||
Reference in New Issue
Block a user