Commit Graph

1296 Commits

Author SHA1 Message Date
SkyMarshal
01d2d5f339 WIP bloodloss and scaring system. 2012-03-29 20:42:08 -07:00
Ren Erthilo
6952bef874 Reverting disabilities, headsets, murder sydie pack, photo removal, isbreathing and internals. 2012-03-30 04:19:22 +01:00
Ren Erthilo
63c027aca9 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates 2012-03-29 08:37:47 +01:00
SkyMarshal
736c3f46e1 Final commit of the examine/damage overhaul. 2012-03-28 22:37:08 -07:00
vageyenaman@gmail.com
d29e3be8d4 Removes poo. XSI and co. weren't very fond of it, and the last thing I would do is make them uncomfortable and challenge their leadership by keeping poo in.
An experimental lagfix, which removes a couple THOUSAND unnecessary machines from the machine processing list. Please report any unresponsive machinery (as result of this commit) as HIGH PRIORITY issues. I'm not quite sure how much lag this will kill, but I'm confident that it will be at least slightly noticeable.

More work on step_triggers. The escape shuttle should no longer blast things forever and give them infinite momentum.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3370 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-29 03:53:38 +00:00
Ren Erthilo
78b9e9928a Reverts descriptions/names and old syndicate uplink. Adds sprites for advanced medical items. 2012-03-28 22:52:00 +01:00
Ren Erthilo
da7244abda Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-03-28 22:25:07 +01:00
Pobiega
3f07ef38b3 Added surgery crate to QM. Contains all surgery tools and requires access_medical to open. 2012-03-28 18:28:39 +02:00
johnsonmt88@gmail.com
4c7d775593 Secborgs now have modified tasers:
- It holds 6 shots 
- It recharges one shot every 10 seconds automatically

Secborgs can no longer run faster then the speed of light. They have standard borg speed.

