1355 Commits
Author SHA1 Message Date
Erthilo 086a8fef37 Anti-meta update. Renames and re-icons a bunch of syndicate items to reduce meta from names and examine messages. 2012-06-07 19:54:37 +01:00
ericgfwong@hotmail.com 189d326cc1 -Expanded maint around primary tool storage and added an external construction area near the detective's office
-Reduced EngiVend stock
-Updated Changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3754 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-06 23:49:01 +00:00
petethegoat@gmail.com 72c72c47d3 Sieve stuff, this is a stupidly big commit, I'm sorry, I really am.
Full details in this thread:
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8898
And a summary of the most important bits:
-Door animations no longer desync and do the open-close-open thing. That's been around so long most people don't even notice
-Welding tools no longer get their icons desynced
-Fixed unpowered mineral door runtimes
-Chemistry machines now require power to run
-Fixed the proc to apply radiation based on armor, which means that you can actually not die of radiation as quickly if you wear armor that protects against radiation
--By fixing this, it also fixed the singularity, so you might want to be careful next time you run by it naked
--Also means that radiation events take armor into account. How great
-Hopefully have a bugfix to prevent borgs from using lag to enter the game without an AI or laws, but I cannot test it myself other than that it didn't break anything
-Disposal sound can only play once every couple of ticks, so no more ear-rape by disposals!
-Lasertag guns can no longer be used to make lasergun turrets
-Cleaned up stray pixels on several doors and the lasertag guns

-Reworked how falsewalls work, now whenever you attack them with certain tools (drills, welders, etc...) it instantly turns them into a wall and pushes the attackby(), meaning you might not even notice that you just drilled down a falsewall, and at the very least they are much more fitting
-Omni-directional PA console! Never have to worry about rotating that fucking computer again, because now it does it itself!
-The Marisa robe that spawns in the theater no longer protects like armor
-Tweaked coefficient list for fake insulated gloves (misplaced punctuation messed up the list a tad)
-Moved falsewalls out of 'transfer_valve.dm' and into 'structures.dm'
-Tweaked smoothwalls so it only connects walls with like minerals (only seen effect is on the new walls)
--Also added appropriate signs to areas
-Reworked portable turrets to be a lot less laggy, now they determine the projectile type once, then save it so they don't have to go through else if chains every time they fire
-Added many sprites from WJohnston, but many are not fully implemented (Mostly floor ones)
-Added a vending machine for engineering, the Engivend. Apparently it was needed because of the lack of availability of the Autolathe or whatever.
-Added WJohnston's Dark Gygax sprites, then made a Death Squad Gygax out of them. A bit tougher than the standard Gygax, improved battery, and is pre-fit with gear, ideally for 'hit and run' tactics
-New Odysseus construction sprites, also removed the Odysseus Carapace in favor of plasteel like the Ripley, meaning they in terms of construction, a Ripley is equivalent to an Odysseus 
-Added an 'is_hot()' proc, when called it returns the temperature of the item in K, while taking into account things like whether or not the item is active or whatever
-Rewrote the Experimental Welding Tool, now instead of having a super-sized tank, it uses super-concentrated plasma that is turned into gas inside of it as its fuel source. Meaning, it will never have to be refilled, but it takes time for it to fill itself
-Added WJ's firelight sprites and code. Wanted to use them, but haven't had a chance to really implement them, but still, they're there

