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
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
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
Christian Bielert
12215c588f
Merge pull request #2483 from RavingManiac/bleeding-edge-freeze
...
Syringestabbing
2013-03-06 02:00:32 -08:00
Cael_Aislinn
0481c1eb3f
reagent data is properly preserved over chemical reactions
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-06 19:49:57 +10:00
Cael_Aislinn
53793fc2aa
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
...
Conflicts:
baystation12.dme
code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
icons/obj/storage.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-06 19:03:18 +10:00
Christian Bielert
f6efab34e0
Merge pull request #2479 from caelaislinn/bleeding-edge-freeze
...
RUST updates, other
2013-03-06 00:56:20 -08:00
RavingManiac
33d5e0944c
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-03-06 14:43:09 +08:00
Nanodesu
104cc5585d
roro to slime fix
2013-03-06 05:59:21 +04:00
RavingManiac
c18999957f
You can now stab people with syringes. This destroys the syringe, deals 7 brute damage and injects a random percentage of the syringe's contents into the target.
...
Syringestabbing is blocked by shields. Armor on the targeted body part has a 50% chance of deflecting the syringe unless you are stabbing yourself.
2013-03-06 00:39:29 +08:00
Cael_Aislinn
72ecd516c5
dropped grid check duration
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-06 01:45:26 +10:00
Cael_Aislinn
92517638bc
removed double announcement for grid checks
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-06 01:31:40 +10:00
Cael_Aislinn
c5f461e90d
circulators and type 1 gens are now rotateable/moveable, also made the operation of gens/circs much more generalised to allow for greater flexibility in setup (this makes type 2 gens incompatible with the circs, but i'll update them later)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-06 01:28:57 +10:00
Cael_Aislinn
2933069ebe
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-05 17:23:16 +10:00
Cael_Aislinn
6f9542cd10
removed debug output for type 2 TEGs
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-05 17:06:43 +10:00
Cael_Aislinn
e511bf954e
fixed icon + useability + construction issues for misc rust components, removed debug output for TEGs, made injectors no longer directwired
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-05 16:23:59 +10:00
cib
b25a6cb9bb
Typofix
2013-03-05 04:25:21 +01:00
cib
aa4deb2b89
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
2013-03-04 12:20:38 +01:00
cib
65b8eafe8e
Added internal organs.
...
They can be hurt by their parent organ getting hurt.
Ruptured lungs are now represented as damage to the lungs internal organ.
2013-03-04 12:19:12 +01:00
Zuhayr
6c15bb5bfa
Forgot to update the emag code so that the bots explode.
2013-03-04 04:14:44 -08:00
Zuhayr
810c9bea70
Added verbs to spiderbot, tweaked access.
2013-03-04 03:26:52 -08:00
Christian Bielert
65ff5dc7f9
Merge pull request #2460 from Gamerofthegame/bleeding-edge-freeze
...
Medical hardsuit changes
2013-03-01 16:07:00 -08:00
Christian Bielert
a211b493c8
Merge pull request #2465 from Zuhayr/bleeding-edge-freeze
...
Spiderbots and a bunch of commits from master.
2013-03-01 16:05:17 -08:00
Zuhayr
3774b16839
Made spiderbots buildable, animated spiderbot sprites.
2013-03-02 02:15:39 -08:00
Zuhayr
ad47e954ce
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-03-01 23:15:19 -08:00
Zuhayr
e17038636f
Added spiderbots! Adminspawn only currently. They take an occupied MMI or posibrain, can crawl through vents and hide, shock people, and go 'beep'.
2013-03-01 14:28:58 -08:00
Jim "Apples"
2064f57dc0
Merge pull request #2464 from caelaislinn/bleeding-edge-freeze
...
added an admin proc to check for any inactive players with custom items
2013-03-01 07:22:21 -08:00
Zuhayr
15984f6a14
Fix for posibrains, modification to posibrain brainmob for admin use, updated posibrain sprites, addition of spiderbot sprites for a later project.
2013-03-01 01:38:32 -08:00
Cael_Aislinn
30a34bbc9f
added an admin proc to check for any inactive players with custom items
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-01 19:15:27 +10:00
Spamcat
c9e657a4c6
Reloading spent casings in the revolver doesn't duplicate "This one is spent" message
...
Fixed #2434 .
2013-02-28 17:07:20 +04:00
Spamcat
9894ce73d5
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze
2013-02-28 13:48:44 +04:00
Spamcat
c4c31fd657
You can now switch off cameras.
...
Fixes #2394 .
2013-02-28 13:46:56 +04:00
Gamerofthegame
a2cfc456c0
Removes Medical's random slowdown and faulty coding.
2013-02-27 22:07:30 -05:00
Gamerofthegame
f3ba4e4ec6
Opens the ERT debug-command preset for actual use.
2013-02-26 21:25:48 -05:00