A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.
Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it. This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files. In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.
The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
Fixes mistake involving belts.
Fixes mistake involving bags allowing w_class 5 items, which was from the manual merge.
Polaris tweaks
Makes inflatables w_class 3.
Spacesuits and RIGs are now w_class 5.
Both sniper weapons are now w_class 5.
Makes more inventories able to use the volume based system.
Cleans up the cig part of the port a bit.
Security and medical belts could contain now no longer existing objects. These types have been removed.
Conflicts:
code/game/objects/items/weapons/storage/belt.dm
code/game/objects/structures/inflatable.dm
code/modules/clothing/under/ties.dm
Removed defines/obj/toy.dm and moved the defines down to objects/items/toys.dm
Moved a big chunk of defines out of defines/obj/weapon.dm and into their respective .dm files.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5441 316c924e-a436-60f5-8080-3fe189b3f50e
-Fixed turrets shooting over mobs, when they're lying down.
-Monkey boxes will now contain 5 monkeys.
-Decreased the amount of EMP grenades to the initial 5.
-Added several more symptoms.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4993 316c924e-a436-60f5-8080-3fe189b3f50e
All /world/ stuff that I've found is now in code/world.dm instead of being scattered throughout the code in 6-7 files.
*****IMPORTANT*****
This means that hub.dm is now part of world.dm. Server hosts using the hub will likely have to redo the hub/password variables!
Again, that stuff is now located in code/world.dm
*******************
The tester list has been removed as it is not in use.
/code/defines
- Moved atom.dm code into /code/game/atom.dm and atom_movable.dm
- Moved hub.dm code into /code/world.dm
- Moved the /defines/tanning into objects/item/sheets/leather.dm
- Moved /defines/area/ into game/area/
- Moved turf.dm code into the code/game/turfs folder and divided it up into meaningful places
A lot of the files in /code/game were placed in new areas since they really didn't have a reason to be there.
- algorithm.dm:
- - The world stuff is in world.dm.
- - countJob() and AutoUpdateTK() were removed entirely (unused).
- - AutoUpdateAI() is now in /mob/living/silicon/ai.dm
- atom_procs.dm was split into atom.dm and atom_movable.dm
- cellautomata.dm
- - World stuff was moved into world.dm
- - Atom stuff was moved into atom.dm and atom_movable.dm
- - Atom verbs were moved into code/game/verbs/atom_verbs.dm
- chemistry.dm
- - Beaker box code was moved into storage/misc.dm
- - The trash can and 'alechemy' paper were removed. (unused)
- Landmarks.dm was moved into /objects/effects/landmarks.dm
- prisonshuttle.dm, specops_shuttle.dm, syndicate_shuttle.dm and syndicate_specops_shuttle.dm have been moved into game/machinery/computer/
- status.dm and topic.dm code were moved into world.dm
- step_triggers.dm are now in objects/effects/step_triggers.dm
- throwing.dm was split into appropriate files (carbon mob code, atom_movable.dm, ect)
- vote.dm is now in code/datums
/code/game/asteroid was split up.
- turf.dm was moved into game/turfs/simulated/asteroid.dm
- artifacts were split up
- - Wish granter is now in game/machinery
- - The stealth box is gone (unused)
- - The list of 'space suprises' was moved into astroid.dm
- asteroid.dm, being the only file left, was moved into /code/game
and finally...
modules/mob/organs files are now in code/datums/organs
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4659 316c924e-a436-60f5-8080-3fe189b3f50e
- The folders themselves are now finished
- Next I'll go through each file and organize them
- Lastly I'll start pulling the object definitions out of /code/defines/ and put them into their respective files.
**Note to committers**
Make sure the .dme file updates when you update to this revision. If necessary delete the .dme and svn-update.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4546 316c924e-a436-60f5-8080-3fe189b3f50e
