Commit Graph

4395 Commits

Author SHA1 Message Date
Cheridan
6bd80b5b85 Merge pull request #2756 from hornygranny/bearpelt
Fixes #2728, removes fedora tip
2014-02-13 11:53:08 -06:00
Cheridan
fbcacb4fa4 Merge pull request #2755 from hornygranny/syndieborg
Fixes #2723
2014-02-13 11:39:19 -06:00
Razharas
838f0db091 Merge pull request #2697 from Alek2ander/master
HREF exploit fixes and other research stuff
2014-02-13 03:45:22 -08:00
fleure
f5b9c53e45 Merge pull request #2744 from Cheridan/hydro
Fixes hydroponics setter procs
2014-02-13 11:44:25 +00:00
Razharas
ad0071c8a5 Merge pull request #2625 from Tenebrosity/box2550Away-update
Readds slime and AI corpse to box away
2014-02-13 03:43:23 -08:00
fleure
db0009d334 Merge pull request #2693 from Giacom/spooky_scary_statues
Just some general polishing for the statue mobs.
2014-02-13 11:36:21 +00:00
fleure
5c5bc9a0ec Merge pull request #2695 from Incoming5643/avastyeblobies
Blob zombie quickfix and the most minor bugfix ever
2014-02-13 11:33:34 +00:00
Cheridan
28a11b4db2 Merge pull request #2736 from Ergovisavi/who_smashes_the_smashers
Removed environment_smash for a few hostile mobs that don't need it.
2014-02-13 02:00:29 -06:00
MrPerson
e602febd40 Merge pull request #2713 from Tenebrosity/the-lit-the-lit-the-lit-the-lit-the-lit
Fixes misc grammar issues
2014-02-12 15:17:17 -08:00
Razharas
2edc78a4fb Merge pull request #2676 from Tenebrosity/nospacefallspls
Removes falling over in space, fixes #2680
2014-02-12 13:16:59 -08:00
hornygranny
9baa64e006 Fixes #2728
Removes robust fedora tipping functionality
2014-02-12 11:12:32 -08:00
hornygranny
fc25325c24 Fixes #2723 2014-02-12 11:06:00 -08:00
Cheridan
6b26c4f656 OOPS 2014-02-11 13:14:04 -06:00
fleure
c2f5e92c0a Merge pull request #2687 from optimumtact/autolathe_add_syringe
Add's syringes to the autolathe, 20 glass, 10 metal cost
2014-02-11 18:01:04 +00:00
fleure
0963e180c0 Merge pull request #2656 from Razharas/AnomalyRuntime
Anomaly runtime
2014-02-11 16:51:41 +00:00
Ergovisavi
f900a3b148 Removes environment_smash for a few hostile mobs that don't really need it. Pete started breaking tables instead of just windows after the simple mob overhaul and too much fun was occurring. 2014-02-11 00:37:30 -08:00
Razharas
398b6f48da Turbine fix
Never change byond, never change
2014-02-10 20:21:03 +04:00
Tenebrosity
f70c8d29d9 Fixes misc grammar issues 2014-02-10 19:46:33 +13:00
Cheridan
7b35165549 Merge pull request #2682 from Razharas/BiogenFix
Biogenerator little fix
2014-02-09 22:13:36 -06:00
Alek2ander
a59a058660 Who decided to have it like that? 2014-02-09 17:47:59 +04:00
Alek2ander
0dc569284d Research machines sorta cleanup
HREF exploits fixed for research machines and vending machines
2014-02-09 16:55:20 +04:00
Incoming
f2edc90375 Makes my solution to "the blob needs to be over the corpse to make the zombie!" a bit more basic and less prone to fuck ups. It was bugging out.
Also fixes a tiny oversight that left a hole in the nurses outfit ever since female outfit generation was put in.

The fact that no studdering erp nurses complained should tell you about their near mythical nature.
2014-02-09 02:38:09 -05:00
Giacomand
679a80c436 Just some general polishing for the statue mobs.
Statue mobs can't change their direction while seen.
Lowered the range for flickering lights.
Lowered the cooldown for blinding people, added user feedback when the spell is used.
The blindness spell will affect people within objects.
2014-02-09 06:11:51 +00:00
Tenebrosity
e1a0f96846 Merge branch 'master' of https://github.com/tgstation/-tg-station into bananfix
Conflicts:
	code/game/objects/items/weapons/clown_items.dm
