Commit Graph

1178 Commits

Author SHA1 Message Date
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
VivianFoxfoot@gmail.com
19555c7cfb Fixes wizard projectile spells. (Issue 387)
Adds a var to the spellbook that determines if it can be used for buying veil renders and arsenals.  

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3259 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-06 02:11:22 +00:00
Ren Erthilo
b92ecb932b Added custom items. Small fix for labcoat buttons and descriptions. 2012-03-05 17:52:28 +00:00
petethegoat@gmail.com
0a0f97ef0c Large bureaucracy overhaul.
This affects clipboards, hand labelers, paper, paper bins, pens, photocopiers, and stamps.
Everything (that I've changed significantly) should be BETTER.

NO paths have been changed.
All of the above have been added to the paperwork module (pending rename to bureaucracy, which is COOLER).
SPRITES for most of the above (except photocopiers) are now in bureaucracy.dmi.

Clipboards in particular are MASSIVELY IMPROVED.
Hand labelers can now be turned ON AND OFF, to make it simpler to avoid labelling tables.
This includes work in progress FOLDERS, which currently do NOTHING.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3253 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-05 00:23:05 +00:00
SkyMarshal
3e3534f00b Map update, CE now knows wire colors, added some old BS12 stuff (AI upload sprite, warning stripes), complete mute can still be adminhelped, removed gooncode in hallucinations, fixed the poweroffline event.
Map update has a redone CE's office and AI upload.
Explosions now let admins jump to them.
2012-03-03 20:23:10 -07:00
Superxpdude@gmail.com
a3e28d1901 Fixes a bug regarding gladiator uniform sprites, and comments out the police uniform due to missing sprites.
Patch by Shiftyeyesshady.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3244 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-03 21:26:05 +00:00
Hawk-v3
9d69c86308 Fixes compile Errors, take it away with the doors, Sky! 2012-03-02 22:55:42 +00:00
elly1989@rocketmail.com
9859a0b52f Committing fixes to code for examining mobs. Burn damage wasn't showing properly on some mobs. Fixed grammar, icons and stuff.
Added some  stylesheet classes. Approved by Urist. If you're adding game text, please use the class that best describes the text. This way all the text formatting can be edited from the stylesheet rather than traipsing through the code like I am.
Cyborg names reflect their module choice.
Cyborgs can no longer drop their module-items on conveyor belts.
Please remember to add the line: gender = PLURAL to any new item defines if the item is plural, ie metal rods and such.
Much more to come. ;-; Just need to check them and merge... why did I start climbing this mountain?

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3232 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-02 16:07:32 +00:00
joe.heinemeyer@gmail.com
113beeb052 BS12 Detective Work port.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3229 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-02 05:23:08 +00:00
Hawk-v3
bdff096c4c Subject: [PATCH 086/285] TG UPDATES:
- Simple event dispatch system.
- atom.forceMove() proc. Ignores density and other Move()restrictions, but calls Exited() and Entered()
- var/emagged moved to /obj/machinery class - anyprob() helper proc.
- Mecha internal damage varsencapsulated.
- Mech Fabricators now require robotics ID to operate. Emag removes this restriction.
- Added Odysseus Medical Exosuit and it's parts. Has integrated Medical Hud and ability to mount medical modules.
- Added Sleeper Medical module for medical exosuits. Similar to common sleepers, but no ability to inject reagents.
- Added Cable Layer module for exosuits. Load with cable (attack cable with it), activate, walk over dismantled floor.
- Added another exosuit internal damage type - short circuit. Short-circuited exosuits will drain powercell charge and power relay won't work.
- You should be able to send messages to exosuit operators using Exosuit Control Console
- Gygax armour and module capacity nerfed.
- Exosuit weapon recharge time raised.
- Bugfix: EMP actually drains exosuit cell and damages it
2012-03-01 20:50:19 +00:00
Hawk-v3
6ced35a88d Stuff for next patch 2012-03-01 20:42:48 +00:00
Ren Erthilo
cf2b6ec28c Added Notebook for the Detective. 2012-03-01 00:23:29 +00:00
musketstgstation@gmail.com
ddc7f45a13 Integrated BS12's improved uplink code, courtesy of SkyMarshal.
This means items now spawn in your hand if possible, items are sorted into categories, and only items you have enough telecrystals to purchase will be displayed.  Also, the same basic code is now used for PDA, headset and nuke-round uplinks, and it should be easier to add new items.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3216 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-29 22:50:14 +00:00
VivianFoxfoot@gmail.com
7f579b3956 Fixes commsat turrets to actually require comsat access as opposed to AI upload.
Fixed door controls to actually respect access requirements set on them.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3211 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-28 22:38:41 +00:00
Hawk-v3
2fe9b995ea Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-28 22:07:45 +00:00
Hawk-v3
7d0042a9e0 Fix for next patch. 2012-02-28 21:50:03 +00:00
kortgstation@gmail.com
ef1bdf7442 TG UPDATE: The Staff of Change now has its own sprite/in hands.
The Wizard Spellbook has a new subsection: Artefacts. Artefacts are items with special properties that the wizard can purchase as an alternative to spells (one artefact costs as much as one spell)

Currently the only Artefact is the Staff of Change, more to follow.

Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2739 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-28 21:10:30 +00:00
Ren Erthilo
82ff493455 Added correct colour uniform icons for Med/Sci jobs. Added Virology jumpsuit to wardrobe. 2012-02-28 20:04:24 +00:00
Hawk-v3
35f061477e Sky's change, again. 2012-02-26 23:32:33 +00:00