cib 422ec63bfc Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/human.dm

2012-11-13 19:01:03 +01:00

..

closets

Cleaned up walllocker code.

2012-10-31 02:00:39 +04:00

effects

Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it.

2012-11-11 14:33:33 -07:00

items

Merge branch 'master' of github.com:Baystation12/Baystation12

2012-11-13 19:01:03 +01:00

storage

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00

structures

Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it.

2012-11-11 14:33:33 -07:00

empulse.dm

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

explosion_recursive.dm

Removed a stupid dumb wrong bad define from explosion_recursive.dm. It was a typo define for rwalls, but the proper define was right below it.

2012-10-14 03:24:05 +00:00

explosion.dm

Runtime fix:

2012-09-06 01:55:03 +00:00

hud.dm

obj/hud is now datum/hud. There was no need for it to be an object.

2012-09-28 23:02:11 +00:00

items.dm

Added basic germ code.

2012-11-12 12:51:28 +01:00

objs.dm

people suffocating in lockers and bodybags maybe cool, but suffocating in healing sleeper or dna modifier - bad, let's revert that back?

2012-10-26 13:17:04 +04:00

structures.dm

More file structure stuff.

2012-08-26 01:20:02 +00:00

weapons.dm

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00