-Turrets made with lasertag guns now fire their respective team's bolt
-The turrets also automatically target anyone on the opposing team (But will continue to shoot at anyone, for shits n' giggles)
-Turrets get corresponding sprites based on team
-Shooting a turret with a different team's laser will disable it for 10 seconds
-You can also make ED-209's for your lasertag games/pissing off sec
-These are constructed just like a regular ED, but instead of a security vest and taser, it requires a lasertag vest and gun (same colors)
-When geared for lasertag, They will not arrest anyone nor melee them, only patrol (if set) and shoot
-They have their color schemes as well, and can be disabled just like turrets
-For both turrets and EDs, when geared for lasertag, they will not shoot anyone on the ground, this was due to very quickly learning how fucking OP that was for 1 turret to stunlock 3 people for eternity
-And when they are geared for lasertag, both the turrets and EDs have their access changed to maint, clown, and mime (This will not stop any of them from being shot, however)
-As a side note, you can also make lasertag stationary turrets for any map-related things

-Now walls are based on a plating system, meaning all walls have a girder with a mineral plating on top of it.
-As of right now, usable minerals are Silver, Gold, Diamond, Uranium, Plasma, and Sandstone (Lacking sprites for wood, *cough*)
-This also carries over to falsewalls, so you can make falsewalls out of any of those minerals
-Also, this carries over to powered doors, meaning you can construct useful doors out of minerals, so you could have actual diamond forts with doors requiring access to get in or whatever
-All of these are standardized, and for the most part work just like regular walls, meaning if you start slicing a wall, it will drop the mineral, or if you drill it, or whatever
-What was mentioned with the smoothwall tweak above, only walls of the same mineral will connect, so it all looks very nice
-Doors and walls made of uranium emit radiation when interacted with, with walls causing a 'ripple' effect, so the more walls nearby, the more radiation you get hit with
-Doors and walls made of plasma burn. It's a short, quick burn, but can easily be compounded in large structures
--As a note on plasma walls, I cannot get atmos and plasma walls to play nice (Since they are airless turfs), so I can't actually get them to ignite based on air temperature, but when they do ignite, they will auto-magically ignite nearby plasma walls, with a reduced temperature, meaning that if you want a massive chain reaction over a huge area, you better use something a bit hotter than a lighter
--Also, when plasma walls burn, they simply leave behind a girder, while doors leave assemblies
-Lastly, for nearly any kind of destructive action, Diamond walls are much more resilient, meaning they will take twice as long to be destroyed, and are immune to the effects of thermite
(Also, sprites for plasma walls and uranium walls are shite right now, waiting for replacements)
Update:
-Added cult walls as a 'mineral wall', meaning they will work on the same system and 'ReplaceWithMineralWall("cult")' will change any turf into a cult wall, hopefully for some cult-related activities soon

R&D stuff:
-Now instead of 1 sheet or ALL OF THE SHEETS, you enter a number as to how many sheets you want (it's sanitized to hell as well)
-Minerals no longer multiply when inside RnD machines. (Who fucked that one up? Goddamn)
-Mech fabricators are both deconstructable, and putting higher level parts actually improve it, each 'Tier' up is equivalent to +1 tech levels for that, so a High Powered Micro Laser would give the same bonus as +1 Material Research, a Pico Manipulator would give the same bonus as +2 Engineering, etc
-Complete with a shitty opened Mech Fab sprite!
-And not shitty overlays so autolathe's animate the material that is put in them, rather than give everything that's not glass the metal animation

LOL THE JOKES ON YOU I JUST COPY PASTED HIS TOPIC

added a few svn ignores, for thumbs.db and maps/backup

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3751 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-06 19:45:03 +00:00
petethegoat@gmail.com 717da7aafa Updated toilets. You can now crowbar open the cistern and hide stuff in there.
Recoded stunbatons, and put them into their own stunbaton.dm. They should function more or less the same, there's a few differences.
Recoded rechargers, they function exactly the same, but should be a bit more responsive now.

Fixed issue 475.

Filing cabinets, photocopiers, and hydroponics trays are now unwrenchable (the latter by request of Cheridan. It may need balancing, or more steps to unanchor.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3749 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-06 13:07:51 +00:00
Erthilo 32a1d304ad Fixes for invisible appendices, changelog, readded disposals wall catcher. 2012-06-04 16:28:08 +01:00
Erthilo 808f76eaf3 TG: * Added pickup verb to all items
* Added "Toggle Open" verb to all closets and crates
* Added "Toggle Lock" verb to all lockable closets

* Modified the cloning computer's UI slightly, makes more sense, added a little
delay when scanning to improve user feedback when trying to clone several
braindead bodies.
Revision: r3712
Author: 	 daniel.cf.hultgren
2012-06-03 18:41:51 +01:00
Erthilo 1efb32e76a TG: Added WJohnston's inhand sprites for tools:
http://nanotrasen.com/phpBB3/viewtopic.php?f=10&t=8266
Revision: r3709
Author: 	 ericgfw...@hotmail.com
2012-06-03 18:05:02 +01:00
Erthilo 4fca7bb569 TG: -Moved engineering and bridge delivery chutes as windoors are now breakable
-Fitness equipment moved into closets
-Added a couple more syndicate shuttle spawn locations
Revision: r3697
Author: 	 ericgfw...@hotmail.com
2012-06-03 16:29:06 +01:00
Erthilo 4a0b380ae5 TG: Window doors are now breakable
- Window doors currently have 200 health, this can and will change if break ins
become too common.
- They still do not have wires, so you can not 'hack' them that way.
- As always, emags still hack open window doors

Changes to the hidden mining room treasures.
- Added quality pickaxes, jackhammers and drills as a possible treasure.
- - Higher quality tools are rarer of course
- - Plasma cutter is possible but rare
- Added a ripley (equipped with a drill and hydrolic clamp) as a possible
treasure.
- - There is a chance for the ripley to have a diamond drill instead of a
regular drill.

Modified the resource crate.
- - It no longer always gives you multiple stacks of every mineral.
- - It now gives you a chance to get each mineral based on rarity.
- - The size of the mineral stack is also partly based on rarity.
- - There is a very small chance to recieve nothing in this crate.
- - There is a very small chance to recieve a jetpack in this crate ontop of the
metal.

Updated the changelog
Revision: r3696
Author: 	 johnsonmt88
2012-06-03 15:22:42 +01:00
Erthilo c3c5304397 Various fixes for bans and mutations. 2012-06-03 03:40:26 +01:00
Erthilo 8268b3d824 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/game/objects/devices/scanners.dm
2012-06-02 22:12:07 +01:00
SkyMarshal e79871e40b Detective improvements, take two. 2012-06-02 13:28:47 -07:00
Erthilo 36effbacc2 TG: There's a metric assload of stuff here, mostly in preparation to my massive
traitor expansion, so I'll try to be brief:

- I added in the foundations for traitor factions. See factions.dm for all the
different faction datums. They don't do anything yet.

- I completely ported mob/var/mutations from a bitfield to a generic list.
Mutation enumerated-identifiers are added into this list. For instance, TK = 1,
COLD_RESISTANCE = 2, XRAY = 3, etc... The purpose of this was because bitwise
operations could not actually be used after a certain size (because BYOND is
stuck in the 16bit era).

- I've added in completely-functional nano-augmentations. Check under
implantnanoaug.dm for a list of implants and implaners. As mentioned previously,
they are completely functional but may be slightly OP. Among these nanoaugs are
Super Strength, Psionic Radar, Electric Hands, Energy Blade/Sword Synthesizer,
Rebreather, Dermal Armor, Combat Reflexes, and Regenerative Nanorobots. I won't
go into detail as to what they do, but hopefully they should be self-
explanitory. If not, check out their descriptions in the file previously
mentioned.

- Added in a future traitor item, the Mind Batterer. Along with it a new .ogg
file.

- New telecomms bus mainframe sprite, thanks to WJohnston.

- New holdable shield, sprites courtesy of Muncher (i had to mangle the side
sprites because of a technical little issue. I'll change it back to the original
soon). It can be retracted and expanded. Probably only going to be given to
traitors.

- A couple of minor bugfixes here and there, along with some code tidying.

Hope this isn't too large a commit. I intended it to be MUCH larger, but I've
decided to split up my Traitor Factions expansion into smaller commits.
Revision: r3692
Author: 	 vageyenaman
2012-06-02 19:46:18 +01:00
Erthilo 1ece0d492f TG: -Adjusted balaclavas and added luchador masks. They replace the boxing gloves in
the fitness room.
-Tweaked fake moustache. It shouldn't work as internals, but it disguises your
identity.
-Fixed a couple flags for the sake of logic.
-Updated changelog.
Revision: r3691
Author: 	 d_h2...@yahoo.com
2012-06-02 15:46:40 +01:00
Erthilo 03737faf44 TG: Made you able to disassemble a few more computers. These are:
* Arcade
 * Prison Shuttle Console
 * Area Air Control
 * Atmos Alert Computer
 * Mining Shuttle Console
If anybody is not okay with this, feel free to comment out the attackby code of
that computer. But keep the circuitboard for future reference.
This should make all computers on the station be able to be disassembled.

Fixed some error message for cellchargers.
Revision: r3683
Author: 	 daniel.cf.hultgren
2012-06-01 23:18:12 +01:00
Erthilo 45ee78bf44 Adds Flashkirby's ERT suits. Moved ERT's equipment to lockers so it's easier to edit in future. Edited medical ERT's loadout slightly. Added a megaphone that broadcasts a larger message than normal, gave on to each Head in their office. Changelog. 2012-06-01 22:49:01 +01:00
ericgfwong@hotmail.com 9a96b073c9 Added WJohnston's inhand sprites for tools: http://nanotrasen.com/phpBB3/viewtopic.php?f=10&t=8266
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3709 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-01 10:10:57 +00:00
ericgfwong@hotmail.com 88e0a12cd7 Added/prettied up alpha channels to several glasses, helmets, and masks
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3708 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-01 06:01:33 +00:00
ericgfwong@hotmail.com 4d5a7753cc -Added transparencies to goggles and medical/sec HUDs
-Split nun robe into two objects so the hood could be worn over hair

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3706 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-31 23:09:41 +00:00
Erthilo 014b91cda5 Compile fixes. 2012-05-31 15:14:53 +01:00
Erthilo 8e72965077 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi
2012-05-31 15:09:35 +01:00
SkyMarshal 2bc692ec4d Some improvements for the LiquidFood stuff. 2012-05-30 16:26:24 -07:00
Lexus Langg 04f19dea7f Added a Liquidfood dispenser, food, charge, and crate using a combo of mine and Kirby's sprite.
Fully tested, everything seems to work fine.
Signed-off-by: Lexus Langg <jaedonjacobi@yahoo.com>
2012-05-30 15:27:00 -07:00
ericgfwong@hotmail.com 9df6b92054 -Added cameras to engineering storage and conference room
-Updated changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3699 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-29 21:51:16 +00:00
ericgfwong@hotmail.com 50736b8399 -Moved engineering and bridge delivery chutes as windoors are now breakable
-Fitness equipment moved into closets
-Added a couple more syndicate shuttle spawn locations

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3697 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-29 20:57:32 +00:00
johnsonmt88@gmail.com 3e3c9d4739 Window doors are now breakable
- Window doors currently have 200 health, this can and will change if break ins become too common.
- They still do not have wires, so you can not 'hack' them that way.
- As always, emags still hack open window doors

Changes to the hidden mining room treasures.
- Added quality pickaxes, jackhammers and drills as a possible treasure.
- - Higher quality tools are rarer of course
- - Plasma cutter is possible but rare
- Added a ripley (equipped with a drill and hydrolic clamp) as a possible treasure.
- - There is a chance for the ripley to have a diamond drill instead of a regular drill. 

Modified the resource crate.
- - It no longer always gives you multiple stacks of every mineral.
- - It now gives you a chance to get each mineral based on rarity.
- - The size of the mineral stack is also partly based on rarity.
- - There is a very small chance to recieve nothing in this crate.
- - There is a very small chance to recieve a jetpack in this crate ontop of the metal.

Updated the changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3696 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-29 20:35:32 +00:00
Mloc fbb67b2e42 Huge commit! Standardizes var definitions in most places.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-05-29 16:26:48 +01:00
Erthilo b409a84f2d Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
2012-05-29 15:00:11 +01:00
SkyMarshal 12392f74dd Merge pull request #1185 from Erthilo/master
HUD changes, medic spawn items, cow sprites, water bottles, Tajaran/Soghun fixes
2012-05-28 22:13:53 -07:00
vageyenaman@gmail.com 49647d329a There's a metric assload of stuff here, mostly in preparation to my massive traitor expansion, so I'll try to be brief:
- I added in the foundations for traitor factions. See factions.dm for all the different faction datums. They don't do anything yet.

- I completely ported mob/var/mutations from a bitfield to a generic list. Mutation enumerated-identifiers are added into this list. For instance, TK = 1, COLD_RESISTANCE = 2, XRAY = 3, etc... The purpose of this was because bitwise operations could not actually be used after a certain size (because BYOND is stuck in the 16bit era).

- I've added in completely-functional nano-augmentations. Check under implantnanoaug.dm for a list of implants and implaners. As mentioned previously, they are completely functional but may be slightly OP. Among these nanoaugs are Super Strength, Psionic Radar, Electric Hands, Energy Blade/Sword Synthesizer, Rebreather, Dermal Armor, Combat Reflexes, and Regenerative Nanorobots. I won't go into detail as to what they do, but hopefully they should be self-explanitory. If not, check out their descriptions in the file previously mentioned.

- Added in a future traitor item, the Mind Batterer. Along with it a new .ogg file.

- New telecomms bus mainframe sprite, thanks to WJohnston.

- New holdable shield, sprites courtesy of Muncher (i had to mangle the side sprites because of a technical little issue. I'll change it back to the original soon). It can be retracted and expanded. Probably only going to be given to traitors.

- A couple of minor bugfixes here and there, along with some code tidying.


Hope this isn't too large a commit. I intended it to be MUCH larger, but I've decided to split up my Traitor Factions expansion into smaller commits.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3692 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-29 03:16:47 +00:00
Erthilo 112fb5433e TG: - Some runtime-prevention tweaks so that impatient coders don't just break
everything somewhere down the line.
Revision: r3665
Author: 	 baloh.matevz
2012-05-29 00:33:25 +01:00
Erthilo 7f77c0ec91 TG: - Standardized var definition for RND and radio code (possibly some other stuff)
- Removed all cases (that I saw anyway) of flags being defined by static
numbers.
Revision: r3663
Author: 	 baloh.matevz
2012-05-28 23:37:43 +01:00
Erthilo a7dd312b3e TG: - Removed support for the ONBACK and ONBELT flags.
- Replaced them with a whole range of inventory slot flags. These now govern
whether an item can or can't be placed in a certain inventory slot. See setup.dm
for information on the flags. These flags only affect humans tho, as humans are
the only beings with an inventory to talk of.
- Standardized some gun code and some other pieces of code as I came accross
them. I hate indented variable definitions!

This commit should not bring any change whatsoever to the game from a player's
perspective.
Revision: r3659
Author: 	 baloh.matevz
2012-05-28 22:58:57 +01:00
d_h2005@yahoo.com cb2ba1a0e3 -Adjusted balaclavas and added luchador masks. They replace the boxing gloves in the fitness room.
-Tweaked fake moustache. It shouldn't work as internals, but it disguises your identity.
-Fixed a couple flags for the sake of logic.
-Updated changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3691 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-28 21:32:12 +00:00
Erthilo e106fe4c51 Adds water bottles to vending machines. 2012-05-28 20:14:19 +01:00
SkyMarshal 7a37d9bb05 Merge pull request #1167 from Erthilo/TGUpdates
TG Updates r3648 to r3657
2012-05-28 11:52:44 -07:00
Albert Iordache 922a7cc509 Fixed an ATM bug 2012-05-27 08:42:35 +03:00
Erthilo ca62d85b83 TG: - Crew monitoring computer pup-up screen is wider.
Revision: r3651
Author: 	 baloh.matevz
2012-05-25 22:47:34 +01:00
baloh.matevz@gmail.com c2c7a3bcda - Variable declaration standardization. Big commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3671 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-25 19:26:36 +00:00
baloh.matevz@gmail.com cfa1d1ed1f - Some runtime-prevention tweaks so that impatient coders don't just break everything somewhere down the line.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3665 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-25 16:34:10 +00:00
baloh.matevz@gmail.com 4348d6f0cb - Fixing some code typos.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3664 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-25 15:35:05 +00:00
baloh.matevz@gmail.com a30aca4327 - Standardized var definition for RND and radio code (possibly some other stuff)
- Removed all cases (that I saw anyway) of flags being defined by static numbers.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3663 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-25 14:48:47 +00:00
petethegoat@gmail.com 4413e5456d Replaced engineering rig suits with sexy new environment suits, sprites courtesy of Baystation 12.
Fixed Erro's backpack derp- backpacks are wearable once again.

Added a obj/structure ex_act(), blob_act(), and meteorhit().

Made gasmasks block visibility of glasses and ears.

Fixed being able to wear plasma tanks on your back.

Fixed the gas mixer sprite not lining up with horizontal pipes correctly.

Removed a bunch of pointless text()s from a few files. I was going to get rid of all of them, but I gave up after a while. Most of the diffs are this.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3662 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-25 14:40:43 +00:00
baloh.matevz@gmail.com 18ccabb33a - Removed support for the ONBACK and ONBELT flags.
- Replaced them with a whole range of inventory slot flags. These now govern whether an item can or can't be placed in a certain inventory slot. See setup.dm for information on the flags. These flags only affect humans tho, as humans are the only beings with an inventory to talk of.
- Standardized some gun code and some other pieces of code as I came accross them. I hate indented variable definitions!

This commit should not bring any change whatsoever to the game from a player's perspective.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3659 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-25 07:38:36 +00:00
Erthilo c9ea8a4c3d Fix for duplicate health analysers in the NanoMed dispensers, and changelog. Also changes old hud storage boxes to solid. 2012-05-25 04:09:17 +01:00
Erthilo b7b33fc91a /obj/item/weapon/spacecash change to /obj/item/weapon/money
Can now split and stack money properly.

Fixes genetics/research access door and also money path changes.
2012-05-21 23:56:48 +01:00
Erthilo 7fd99c7d3a TG: -Bunch of new/updated locker sprites. Most noticeable in mining and engineering
-New wardrobe closets for several departments
Revision: r3633
Author: 	 ericgfw...@hotmail.com
2012-05-21 20:40:08 +01:00
Erthilo 911cd7fca7 TG: -Added some positive reagents to certain foods.
Revision: r3627
Author: 	 d_h2...@yahoo.com
2012-05-21 17:13:29 +01:00
ericgfwong@hotmail.com b6a70eab34 -Bunch of new/updated locker sprites. Most noticeable in mining and engineering
-New wardrobe closets for several departments
-Showers now have soap. Don't drop it!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3633 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-21 11:54:51 +00:00
caelaislinn b626812c83 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/game/machinery/computer/lockdown.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-21 17:48:12 +10:00