Changelog updated.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3365 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-27 21:43:43 +00:00
Ren Erthilo
7aa0227ef8 Another small merge fix. 2012-03-26 18:47:25 +01:00
Ren Erthilo
f7e8bcd591 TG: Emitters emp_act now uses severity properly.
The PA can no longer be remotely controlled by humans and cyborgs can only
control it if they are nearby.
The spawn PA can now be taken apart.
FireAx/Extinguisher closets got their own files.
Food closets are now with their defines.
Freezer closet/crates override return_air() to cooldown the contents.
The var isinfreezer has been eliminated.
The old player panel has been readded as an alt for the new one, it may be found
under the Player Panel verb.
The new player panel may be accessed by the Player Panel-New verb.
Crates.dm moved from the storage folder as it is not a storage object.
Fixed  Issue 227  about the PA shooting when it should not be. r2851
2012-03-26 18:46:08 +01:00
Ren Erthilo
09af032b9e TG: - Fixed wrong paths for mech circuit boards
- Added Odysseus circuit boards to designs.
- Tweaked Odysseus parts construction costs. r2814
2012-03-26 18:06:54 +01:00
Ren Erthilo
470d767369 Reverting registered_name change. Reverting area name changes. Reverts Plasma Steel and object changes. 2012-03-26 15:47:39 +01:00
SkyMarshal
d65a912c8e WIP bloodloss and scaring system. 2012-03-25 20:45:00 -07:00
vageyenaman@gmail.com
e78787808a Adds a isDay() function and isAprilFools() macro function which uses isDay() to determine if it is month 4 day 1. GET BUSY.
Other shenanigans.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3361 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-26 02:17:45 +00:00
Ren Erthilo
089e844be9 A large amount of groundwork for /tg/ code. Comes with some gameplay changes.
* + You now take severe brute damage in environments over 750kPA. A new HUD icon warns you when it's above 500kPA. Space suits block this.
* > Welding fuel tanks explode when shot.
* > Riot shields prevent you from being pushed.
* > People cannot be shoved when being pulled and handcuffed.
* > The internals button on the hud now works for tanks in almost any area, such as your pocket.
* > No more popups when you insert your ID into your PDA. There's a link in the PDA menu to update info.
* - Removed photo system from ID's as it doesn't work.
2012-03-26 03:16:01 +01:00
SkyMarshal
5c0ddb031d Merge pull request #738 from Erthilo/master
Adds alternate CMO labcoat, engineering crates need proper access, test code for implant only taser firing, changes to overdose, and more bugfixes
2012-03-24 18:04:03 -07:00
SkyMarshal
f45aff1bae Chameleon Jumpsuit now has armor, space tiles now get generated faster, fixed fingerprint runtime, optimized autosay, fixed crates + package wrappers, retired admins are no longer spammed, can now click through blindness, packages and evidence bag contents now count toward traitor objectives, stunning and such stops you instantly, guncode improvements. 2012-03-24 17:21:31 -07:00
Ren Erthilo
97f94187ff Made engineering crates engineering only. 2012-03-24 01:45:20 +00:00
Mloc
749b412093 Merge pull request #726 from CIB/master
Alcohol fixes, also more, see commit messages
2012-03-22 05:15:51 -07:00
cib
5a563b4af7 Nerfed the energy sword since it'd do 140 damage. 2012-03-21 20:56:34 -08:00
cib
42e21b3447 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-21 20:10:26 -08:00
cib
f041bc7063 Rebalance of the melee damage system.
- Heavy objects now take longer to swing and deal more damage.
- A hit to the head is more likely to knock you out.
- A hit to the torso with a heavy object is more likely to knock you down.
2012-03-21 20:10:13 -08:00
cib
a1f4738a67 Fix to toolbox swinging. 2012-03-21 17:46:07 -08:00
CIB
bd745b5e30 Merge pull request #725 from Erthilo/master
New Engineering Space Suits, health analysers detect bone fractures, pulling lying down people is slower, and some fixes
2012-03-21 13:00:31 -07:00
Ren Erthilo
fd338632c5 Fix for machine messages. Fix for previous health analyser commit. Added New Engineering Space Suits. Prevented wasting resources while fixing cyborgs. 2012-03-21 19:30:48 +00:00
CIB
1dd17e60a3 Merge pull request #727 from SkyMarshal/Airlocks
Made appendicitis only happen once, jump to explosion link should work, hallucination improvement/sanchecking, increased the damage of things to pre-nerf levels.
2012-03-21 10:02:27 -07:00
SkyMarshal
b86cd6bda4 MAde appendicitis only happen once, jump to explosion link should work, hallucination improvement/sanchecking, increased the damage of things to pre-nerf levels. 2012-03-21 09:46:42 -07:00
Ren Erthilo
8ab66b0852 Made it possible to get rid of ash. 2012-03-21 02:20:27 +00:00
Ren Erthilo
db134c759d Merge commit 'stash' 2012-03-20 17:31:49 +00:00
Ren Erthilo
e90493c41b On master: Change 01 2012-03-20 17:31:10 +00:00
cib
1c5d305bc6 Fixes to the toolbox and APC commits. 2012-03-20 04:40:54 -08:00
cib
a541d32381 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-20 03:53:46 -08:00
cib
6d979ae17b Toolboxes have a chance to swing open. 2012-03-20 03:53:12 -08:00
petethegoat@gmail.com
b19404f074 Sanity checking in robot move
Added CompactNinja's sterile masks box sprite

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3322 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-18 22:01:23 +00:00
misterfox
64f50d0d04 Tajara stuff 2012-03-16 12:20:42 -04:00
petethegoat@gmail.com
2c069f8a97 Commit for Nodrak.
See: http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8107#p96230 for changelist.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3307 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-16 14:58:59 +00:00
Ren Erthilo
58b9b6595b Increased most vending machine points. 2012-03-15 22:02:37 +00:00
Ren Erthilo
61a82b22bb Fix for labeling virus dishes. Removed health analyzer from first-aid kit.
Made bruise packs and ointment only work above 50 health.
Added advanced treatment for future use.
Made MD's and CMO spawn with health analyzers.
Reduced medical equipment in non-medbay areas.
Made Health Scanner HUDs displays more granular.
2012-03-15 21:46:11 +00:00
petethegoat@gmail.com
80db6c22b0 Added Cheridan's hatchets!
Buffed stamped packing slips to be worth 2 supply points.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3298 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-15 16:14:29 +00:00
SkyMarshal
72bd358f5a Fixed a whoops. 2012-03-14 02:17:02 -07:00
SkyMarshal
e74f7a4c39 Vending machines now work off of a point based system, A-la oldcode. 2012-03-14 02:11:31 -07:00
SkyMarshal
ac03e51fd3 Fixes for: #663, #661, #658, and #628 2012-03-14 00:03:57 -07:00
Ren Erthilo
f837ba284d Fixed RIPLEY circuits not appearing in crate. Changed Paramedic to EMT. Made sleeper injection control mode finer but still dangerous. Fixed disconnect examine message. Fixed department computer broken sprites. 2012-03-14 01:53:36 +00:00
Ren Erthilo
008789e631 And another derp fix. 2012-03-11 01:52:06 +00:00
Ren Erthilo
6d444abc38 Fixed a compile derp. Added 'Paramedic' Medical Doctor title. 2012-03-11 01:48:39 +00:00
Ren Erthilo
27bb390d48 Corrected grammar and added descriptions. Changes Asimov to prevent some loopholes. Credit to Kaleb702. 2012-03-10 20:07:24 +00:00
Miniature
b334def110 Removed virus crate from QM, since we have new virus system (might be worth adding it back in later but giving the new type of viruses) 2012-03-11 01:36:22 +10:30
Tastyfish
6874cc03d1 cleaned up the paths of a few ported things 2012-03-08 00:46:24 -05:00
Hawk-v3
17f128cb02 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-03-06 19:24:38 +00:00