fb6b94de87
Incorporates laser reflection into the shield system
2015-08-26 10:39:54 -04:00
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
b7c95f9c00
Merge pull request #10880 from Baystation12/dev-freeze
...
Dev freeze
2015-08-26 03:22:06 +09:30
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
d02108043c
Revert "IAA cartridge tweak"
2015-08-25 12:48:42 +02:00
9b3d21fe1c
Merge pull request #10868 from comma/detrevert
...
Fixes inconsistency in Detective job datum
2015-08-25 18:27:30 +09:30
2fdf859122
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-25 08:20:13 +02:00
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
9087466552
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap
2015-08-25 12:29:59 +09:30
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
bcca0d4aee
Merge pull request #10842 from mwerezak/showers
...
Fixes cryogenic showers
2015-08-25 07:38:19 +09:30
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
d74b8f9dc3
IAA cartridge tweak
...
Adds Employment Records to IAA cartridges.
2015-08-24 21:43:39 +02:00
da43277765
Merge pull request #10851 from PsiOmegaDelta/150824-CorrectCanUseTopicBaseCase
...
Corrects CanUseObjTopic base proc
2015-08-24 12:15:42 +01:00
358e50d856
Corrects CanUseObjTopic base proc.
...
Now returns 1 instead of 0.
2015-08-24 12:16:18 +02:00
3de6d1b19c
Merge pull request #10381 from Zuhayr/hardsuitcontrol
...
Rig AI movement and module control buffs.
2015-08-24 12:04:31 +02:00
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
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
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
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
4a64862c52
Merge pull request #10839 from mwerezak/antag-fix
...
Fixes #10742
2015-08-24 17:27:47 +09:30
8bc72a465c
Should fix AI-camera breaking when moved between cards.
2015-08-24 17:12:41 +09:30
0b163b89ae
Fixes #10815 .
...
Now uses audible message. Added a message for deaf mobs.
2015-08-24 09:16:35 +02:00
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
c8da3f0590
Fixes #10742
2015-08-23 22:28:29 -04:00
1a7b0e33a4
Merge pull request #10758 from FrickenChris101/patch-1
...
Flashlight Icon toggle fix
2015-08-24 00:40:26 +03:00
517b685950
Merge pull request #10822 from mwerezak/antag-fix
...
Antag Fixes
2015-08-23 16:24:42 -04:00
dfeb43c496
Reduces Detective slots.
...
One detective to compensate for Security Officer, requested by Virgil
after Officer PR.
2015-08-23 15:37:24 -04:00
c16d4aca9a
Removes unncessary shuffle
2015-08-23 14:49:30 -04:00
161e5c14cd
Fixes #10819
2015-08-23 14:34:58 -04:00
20eeb394cb
Fixes #10793
2015-08-23 14:34:37 -04:00
59c500d01b
Adds fourth security officer slot.
...
Discussed among admins, decision was made to make this change to master
and not dev. Approval from Virgil.
2015-08-23 13:20:41 -04:00
89f498e3e8
Merge pull request #10811 from mwerezak/qdel
...
Fixes
2015-08-23 07:41:10 +09:30
4afaf9f5fd
Cable layer cleanup, cable qdel
2015-08-22 14:35:53 -04:00
d62ff87ec9
Fixes #10689
...
Also some refactoring of locker stuffing.
2015-08-22 14:32:15 -04:00
e693fae718
Fixes door repair qdel
2015-08-22 14:09:25 -04:00
9cbacd6653
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol
...
Conflicts:
code/_onclick/click.dm
2015-08-23 02:24:34 +09:30
90e51b87e3
Refactoring hardsuit click checking.
2015-08-23 02:14:55 +09:30
13c760c5bb
Fixes #9453 and fixes #10614
2015-08-22 11:09:17 -04:00
2341d2afa9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-22 15:44:02 +01:00
4e56b82ec0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-22 15:28:49 +01:00
cfa8ab3fd0
Removes bear traps from the custodial closet, adds autolathe recipe
2015-08-22 02:31:19 -04:00
b702c81060
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap
...
Conflicts:
code/game/turfs/simulated/floor_types.dm
2015-08-22 03:57:12 +09:30
4396e5a5bc
Merge pull request #9891 from Zuhayr/dev
...
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-21 14:23:57 -04:00
8e0ff6c69f
Runtime fix (hopefully), less dangerous qdel loop for pods.
2015-08-22 03:53:03 +09:30
56131e1053
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate
...
Conflicts:
code/modules/clothing/clothing.dm
2015-08-22 03:17:16 +09:30
3c477dfa5e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/jobs/access.dm
code/modules/mob/living/carbon/brain/brain_item.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 03:11:53 +09:30
bb82f80885
Added get_bodytype() species proc as groundwork for subspecies.
...
Conflicts:
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 02:53:16 +09:30
8701205783
Pariah nerfs.
...
Conflicts:
code/modules/mob/living/carbon/human/species/outsider/vox.dm
code/modules/organs/organ_alien.dm
2015-08-22 02:51:42 +09:30
a00ac82221
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol
...
Conflicts:
code/_onclick/rig.dm
2015-08-22 02:36:05 +09:30
mwerezak