Commit Graph

6769 Commits

Author SHA1 Message Date
Cael_Aislinn
bf216021fc added/cleaned up research outpost areas (inc iconstates), moved area definitions to separate file
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-15 01:02:23 +10:00
Chinsky
13b6b2f61b Moved organ and blood code to module folder.
Moved most organ and blood procs to that folder.
Refactored handle_organs a little.
Added comments in some places.
2013-03-14 11:52:53 +04:00
Chinsky
1486e4b487 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into HTML 2013-03-14 05:06:55 +04:00
Chinsky
f2f042c904 Merge branch 'surgery' into bleeding-edge-freeze 2013-03-14 05:06:02 +04:00
Chinsky
7ac3f65f1a Merge branch 'nanopaste' into bleeding-edge-freeze 2013-03-14 05:05:43 +04:00
Chinsky
f8ae612991 Open incisions in surgery now bleed until closed or clamped. 2013-03-14 04:23:07 +04:00
Chinsky
b906a22192 Syndicate? Whozzat? 2013-03-13 06:38:32 +04:00
Chinsky
a2e2c373ef Added new item - nanopaste.
Researchable by RnD (materials and engineering tech), used to repair robots and robolimbs more efficiently (twice as fast and both damage types at once).
2013-03-13 05:57:53 +04:00
Chinsky
564e6b2f9b Merge branch 'gun' into bleeding-edge-freeze 2013-03-12 08:46:07 +04:00
Chinsky
c351bc1a33 Getting hit by bullet will shake camera. 2013-03-12 08:43:42 +04:00
Chinsky
a4581cc1d8 Derp, accidentally deleted OD for chloral way back.
( c4997a34f1 )
Fixed now.
2013-03-12 08:40:47 +04:00
Chinsky
f13cca99e6 Added brain fixing surgery. 2013-03-12 02:22:46 +04:00
Chinsky
2d8b280d99 Reverted changes to RIG armor values 2013-03-12 01:46:34 +04:00
Chinsky
b1bb564168 Fixed issue with #2154
Also moved selection of base icon for limbs to update_mutantrace so it's only doen when race is changed.
Changed mob icons a little, to get rid of rogue red pixel on torso that was not covered by arm
Moved awkward red spot where missing hand would be to arm sprite, since missing whole arm would still make stump appear there, and it looks weird.
2013-03-12 00:41:37 +04:00
Chinsky
7e82d9064c Head blows now can cause brain damage. 2013-03-11 04:59:24 +04:00
Chinsky
52ad4929d1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-11 01:18:43 +04:00
Chinsky
b207349c44 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-11 01:18:10 +04:00
Chinsky
ced88e1569 Ported HUD functionality.
Sec HUDs showing brief of sec record.
Med HUDs changing status and showing brief of med record.
2013-03-11 01:11:56 +04:00
Chinsky
611bd1c6e9 Removed ability to use radio while stunned again. 2013-03-11 00:38:16 +04:00
Chinsky
e60bef91bd Added indication for when someone speaks into radio. 2013-03-11 00:27:18 +04:00
Cael_Aislinn
a1adddbce2 compile fix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-11 00:12:33 +10:00
Cael_Aislinn
1322ac469c removed rock spawn for ordinary miners
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 23:49:50 +10:00
Cael_Aislinn
32184d8419 shuffled some sprites around, cleaned up some vars, added a new sprite for hyperspectral imager based on the book scanner
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 23:25:05 +10:00
Cael_Aislinn
f8f9397636 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	icons/obj/library.dmi
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 23:01:33 +10:00
Cael_Aislinn
4559bcce57 tewaked the noticeboard memos a bit, added 5 (verbose) manuals explaining how to do xenoarchaeology in character, added a bookcase for the manuals
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 22:57:08 +10:00
Christian Bielert
10c3beae24 Merge pull request #2514 from comma/master
Goatee fix.
2013-03-10 05:01:50 -07:00
Chinsky
cf423fe979 Fixed Goatee and Male Skrell Tentacles. 2013-03-10 15:37:33 +04:00
Cael_Aislinn
2401ac8185 more renames
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 19:06:29 +10:00
Cael_Aislinn
c79b0c1672 moved and renamed a bunch of files to be more consistent + intuitive
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 19:00:05 +10:00
Cael_Aislinn
67ecee35df renamed scanner to be more consistent, fixed a couple of issues with the anodevice local feedback on activate 2013-03-10 18:51:15 +10:00
Cael_Aislinn
2ef841da6e overhaul/cleanup to ano utilizers: they're now consistent with modern ss13 interactions + process more cleanly and operate more robustly, they properly interact with the rest of the updated xenoarch content, activating them should also give a message to anyone watching
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:43:41 +10:00
Cael_Aislinn
50f4d3a24d harvester overhaul to be cleaner + updated interaction and processing, should properly interact with the rest of the xenoarch update, draining charge is now done incrementally and procs the artifact effect on the harvester/anyone nearby
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:43:35 +10:00
Cael_Aislinn
ade8fcae22 effects will get a random id if the excavation code doesn't assign them one, cleaned up local activation feedback for effects
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:33:11 +10:00
Cael_Aislinn
28ab7d4e90 players touching an artifact with gloves will now receive a feedback message
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:32:06 +10:00
Cael_Aislinn
88c17b75b6 tweaks to artifact analysis including non-sfx vocal feedback, some cleanups to pre-scan checks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:31:30 +10:00
Cael_Aislinn
fdcbebab93 tweaks and fixes to a bunch of artifact effects
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:21:45 +10:00
Cael_Aislinn
46761b14f8 fleshed out artifact analysis, added effect types to all the effects
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 14:55:04 +10:00
Chinsky
c45a81789a Merge pull request #2507 from caelaislinn/bleeding-edge-freeze
Beekeeping
2013-03-09 05:54:28 -08:00
Chinsky
cce3e8e4e9 Merge pull request #2503 from CIB/feature
Improved brainloss effects.
2013-03-09 05:48:19 -08:00
Cael_Aislinn
7de4093060 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-09 23:41:53 +10:00
Cael_Aislinn
b13c634293 added bee stuff, will post documentation for it on the forums. features include: place an apiary on a hydro tray to cultivate bees, bees auto breed and spread (if they have enough food), bees give slight accumulative boosts to nearby plants, bee hives produce honey and honeycomb added manual to explain beekeeping, rampaging bees can do a lot of damage but anything with bio protection will reduce likelihood of being stung
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-09 23:38:54 +10:00
Spamcat
c290745128 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-09 13:51:37 +04:00
Spamcat
39d01d4310 Nerfed syringestab, made it produce a broken syringe with fingerprints and stuff, so tater will need to thing about evidence disposal. 2013-03-09 13:51:05 +04:00
cib
58186ce7e0 Improved brainloss effects.
- Will drop items/fall down with a lot of brainloss now, headache and blurry vision with small brainloss.
- Removed stupid effects, like random messages and headbutting airlocks.
- Cloning now will leave you at lower health and cause small amounts of brainloss.
2013-03-09 10:35:20 +01:00
Christian Bielert
c31abc3b05 Merge pull request #2502 from comma/gunmode
Aiming Mode
2013-03-09 00:13:19 -08:00
ericgfwong@hotmail.com
6ac93ddd4d Added new descriptions to each of the rigs and gave them unique armor values.
Medical PDAs should now have a green stripe

Fixed a misplaced /area/ issue in the Warden's office

git-svn-id: https://tgstation13.googlecode.com/svn/trunk@5602 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-09 07:43:04 +04:00
Cael_Aislinn
38c2179620 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-08 11:49:54 +10:00
Cael_Aislinn
f7aaf631b9 runtime fix in spam event
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-08 09:27:28 +10:00
Chinsky
ced4294be8 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into HTML 2013-03-08 03:26:41 +04:00
Chinsky
5fa6414d70 If you aim at people, shots will be slightly more accurate. 2013-03-08 03:21:47 +04:00