mwerezak
0a751322e3
Rewrites shield handling
...
Rewrites shield handling to be less hardcoded.
Shields now take into account the damage source and direction when blocking.
Riot shields no longer block most bullets, but are better at blocking melee and thrown items than they were previously.
Energy shields block projectiles with a similar probability as they did before, and block melee and thrown as well as riot shields do.
Shields no longer block from directly behind the player.
Weapons now only block melee attacks.
Cool effects when blocking with an energy shield or energy sword (including holoswords).
2015-08-26 10:39:31 -04:00
Zuhayr
3cf542e5f1
Merge pull request #10869 from Techhead0/dev
...
RIG boots may now be worn over shoes.
2015-08-26 07:32:33 +09:30
Techhead0
6fa45cfaa9
Adds if(check_slot) check.
2015-08-25 16:39:54 -04:00
Zuhayr
b7c95f9c00
Merge pull request #10880 from Baystation12/dev-freeze
...
Dev freeze
2015-08-26 03:22:06 +09:30
Zuhayr
f4d27e8b1c
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/admin/verbs/adminsay.dm
2015-08-26 03:09:11 +09:30
Techhead0
14d940eac6
Changes .loc= to .forcemove in magboots.dm, rig.dm, and void.dm.
2015-08-25 09:58:44 -04:00
Ccomp5950
2a38a18c4c
Merge pull request #10831 from mwerezak/msay
...
Changes MSAY to show the ckey/character name like it does with asay
2015-08-25 09:48:20 -04:00
PsiOmegaDelta
d02108043c
Revert "IAA cartridge tweak"
2015-08-25 12:48:42 +02:00
Zuhayr
9b3d21fe1c
Merge pull request #10868 from comma/detrevert
...
Fixes inconsistency in Detective job datum
2015-08-25 18:27:30 +09:30
PsiOmegaDelta
2fdf859122
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-25 08:20:13 +02:00
PsiOmegaDelta
713a7bd654
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/devices/flashlight.dm
2015-08-25 08:12:39 +02:00
Zuhayr
f4c9bc4be6
Amending some loc setting lines.
2015-08-25 12:40:09 +09:30
Zuhayr
9087466552
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap
2015-08-25 12:29:59 +09:30
Techhead0
ccaecf4a4e
RIG boots may now be worn over shoes.
...
Changes rig/proc/toggle_peice() to allow RIG-based magboots to be worn over shoes.
2015-08-24 20:56:11 -04:00
Chinsky
c1dc9d3f7e
Revert "Fixes #7884 , should fix #10859 "
2015-08-25 03:35:19 +03:00
Chinsky
3ccbe22152
Fixes inconsistency in Detective job datum
...
There was only 1 slot, but you could spawn 2 during roundstart.
2015-08-25 03:27:54 +03:00
Zuhayr
bcca0d4aee
Merge pull request #10842 from mwerezak/showers
...
Fixes cryogenic showers
2015-08-25 07:38:19 +09:30
Chinsky
5dbd5252d6
Merge pull request #10862 from GinjaNinja32/nanoui
...
Fixes #7884 , should fix #10859
2015-08-25 00:40:01 +03:00
GinjaNinja32
a2c121ed50
Fixes #7884 , should fix #10859
2015-08-24 21:59:12 +01:00
HarpyEagle
e03585898d
Cleans up flashlight fix
...
Moves icon state changes into update_icon(), less duplicated code. Also
makes glowing slime extracts less dumb.
2015-08-24 16:31:31 -04:00
mwerezak
9e65e63b97
Merge pull request #10858 from GinjaNinja32/more-equal
...
fix equalize() not equalizing gases
2015-08-24 15:54:44 -04:00
Sligneris
d74b8f9dc3
IAA cartridge tweak
...
Adds Employment Records to IAA cartridges.
2015-08-24 21:43:39 +02:00
GinjaNinja32
9a5da57d60
fix heatcap calculation in equalize()
2015-08-24 19:33:37 +01:00
GinjaNinja32
8521df47f3
fix equalize() not equalizing gases
2015-08-24 19:24:55 +01:00
PsiOmega
f28fa29d54
Having organs should no longer prevent vent crawling.
2015-08-24 17:27:22 +02:00
PsiOmega
1a11aa7f5c
Shuffles de-equipping logic.
2015-08-24 14:24:31 +02:00
GinjaNinja32
da43277765
Merge pull request #10851 from PsiOmegaDelta/150824-CorrectCanUseTopicBaseCase
...
Corrects CanUseObjTopic base proc
2015-08-24 12:15:42 +01:00
PsiOmegaDelta
358e50d856
Corrects CanUseObjTopic base proc.
...
Now returns 1 instead of 0.
2015-08-24 12:16:18 +02:00
PsiOmegaDelta
3de6d1b19c
Merge pull request #10381 from Zuhayr/hardsuitcontrol
...
Rig AI movement and module control buffs.
2015-08-24 12:04:31 +02:00
Zuhayr
77e0a72911
Adding tag to droppod mobs prior to being moved into the target area.
2015-08-24 19:13:43 +09:30
Zuhayr
c5972cb421
Removing an istype() check.
2015-08-24 19:03:57 +09:30
Zuhayr
3415f88cc2
Reverting a nonfunctional H to usr change.
2015-08-24 19:02:34 +09:30
Zuhayr
c6964a9b0e
Fixes for previous commits.
2015-08-24 18:31:52 +09:30
PsiOmegaDelta
e29f4eb3c1
Compilation and map merge fixes.
2015-08-24 10:45:08 +02:00
PsiOmegaDelta
9057655da6
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/clothing.dm
code/modules/clothing/spacesuits/spacesuits.dm
code/modules/clothing/spacesuits/void/merc.dm
code/modules/clothing/spacesuits/void/void.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-08-24 10:31:30 +02:00
PsiOmegaDelta
c376c08cc0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/girders.dm
code/modules/mob/living/carbon/human/human_damage.dm
2015-08-24 10:23:12 +02:00
Zuhayr
23564bda0c
Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess
...
Synths now relies on access permissions as well.
2015-08-24 17:45:10 +09:30
Zuhayr
863d75076d
Merge pull request #10759 from mwerezak/girders
...
Fixes reinforcing girders through windows, adds an SS13-like interface for reinforcing
2015-08-24 17:28:08 +09:30
Zuhayr
4a64862c52
Merge pull request #10839 from mwerezak/antag-fix
...
Fixes #10742
2015-08-24 17:27:47 +09:30
Zuhayr
8bc72a465c
Should fix AI-camera breaking when moved between cards.
2015-08-24 17:12:41 +09:30
PsiOmegaDelta
0b163b89ae
Fixes #10815 .
...
Now uses audible message. Added a message for deaf mobs.
2015-08-24 09:16:35 +02:00
Zuhayr
4429f027e7
Replacing hardcoded key/name checks in rig admin alert with key_name_admin().
2015-08-24 16:44:17 +09:30
Zuhayr
e8bf2e4b8f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol
2015-08-24 16:41:39 +09:30
Zuhayr
ddcf7ec282
Merge pull request #10837 from mwerezak/brainloss-fix
...
Fixes adjustBrainLoss
2015-08-24 15:24:12 +09:30
mwerezak
286e16a0f3
Fixes cryogenic showers
...
Changes shower temperature settings to use more reasonable temperature values. A menu is now shown when adjusting shower temperature.
2015-08-24 00:11:40 -04:00
mwerezak
75f19938b3
Fixes an apparent clonexadone typo
2015-08-24 00:04:03 -04:00
Kearel
e8b779a34a
language bug fix
2015-08-23 22:37:32 -05:00
mwerezak
c8da3f0590
Fixes #10742
2015-08-23 22:28:29 -04:00
mwerezak
09f1c6054b
Changed MSAY to show the ckey/character name like it does with asay
2015-08-23 20:27:56 -04:00
mwerezak
5bcede5801
Fixes adjustBrainLoss
...
adjustBrainLoss() was giving damage to the brain organ and then setting it back to brainloss, undoing the change.
2015-08-23 20:22:15 -04:00
