Zuhayr
00fc8c53ba
Merge pull request #5898 from Walter0o/patch-1
...
fixes #5876
2014-08-05 13:22:26 +09:30
Zuhayr
33ef081191
Merge pull request #5895 from mwerezak/fixes
...
Fixes
2014-08-05 08:23:38 +09:30
Walter0o
dcc3393b25
fixes #5876
...
stun beams killed simple animals
2014-08-04 23:41:23 +02:00
mwerezak
6a7c9e46e6
Fixes #5881
2014-08-04 13:04:34 -04:00
Loganbacca
b8f31c0b0a
Train fixes and balancing
...
- Slows trains to 90% of running speed
- Changes train impact damage to only take into account speed, not train length (otherwise you could insta kill people with a long enough train)
- Fixes a bug with towed cars ghosting through closed airlocks
- Stuns mobs who fall off a train that has blown up
- Fixes mobs standing/lying on vehicles
- Fixes exploding trains not decoupling correctly
2014-08-03 20:45:41 +12:00
Zuhayr
eae182725a
Merge pull request #5865 from mwerezak/shock-fix
...
Fixes siemens_coefficent not affecting shock damage
2014-08-03 13:04:52 +09:30
Zuhayr
ab54e7e2d6
Merge pull request #5878 from Walter0o/aliums
...
fixes alien castes not understanding each other
2014-08-03 12:56:47 +09:30
Walter0o
5895a098fe
fixes alien castes not understanding each other
...
only /mob/living/carbon/alien have this var set, so this will not touch anything else.
2014-08-01 22:34:28 +02:00
Mloc
6133083ca6
Merge pull request #5858 from Zuhayr/master
...
Fixes
2014-08-01 15:02:23 +01:00
Zuhayr
21b02f3019
Merge pull request #5846 from Walter0o/href_fun
...
exploit-fix-o-rama
2014-08-01 21:59:00 +09:30
mwerezak
b529d582e5
Fixes siemens_coefficent not affecting shock damage
...
Also cleans up electrocute_act()
2014-07-31 15:20:45 -04:00
Zuhayr
1cecd96e66
Fixes #5630
2014-07-31 19:46:21 +09:30
Zuhayr
e7f31e1655
Fixes #5737
2014-07-31 19:40:09 +09:30
Walter0o
eeb02dcfde
derp
2014-07-31 10:43:51 +02:00
Walter0o
ca78cb238a
cyborg topic exploit fixes
...
all kinds of fun here
2014-07-31 10:20:24 +02:00
Atlantiscze
da6190aa25
Fixes #5827
...
- Drones can now use .d to access Drone chat
- Cleaner and nicer check for dronechat, uses proper data from say.dm shortcut list.
- MISSING: .d alternative for "Russian localization" (Does anyone actually use that?)
2014-07-30 12:15:15 +02:00
Chinsky
1150331bc4
Merge pull request #5828 from mwerezak/wound-infections
...
Fixes chest not being coloured by necrosis
2014-07-29 18:13:02 +04:00
mwerezak
9680cd85b7
Fixes chest not being coloured by necrosis
2014-07-28 20:51:04 -04:00
Chinsky
c34cf89a04
Merge pull request #5784 from Jarcolr/patch-3
...
Fixes #5691
2014-07-26 17:18:38 +04:00
Jarcolr
9e233f1597
Fixes #5691
...
Chef >> Chefhat
2014-07-26 13:41:43 +03:00
Jarcolr
17f86962ac
Fixes #5773
...
Added /obj/item/weapon/FixOVein to surgery cyborg modules.
2014-07-26 12:50:41 +03:00
DJSnapshot
de282a4e2a
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/client/preferences.dm
2014-07-25 17:19:59 -07:00
Zuhayr
57b790ad92
Merging.
2014-07-25 22:50:35 +09:30
DJSnapshot
2c7bb6c48d
Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request.
2014-07-24 17:01:52 -07:00
Zuhayr
61d38a3e86
Merge pull request #5740 from Ccomp5950/taser_slow_down
...
Tasers will now cause movement slow downs on the first hit
2014-07-23 17:46:55 +09:30
Ccomp5950
fe9785d630
Tasers will now cause movement slow downs on the first hit
...
Before: Tasers do 40 halloss damage and that drops to 39 on next life() tick so most people won't be slowed down by the first taser hit.
After: If you have any halloss you will slow down some. I've set it at 1 delay for every 10 halloss, this might need adjusting (15 instead of 10 possibly)
2014-07-23 02:55:37 -05:00
Ccomp5950
98abc5bfc4
Compromise on speach_sound, will check distance instead of just checking if ghost.
2014-07-23 01:48:48 -05:00
Ccomp5950
477d32ff64
Ghosts will no longer hear clientless mobs random talking unless they are in view.
...
Experiment 97B says, 'EHEHEHEHEHEHEHE!'
2014-07-22 19:33:56 -05:00
Ccomp5950
75803c5140
Positronic brains (and every other mob) using binary chat will no longer send their messages twice.
...
Fixes : #5444
2014-07-22 19:32:52 -05:00
Ccomp5950
e01e081cbb
screen_shake (meteors, etc.) made more robust and works with aiEyes
...
Before: multiple screen_shake's could queue up prior to screenshake being set on the mob setting
oldeye on the last one to queue up to be the random location from the previous screen shake
so sometimes peoples clients were stuck on a location instead of back on the mob.
Now we set screenshake before the spawn so we don't spawn up multiple screen_shakes on the same mob.
Test: Be ghost, hammer the spawn meteors secret 10 times or so, watch as your camera returns back to your mob.
Yay.
2014-07-22 19:05:04 -05:00
Mloc
a9bd931345
Merge pull request #5734 from Walter0o/borer_hotfix
...
borer mindcontrol release hotfix
2014-07-22 18:50:59 +01:00
Zuhayr
5feb5b8a93
Merge pull request #5726 from Ccomp5950/fix_antagHUD_mutiny
...
Mutineers and Loyalist will now show up properly in antagHUD.
2014-07-23 00:27:08 +09:30
Walter0o
a274cd7326
borer mindcontrol release hotfix
...
forgot to remove this remnant ckey check
2014-07-22 16:49:09 +02:00
Chinsky
3668cc5b1d
Merge pull request #5718 from Walter0o/double_sleep
...
fixes issue #5717
2014-07-22 10:56:45 +04:00
Ccomp5950
e942ca258f
Mutineers and Loyalist will now show up properly in antagHUD.
2014-07-21 15:36:08 -05:00
Zuhayr
811fc5f65f
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-21 16:30:01 +09:30
Zuhayr
ff38aca774
Merge resolution.
2014-07-21 16:17:15 +09:30
Ccomp5950
df54dea5a8
Merge pull request #5716 from Walter0o/spider_thieves
...
fixes #5712
2014-07-21 01:42:36 -05:00
Zuhayr
2fd0f24c0d
Merge pull request #5708 from Walter0o/pai_lang_fix
...
adds proper pAI language based translator
2014-07-21 16:00:58 +09:30
Walter0o
48f967bc02
removes second sleeping notification
2014-07-21 07:39:46 +02:00
Walter0o
3777bca3eb
fixes #5712
2014-07-21 01:57:49 +02:00
Zuhayr
14b3c87aef
Merge pull request #5701 from Walter0o/shameful_dispray
...
fixes simple_animals using FEA instead of ZAS
2014-07-20 23:51:12 +09:30
Walter0o
a8e30ed1fa
makes Siik'tajr understandable but not speakable for pAIs
2014-07-20 09:33:06 +02:00
Walter0o
855fcbae6d
forgot removal of this marker
2014-07-20 09:24:59 +02:00
Walter0o
7dff5f117e
adds proper pAI language based translator,
...
reverts UNTRANSLATABLE
2014-07-20 09:05:44 +02:00
Walter0o
9be8f496ae
borer detatch fixes
2014-07-20 04:42:14 +02:00
Walter0o
70b1d8dc65
borer detatch fixes
2014-07-20 04:40:58 +02:00
Walter0o
4c6017cfaa
fixes borer infest and detatch
2014-07-20 04:37:42 +02:00
Walter0o
fced496980
fixes simple_animals using FEA instead of ZAS
...
i can't believe after all this time animals still use FEA instead of ZAS.
this should fix the "random" animal deaths.
2014-07-20 04:21:48 +02:00
Mloc-Hibernia
281a26b979
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2014-07-18 13:08:12 +00:00
