Commit Graph

9733 Commits

Author SHA1 Message Date
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
44470e35b5 moved energy field layer to be above mobs
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:21:00 +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
Cael_Aislinn
06476113fa add the beekeeping manual to hydroponics, add a beenet to the hydro lockers
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-09 23:48:31 +10:00
Chinsky
cce3e8e4e9 Merge pull request #2503 from CIB/feature
Improved brainloss effects.
2013-03-09 05:48:19 -08:00
Cael_Aislinn
56a7441ef5 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-09 23:46:09 +10:00
Cael_Aislinn
17e607b0d8 compile fix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-09 23:45:27 +10: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
86a58380b3 added bees supply pack to cargo bay, made vending machine produce beezeez, make apiaries constructable out of wood
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-09 23:39:24 +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
cib
db707b4e5b Headrevs now get the names of 3 people who might be convertible. 2013-03-09 14:29:48 +01:00
cib
bd71f2e25c Fixed advanced med scanner not showing blood % 2013-03-09 11:02:01 +01:00
Spamcat
a32639bef4 Returned captain's PDA.
Fixes #2466.
2013-03-09 13:59:08 +04: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
55936a3e96 Forgot to save airlock.dm before committing. 2013-03-09 10:40:32 +01: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
baloh.matevz@gmail.com
960cd335e6 - Minor bugfix for job feedback gathering. YOUNG did not match the protocol.
git-svn-id: https://tgstation13.googlecode.com/svn/trunk@5603 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-09 07:43:45 +04: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
Chinsky
81a432930b Bit of refactoring.
Moved gun icons adding/deletion in separate procs.
Moved dropping aim in separate procs.
Moved gun empty clicking in separate proc because all the copypaste.

Fixed issues with aim mode HUD icons not being updated in some cases.
Now toggling mode cancels aim properly.
Fixed type in firing message.
2013-03-08 02:56:55 +04:00
Chinsky
4f75feffe5 Added recoil to projectile weapons.
On shot shakes screen a little.
2013-03-07 05:55:14 +04:00
Chinsky
56b4f0c85f Fixed couple of issues with suicide - no sound and inability to suicide again if tried to do it without ammo. 2013-03-07 05:54:46 +04:00
Asanadas
4720f4f1ac SYNDICATE? WHAT SYNDICATE? 2013-03-06 18:14:27 -05:00
Asanadas
b82070ecd8 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-06 18:10:47 -05:00
Chinsky
5a916019de Refactored and moved targeting code around a little.
Refactored suicide and point blank shooting code to use their projectiles properties instead of huge chain of conditions with arbitrary values.
2013-03-07 00:44:28 +04:00
Chinsky
55671d7485 Merge branch 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
	icons/mob/screen1_old.dmi
2013-03-06 17:04:45 +04:00
Cael_Aislinn
ae2b667f38 fixed icon issues with large crates, added a reinforced large secure crate (different aesthetically)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 21:18:15 +10:00
Cael_Aislinn
e27d7b2aeb cleanup for a bunch of stuff in arty scanners+harvesters, fix compile errors 2013-03-06 21:05:57 +10:00
Cael_Aislinn
dc794f5dac renamed a bunch of files to be a little more visible, added the beginnings of the new artifact scanners
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 20:50:17 +10:00