GinjaNinja32
a286bd24b4
improve defines in table code
...
the defines were inverted, this uninverts them
also fixes #undef of old names for things
2015-08-28 00:12:18 +01:00
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
Chinsky
c1dc9d3f7e
Revert "Fixes #7884 , should fix #10859 "
2015-08-25 03:35:19 +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
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
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
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
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
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
Chinsky
13257b52c4
Merge pull request #10824 from mwerezak/stump-desc-fix
...
Fixes limb stump examine text
2015-08-24 00:31:05 +03:00
Ccomp5950
517b685950
Merge pull request #10822 from mwerezak/antag-fix
...
Antag Fixes
2015-08-23 16:24:42 -04:00
mwerezak
3c86715474
Fixes limb stump examine text
2015-08-23 15:35:45 -04:00
mwerezak
161e5c14cd
Fixes #10819
2015-08-23 14:34:58 -04:00
PsiOmega
579c5be239
Makes observers use forceMove.
...
This ensures things like OnEnter/Exit, light updates properly for all occasions when a ghost moves, not only for manual movement.
2015-08-23 17:45:46 +02:00
GinjaNinja32
663aae9786
Merge pull request #10816 from PsiOmegaDelta/150818-RealFunny
...
Rig AI fixes.
2015-08-23 13:33:24 +01:00
volas
d31203c70f
Sanitize for AI emergency message
2015-08-23 15:24:52 +03:00
PsiOmega
c7bd20ceb6
Rig AI fixes.
...
Changes how the state for the NanoUI window is selected.
Fixes and optimizes the hardsuit module tab for rig AIs.
Corrects some qdel issues for ejected rig AIs.
2015-08-23 13:33:10 +02:00
Zuhayr
89f498e3e8
Merge pull request #10811 from mwerezak/qdel
...
Fixes
2015-08-23 07:41:10 +09:30
Zuhayr
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
PsiOmegaDelta
2fbe9ddb8f
Merge pull request #10809 from Zuhayr/master
...
Species_restricted tweaks
2015-08-22 18:51:19 +02:00
GinjaNinja32
222049dd3c
Merge pull request #10791 from Zuhayr/speciestweaks
...
Species tweaks
2015-08-22 17:50:43 +01:00
Zuhayr
90e51b87e3
Refactoring hardsuit click checking.
2015-08-23 02:14:55 +09:30
Zuhayr
ca4b56cc77
Reapplying some species_restricted cleanup that was merged over. Allows Vox to wear softsuits.
2015-08-23 01:24:49 +09:30
mwerezak
13c760c5bb
Fixes #9453 and fixes #10614
2015-08-22 11:09:17 -04:00
GinjaNinja32
2341d2afa9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-22 15:44:02 +01:00
GinjaNinja32
4e56b82ec0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-22 15:28:49 +01:00
PsiOmega
f1323c35a9
Antags are now never eligible to be patient zero.
...
Includes on-station antags. Fixes #10798 .
2015-08-22 14:38:08 +02:00
PsiOmegaDelta
8f431c3832
Merge pull request #10801 from mwerezak/movement-cooldown
...
Adds missing TK move cooldowns, fixes #10800
2015-08-22 10:50:13 +02:00
mwerezak
a9f6d01647
Fixes #10800
...
Also does some minor refactoring and removes a duplicate check
2015-08-22 01:55:26 -04:00
Chinsky
bd9b6fd4c6
Merge pull request #10771 from DelZeta/MRGLGRGLGR
...
Fixes permahallucinations.
2015-08-22 05:33:34 +03:00
Zuhayr
8564db4643
I am a fucking moron.
2015-08-22 04:10:44 +09:30
Zuhayr
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
mwerezak
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
Zuhayr
8e0ff6c69f
Runtime fix (hopefully), less dangerous qdel loop for pods.
2015-08-22 03:53:03 +09:30
