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
PsiOmegaDelta
0b163b89ae
Fixes #10815 .
...
Now uses audible message. Added a message for deaf mobs.
2015-08-24 09:16:35 +02:00
Zuhayr
ddcf7ec282
Merge pull request #10837 from mwerezak/brainloss-fix
...
Fixes adjustBrainLoss
2015-08-24 15:24:12 +09:30
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
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
1a7b0e33a4
Merge pull request #10758 from FrickenChris101/patch-1
...
Flashlight Icon toggle fix
2015-08-24 00:40:26 +03: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
Raptor1628
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
mwerezak
3c86715474
Fixes limb stump examine text
2015-08-23 15:35:45 -04:00
mwerezak
c16d4aca9a
Removes unncessary shuffle
2015-08-23 14:49:30 -04:00
mwerezak
161e5c14cd
Fixes #10819
2015-08-23 14:34:58 -04:00
mwerezak
20eeb394cb
Fixes #10793
2015-08-23 14:34:37 -04:00
Raptor1628
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
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
mwerezak
4afaf9f5fd
Cable layer cleanup, cable qdel
2015-08-22 14:35:53 -04:00
mwerezak
d62ff87ec9
Fixes #10689
...
Also some refactoring of locker stuffing.
2015-08-22 14:32:15 -04:00
mwerezak
e693fae718
Fixes door repair qdel
2015-08-22 14:09:25 -04:00
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
GinjaNinja32
0edc18b9c7
Merge pull request #10778 from atlantiscze/stabilisedoutputv2
...
Corrects supermatter fluctuations v2
2015-08-22 17:46:19 +01:00
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
mwerezak
70241d576f
Merge pull request #10803 from GinjaNinja32/manifest
...
add manifest status command
2015-08-22 09:47:57 -04: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
GinjaNinja32
aff57029e2
add manifest status command
2015-08-22 11:33:25 +01: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
cfa8ab3fd0
Removes bear traps from the custodial closet, adds autolathe recipe
2015-08-22 02:31:19 -04:00
mwerezak
a9f6d01647
Fixes #10800
...
Also does some minor refactoring and removes a duplicate check
2015-08-22 01:55:26 -04:00
mwerezak
d44e8cc0ab
Adds missing TK move cooldowns, adjusts click move cooldowns
2015-08-21 23:21:54 -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
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
1d13b989df
Gluttonous var changes.
2015-08-22 03:33:18 +09:30
Zuhayr
23fa130d6a
Species attack damage nerfs.
2015-08-22 03:33:18 +09:30
Zuhayr
6841776992
Taj/Unathi slowdown and burn/brute malus tweaks.
2015-08-22 03:33:18 +09:30
Zuhayr
69dfd23d1b
Compile fix.
2015-08-22 03:26:41 +09:30
Zuhayr
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
