Commit Graph

17074 Commits

Author SHA1 Message Date
vageyenaman@gmail.com 9cc379273e TG update: Vending machine GUI overhaul.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2694 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-17 11:49:03 +02:00
Albert Iordache a253e02dda Merge pull request #282 from Uristqwerty/master
Slightly modified A* improvement
2012-01-17 00:57:07 -08:00
SkyMarshal f509cda7b0 Merge pull request #284 from Tastyfish/master
added orderable chickens and cows
2012-01-16 23:17:36 -08:00
SkyMarshal 0d7ce5f347 Port of the TG radio system. Tasty and I tested it out and it works smooth and clean :)
We were able to restore functionality after we blew up half the radio equipment, as well.
AI satellite is now the Comms satellite.
2012-01-17 00:12:30 -07:00
VivianFoxfoot@gmail.com b655251653 Sounds for people in lockers no longer get progressively louder for each mob that can hear it.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2969 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-17 05:53:09 +00:00
Tastyfish 53baf4755f Merge remote-tracking branch 'upstream/master' 2012-01-16 20:27:36 -05:00
Tastyfish df208f7189 added orderable chickens and cows 2012-01-16 20:26:17 -05:00
vageyenaman@gmail.com 255b91247c fiiiiix
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2968 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-16 23:34:14 +00:00
trubblebass@gmail.com 306bc5a00c - Cyborgs now get the old syndicate lawset when emagged that replaces their current laws. Instead of just a Law 0 (authorised by Neo)
- Xenobio Pen now has a remote Igniter. Button for it is on the table next to the shutters button.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2967 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-16 23:14:23 +00:00
vageyenaman@gmail.com ffcea8eee2 Should be the LAST bugfix.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2966 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-16 23:07:45 +00:00
vageyenaman@gmail.com d87dca30c6 Makes puking less common. Corpses can no longer puke...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2965 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-16 21:55:21 +00:00
vageyenaman@gmail.com 3a61c2b975 im gaye
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2964 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-16 20:52:00 +00:00
vageyenaman@gmail.com d4eb2e6e10 New type of machine that goes under floor tiles, creates a constant beacon. Can be disabled by... blowing it up, I guess. Doesn't need power.
Some minor bugfixes here and there. Added in telecomm circuits to the comm sat.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2963 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-16 20:30:10 +00:00
cib 9dfec57e18 Blob now requires oxygen to grow. 2012-01-16 12:13:15 -08:00
vageyenaman@gmail.com 8b6c89eead Some more fixes and tweaks. Ggh.
AI can't mess with the turrets at the satellite now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2962 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-16 18:53:28 +00:00
vageyenaman@gmail.com ffe42d1ca6 Quick fixes for my last commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2961 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-16 08:55:20 +00:00
vageyenaman@gmail.com 00119e0b4a ▫ Telecommunications is finally live. There's just too much to explain so I'm going to recommend you visit the wiki article on Telecommunications.
▫ AI satellite replaced with Communications Satellite.
▫ Some turret tweaks. Gave "AI" turrets a variable that controls what type of lethal shots they shoot.
▫ New job access level, Telecommunications Satellite. The CE, RD, and Captain get this access level.


▫ Some icon tweaks and stuff.
▫ Faster chem machine energy regeneration rate.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2959 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-16 01:14:19 +00:00
Albert Iordache b33a54b825 Renamed the bone cracker to "bone setter" 2012-01-15 23:59:21 +02:00
Uristqwerty 91b6e0072c Merge branch 'master' of git@github.com:Uristqwerty/Baystation12.git
Conflicts:
	code/defines/turf.dm
