4 Commits

Author	SHA1	Message	Date
GinjaNinja32	c77605265c	code/game/objects, code/game/machinery merge fix	2015-06-02 20:18:45 +01:00
Amunak	4882074739	Code formatting, EOL at EOF fixes, refactoring	2014-12-18 03:11:49 +01:00
Cael_Aislinn	eacd84b212	Merge tgstation13 r4570 into bs12_with_tgport ... Conflicts: baystation12.dme code/defines/obj.dm code/defines/procs/helpers.dm code/defines/turf.dm code/game/gamemodes/changeling/modularchangling.dm code/game/gamemodes/cult/cult_structures.dm code/game/gamemodes/events.dm code/game/machinery/telecomms/machine_interactions.dm code/game/master_controller.dm code/game/objects/items/blueprints.dm code/game/objects/items/devices/uplinks.dm code/game/objects/items/item.dm code/game/objects/items/weapons/gift_wrappaper.dm code/game/objects/items/weapons/wires.dm code/game/objects/weapons.dm code/game/turfs/turf.dm code/modules/clothing/head/hardhat.dm code/modules/mining/mine_items.dm code/modules/mining/mine_turfs.dm code/modules/mob/living/silicon/robot/life.dm code/modules/mob/mob_defines.dm code/modules/mob/new_player/login.dm code/modules/paperwork/pen.dm code/modules/paperwork/stamps.dm code/unused/toilets.dm html/changelog.html icons/effects/alert.dmi Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>	2012-08-28 19:57:11 +10:00
johnsonmt88@gmail.com	2e7b008d27	File structure again. ... This cleans up all of the files in code/game/objects/items/weapons. Meaning that the re-organizing part of this endeavour is complete. All that is left is to start dragging down all of the object definitions from code/defines/ into their proper places. While I'm certain this is all good, I'll apologize now if files or paths end up broken. Again: Make sure your .dme is up to date! Delete it if necessary to SVN Upload it to the current revision. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4550 316c924e-a436-60f5-8080-3fe189b3f50e	2012-08-26 05:20:27 +00:00