2014-02-09 16:39:50 +13:00
Francis
f185bd39bb Add's syringes to the autolathe, 20 glass, 10 metal 2014-02-09 13:56:45 +13:00
Razharas
17994e728e Merge pull request #2666 from Giacom/spooky_scary_statues
Adds a new statue hostile mob!
2014-02-08 11:16:23 -08:00
Razharas
c1f8701bd2 Merge pull request #2655 from MrPerson/NanoSMES
Nano UI for SMES
2014-02-08 10:59:27 -08:00
MrPerson
c269999796 Way to leave those debug messages in, self 2014-02-08 10:53:55 -08:00
MrPerson
6488b34533 Merge branch 'master' of https://github.com/tgstation/-tg-station into NanoSMES
Thanks Razharas, hehe
Merge new SMES vars and Nanou in with constructable SMES and whatnot
2014-02-08 07:51:28 -08:00
Razharas
98fe9974e0 Biogenerator little fix
Tiny little fix
2014-02-08 17:39:06 +04:00
Razharas
7893b99e37 Merge pull request #2661 from Ergovisavi/mob_env_smash_fix
Fixed hostile mobs hitting grilles and the like through windows (again)
2014-02-08 04:37:26 -08:00
Razharas
001943460c Merge pull request #2653 from Incoming5643/syndiborgchance
Adds a chance of syndiborg to the staff of change
2014-02-08 04:15:46 -08:00
Razharas
4ea05add26 Merge pull request #2649 from YotaXP/lighting-squared
Reduced the potency of carrying multiple light sources.
2014-02-08 04:13:57 -08:00
Razharas
0d1da7615c Merge pull request #2646 from Incoming5643/minorminer
Gives mining borgs an analyzer so they can defuse gibtonite properly
2014-02-08 04:07:33 -08:00
Razharas
b19084569d Merge pull request #2624 from adrix89/Fixes
Fixes
2014-02-08 04:03:50 -08:00
Ergovisavi
93af6f629c Fixed hostile mobs hitting objects through windows and the like (again)
Removed mouse_opacity = 2 from default hostile mobs
2014-02-07 20:56:11 -08:00
Tenebrosity
a3e8c6a9b6 Removes slipping in space
Added a standing check before damage is applied by lube. Aliens and
hulks won't take damage for sliding on lube.
2014-02-08 16:38:21 +13:00
Tenebrosity
f495c1caac Removes falling in space
You can still be stunned, slip (unfortunately), be pushed or die, your
icon just remains upright to simulate zero gravity. Upon being dragged
into the station, your body thumps to the ground inside the airlock.
It's pretty neat.
2014-02-08 13:58:22 +13:00
Giacomand
3a8f8113fc The statue will call dust() when gibbed.
Increased the range of blind() so mobs just outside his can_be_seen() check won't stop it from blinding them.
Added a client check for AI stuff.
2014-02-07 23:26:17 +00:00
Razharas
863e6aa947 Merge pull request #2617 from Tenebrosity/thudfix
Fixes #2603: Bodyfall thuds in cryo and cloning
2014-02-07 12:35:44 -08:00
Razharas
0aed48193c Merge pull request #2626 from adrix89/slip_rework2
Slip rework the second encounter
2014-02-07 12:24:08 -08:00
Giacomand
d6dad8cbf2 Changed their name and description so they almost match with the ordinary statues. 2014-02-07 20:07:48 +00:00
Giacomand
b5ece48138 Fixed statues trying to attack mice behind walls.
Buffed their speed and damage.
Reduced their vision range a bit.
Statues will now attack nearby mobs when after a target.
2014-02-07 17:44:36 +00:00
fleure
26d4625ee7 Merge pull request #2488 from Razharas/OkLetsTryThis
Machines overhaul 2: MERGE LIKE SANIC
2014-02-07 13:06:48 +00:00
Razharas
2a5e2ae021 SMES board fix
Blind copypaste is bad
2014-02-07 16:39:06 +04:00
Razharas
df61e734ab Quick fix to designs and boards
Abloobloo
2014-02-07 12:25:29 +04:00
Razharas
2666ba1e8b Fixes incorrect cables conflict issue
They work again
2014-02-07 07:07:31 +04:00
Giacomand
fc398b3545 Merge branch 'master' of https://github.com/tgstation/-tg-station into spooky_scary_statues 2014-02-06 21:38:55 +00:00
Giacomand
42ecb2471f Adds a new statue hostile mob!
This hostile mob is very much like other monsters that move/kill you when you don't look at them.
This mob is also designed to be player controlled and has spells to get around the 360 vision problem, such as flickering lights and causing people around it to go blind for a short duration.

CANPUSH is now used by simple_animals
Added 4 directional sprites for the statue.
2014-02-06 20:28:15 +00:00
fleure
bc733a83a4 Merge pull request #2650 from Giacom/master
MiniStation Update
2014-02-06 20:14:25 +00:00