2012-01-15 16:29:08 -05:00
Uristqwerty c3b12f3945 A* distance estimate improvement try #2: Only change it where pathing ignores diagonals, leave the old one where diagonals are considered. 2012-01-15 16:26:10 -05:00
polyxenitopalidou@gmail.com 112b352bbf •Issue 109 fixed
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2958 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-15 20:37:51 +00:00
Uristqwerty 1f27f092a8 This might make A* work better, since BS12 doesn't have diagonal movement. 2012-01-15 04:07:06 -05:00
Uristqwerty 20dee7e71a This might make A* work better. 2012-01-15 04:05:30 -05:00
kortgstation@gmail.com b5e7631fac Added the boxing gloves sprited by Ausops.
A pair of each colour added to fitness.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2957 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-15 07:17:25 +00:00
baloh.matevz d3d8755c67 Added in stationary, super-high-capacity scrubbers. Currently two are located in the toxins gas storage room and one in the incinerator. They are controlled by an area air control computer, so you can turn them on at a distance.
Added into code a legacy emergency closet which contains one oxygen tank and one gas mask, committing my version of oldstation. It still needs lighting and wires added as well as room wall-mounted things like air alarms, fire alarms, light switches and lights.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2955 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-14 19:05:40 +00:00
Tastyfish 1dbc4997fb put filing cabinet in correct path in tg standards 2012-01-14 00:54:58 -05:00
quartz235@gmail.com ce61604e79 - Walls, Rwalls, etc. now leave hidden prints when constructed
- Biosuits can now hold pens and penlights in suit storage
- Syringe draw/inject icons are now overlay-based
- Syringes now use the same coloring overlay system as beakers (see: blood samples are now red, etc. etc.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2953 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-14 05:54:51 +00:00
VivianFoxfoot@gmail.com 340ee75481 Fixes the clusterbang so it actually shoots out.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2952 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-14 03:34:10 +00:00
Albert Iordache 725ec31a57 Merge pull request #278 from caelaislinn/master
Fixed disposals error from using a grab on a disposal chute.
2012-01-13 11:52:53 -08:00
VivianFoxfoot@gmail.com 553f56566f Readds the clusterbang.
Eye damage over 20 units now causes permanent vision impairment, 
Eye damage over 30 units now causes permanent welder-vision.  
Eye damage is treated by Imidazoline or eye surgery.  Full blindness still only treatable by eye surgery. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2951 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-13 17:53:41 +00:00
trubblebass@gmail.com 59c0e6ee2c - Removed the Clusterbang from the HoS locker.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2950 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-13 15:57:21 +00:00
CaelAislinn 07fb3f1eb8 fixed error from using a grab on a disposal chute
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-13 21:51:16 +10:00
VivianFoxfoot@gmail.com 8af7db096d Cleans up and uses less area checks, relying more on lastarea.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2949 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-13 06:01:32 +00:00
quartz235@gmail.com ecc367e059 Forgot about decimals in my metroid runtime fix
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2948 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-13 05:02:50 +00:00
VivianFoxfoot@gmail.com a14e55b56f Removes a test message left in the PDA code.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2947 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-13 02:29:02 +00:00
VivianFoxfoot@gmail.com 7ffdec48bf Fixes fire extinguishers in space, removes empty hand requirement, which wasn't supposed to be committed. My bad.
Adds the ability for door buttons to both close the doors they're attached to, and also a framework for controlling their other functions like idscan/bolts.
Adds a secure safe to the HoS's office and a new flashbang grenade!  
Secure safes can now hold 8 weight units of stuff by default.  
Adds a reply function to the comm. console prayers as well as a confirmation button on BSA.  


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2946 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-13 02:15:22 +00:00
Albert Iordache e3c4b0f88f Merge pull request #276 from SkyMarshal/master
Weldpack added, not on map; Clipboards fit on belt; Wrapping is more robust.
2012-01-12 11:43:39 -08:00
Albert Iordache 8de86927f8 Merge pull request #272 from Miniature/master
Made hydroponics happen 5 times slower
2012-01-12 11:28:57 -08:00
SkyMarshal 70cb3417ef Added weldpack, clipboards fit on belt, food and other things can now be wrapped 2012-01-12 11:13:05 -07:00
Miniature 79b4e56971 Made hydroponics happen 5 times slower, current rate means you have no time to do anything
This is entirely a guess at the correct speed and will likely require further changes
2012-01-13 00:57:27 +10:30
CaelAislinn 47451d9f53 conveyors in the mini outposts on the mining asteroid should now work properly
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-12 16:59:36 +10:00
Tastyfish 9e5925b1f9 fixed custom items loaded and custom_items.txt 2012-01-12 01:54:27 -05:00
Tastyfish b5c8b89a4d Merge remote-tracking branch 'upstream/master'
Conflicts:
	code/WorkInProgress/Mini/customitems.dm
2012-01-12 01:48:33 -05:00
Tastyfish e5abd35dae made custom items read from a config file 2012-01-12 01:47:55 -05:00
Tastyfish abefe71bba fixed derpy bug in spawning right dismembered foot 2012-01-12 01:47:15 -05:00
Tastyfish a8e8af6242 Merge pull request #269 from SkyMarshal/master
Fixed bugs with wrapping yourself in a closet, new CentCom uniforms, reactive teleport armor now works and has a sprite, fixed implanter issues.
2012-01-11 22:32:43 -08:00
SkyMarshal 80761ed2e5 Added pink labcoat. 2012-01-11 22:21:26 -07:00
SkyMarshal 98b6019f99 Implanters now work properly. This is a bugfix. 2012-01-11 21:28:34 -07:00
SkyMarshal ef45b6128c Fixed some UI stuff. 2012-01-11 20:40:41 -07:00
cib a7b188a201 Bug fix: Tramadol pill bottle spawned empty, and kelatone pill bottle spawned with tramadol. 2012-01-11 18:03:19 -08:00