search

NTStation / NTstation13

NTstation13 - A version of Spacestation13, forked from /tg/station13.
36 stars 198 forks source link

Paths standardization #877

Closed ACCount12 closed 10 years ago

ACCount12 commented 10 years ago

Bots assemblies moved to /obj/item/weapon/assembly/bot. Removed some copypaste in bot code and bot assemblies code. Merged toolbox_tile and toolbox_tile_sensor into a single item, like medibots and secbots.

Glock parts and assembly moved to /obj/item/weapon/assembly/glock. Butterfly knife parts moved to /obj/item/weapon/assembly/butterfly.

/obj/item/effect/kinetic_blast moved to /obj/effect/kinetic_blast because there is no /obj/item/effect category and kinetic blast does not meant to work as item. /obj/item/weapon/toy/xmas_cracker moved to /obj/item/toy/xmas_cracker because there is no /obj/item/weapon/toy category and all other toys are in /obj/item/toy.

Updated map for new paths. Also fixed a bit of area on ai sat.

GunHog commented 10 years ago

That is an interesting change that I myself should have made while working on https://github.com/NTStation/NTstation13/pull/648. Please keep in mind that if my PR is merged before yours, you will need to resolve the resulting conflicts. Obviously the same goes for me if yours is added first. Just a heads-up.

ACCount12 commented 10 years ago

Too many conflicts for me. Maybe later.