PsiOmegaDelta
841f7f6db2
Compilation fixes.
2015-07-30 10:41:01 +02:00
PsiOmegaDelta
b6bd51828a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/robot/robot_upgrades.dm
code/modules/admin/admin_verbs.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Recipes.dm
code/modules/reagents/reagent_containers/syringes.dm
2015-07-30 10:38:44 +02:00
PsiOmegaDelta
6845ec0f69
Merge pull request #10376 from mwerezak/vox-mask
...
Fixes #10363
2015-07-30 09:47:12 +02:00
GinjaNinja32
0fdbde92ee
Merge pull request #10373 from mwerezak/heist-cleanup
...
Fixes #10368
2015-07-30 07:43:57 +01:00
mwerezak
10df6b9403
Fixes #10363
2015-07-30 00:57:31 -04:00
mwerezak
4af4e38571
Fixes #10368
2015-07-29 22:48:11 -04:00
Atlantis
3bb88b327c
Fixes #10353
...
- Fixes icons not updating properly
- Also fixes a runtime.
2015-07-29 23:16:27 +02:00
Atlantis
d143a35eca
Fixes #10357
...
- Adjusts layer defines.
- Screen Layer (UI) is now 22. That should mean i will be above all else. This also prevents laser fire from overlapping the UI.
- Obfuscation Layer (AI's "cameraless zones") is now 21. That makes it above laser fire effects, fixing #10357
2015-07-29 20:56:01 +02:00
Zuhayr
3c28c36cff
Merge pull request #10347 from GinjaNinja32/status
...
Change Topic() 'status' command to make more sense
2015-07-30 02:22:38 +09:30
Chinsky
b9d8cdaee1
Merge pull request #10337 from mwerezak/turret-aiming
...
Fixes #10258
2015-07-29 16:18:42 +03:00
Mloc
2b13741582
Merge pull request #10348 from GinjaNinja32/logs
...
Chemical logging improvements
2015-07-29 13:39:26 +01:00
Chinsky
e17b8be47e
Merge pull request #10344 from GinjaNinja32/cult-gender
...
His book? Her book.
2015-07-29 14:37:16 +03:00
GinjaNinja32
7a6599fdf4
Add logging to potassium-water and nitroglycerin reactions
2015-07-29 12:36:00 +01:00
PsiOmega
0e8ca3c82c
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/admin/player_notes.dm
2015-07-29 11:57:17 +02:00
GinjaNinja32
84c7625490
Chemical logging improvements
2015-07-29 07:55:30 +01:00
GinjaNinja32
2cf4f6e4db
Change Topic() 'status' command to make more sense
2015-07-29 06:39:03 +01:00
mwerezak
6df770cab3
Fixes projectiles being able to hit humans in organs they do not have.
...
Will also prevent body shields blocking bullets with non-existant limbs. Expands on the special return values for bullet_act(), adds defines for them.
2015-07-28 20:23:26 -04:00
mwerezak
d203362d38
Fixes #10258
...
Turrets now aim at the chest/groin unless the target has a neck grab on someone, otherwise they aim elsewhere.
Projectiles are now able to miss targets that are lying or buckled, except when the target is at point blank range and is the original target for the projectile.
2015-07-28 20:17:32 -04:00
GinjaNinja32
74f04671f8
His book? Her book.
2015-07-28 13:37:15 +01:00
Chinsky
0a54797044
Merge pull request #10341 from GinjaNinja32/notes-format
...
Changes show_player_info_irc to properly escape '%'
2015-07-28 14:02:08 +03:00
GinjaNinja32
09a8f37d6c
Changes show_player_info_irc to properly escape '%'
2015-07-28 10:59:51 +01:00
PsiOmegaDelta
c0d23536e2
Merge pull request #10338 from PsiOmegaDelta/dev-freeze
...
Master -> Dev-freeze
2015-07-28 08:55:01 +02:00
PsiOmegaDelta
0bf3c39095
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-07-28 07:59:49 +02:00
GinjaNinja32
40693fda5b
Merge pull request #10335 from PsiOmegaDelta/150727-SpawnLog
...
Adds admin message log to the spawn verb.
2015-07-27 10:54:40 +01:00
PsiOmegaDelta
81c40c14b1
Compacts down the game panel spawn logging and makes it always notify admins.
2015-07-27 11:47:55 +02:00
PsiOmegaDelta
631c30732d
Adds admin message log to the spawn verb.
...
The spawn-verb no longer only makes an entry in the admin log but also messages admins, making it less sneaky.
2015-07-27 11:24:44 +02:00
Mloc
65ad30f27c
Merge pull request #10305 from GinjaNinja32/player-panel
...
Changes player panel to always display key if present
2015-07-27 10:20:11 +01:00
Mloc
2046bd1cec
Merge pull request #10330 from mwerezak/fire
...
Fixes oversight in fire burnout check
2015-07-27 10:19:50 +01:00
Zuhayr
c5c7dddf63
Merge pull request #9979 from mwerezak/camera-console-fix
...
More check_eye() fixes
2015-07-27 17:56:03 +09:30
PsiOmegaDelta
0838de3ba2
Compilation fixes.
2015-07-27 10:03:31 +02:00
PsiOmegaDelta
c159f4657a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/inventory.dm
2015-07-27 09:53:08 +02:00
PsiOmegaDelta
c44f5916df
Merge pull request #10323 from mwerezak/accessory-fix
...
Fixes #9326
2015-07-27 09:36:02 +02:00
Zuhayr
e0429af2f7
Added config option for initial brain organ health.
2015-07-27 15:33:54 +09:30
Zuhayr
4afa8a80f8
Readds config option to disable organ decay.
2015-07-27 15:30:38 +09:30
mwerezak
e8db7dc8d8
Fire now uses the full zone size when considering the minimum amount of phoron/oxygen required to sustain a fire
...
Fixes an oversight that made fires able to burn with a smaller amount of phoron than they should.
2015-07-26 22:47:18 -04:00
Zuhayr
64ccd8a048
Merge pull request #10269 from Mloc/lightwrite
...
lighting work
2015-07-27 11:41:14 +09:30
Zuhayr
433b55f3df
Merge pull request #10303 from PsiOmegaDelta/150726-MintingRemoval
...
Removes minting.
2015-07-27 11:40:41 +09:30
Zuhayr
1e8a7d9552
Merge pull request #10301 from PsiOmegaDelta/150726-VotingSanity
...
Fixes #9894 some more.
2015-07-27 11:40:14 +09:30
mwerezak
7157cc1748
Fixes #9326
2015-07-26 14:57:49 -04:00
SparklySheep
a5ca80656d
Chops out "Security Cadet" from assistant Alt Titles.
...
Will remove the other "intern" alt titles if requested but this one in particular seemed to be pretty disliked in this thread: http://baystation12.net/forums/threads/discussion-suggestion-alt-titles.237/
2015-07-26 16:58:52 +01:00
GinjaNinja32
0e71efea18
Changes player planel to always display key if present
2015-07-26 11:03:36 +01:00
PsiOmega
07cf41604c
Removes minting.
...
Fixes #10274 .
2015-07-26 11:28:16 +02:00
PsiOmega
984d5ee337
More #10285 fixes.
...
This one is dev-freeze only. Adds another sanity check to trans_to_holder to avoid runtime issues.
2015-07-26 10:46:58 +02:00
PsiOmega
2d24960603
Fixes #9894 some more.
...
Ensures the vote sanity check is done first, before any change of vote counts.
2015-07-26 10:45:05 +02:00
PsiOmega
659b07415d
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/machinery/rechargestation.dm
code/game/mecha/equipment/tools/medical_tools.dm
maps/exodus-1.dmm
2015-07-26 10:00:12 +02:00
GinjaNinja32
167b1183ef
Fixes 'Fixes sealed rig removal exploit'
2015-07-26 05:47:04 +01:00
GinjaNinja32
a92dac6df4
Merge pull request #10290 from PsiOmegaDelta/150725-ColdCash
...
Fixes #10203 .
2015-07-26 05:22:49 +01:00
PsiOmega
3c1a3f6951
Fixes #10285 .
...
Adds Topic() input sanity checking.
2015-07-25 14:18:10 +02:00
PsiOmega
13ca02677c
Fixes #10203 .
...
setup_economy() was previously called twice, the removed call happened before character creation.
Moves the remaining line to ensure proper setup order.
2015-07-25 14:08:19 +02:00
PsiOmega
835d4ddcde
Fixes #10267 .
...
Laws are always pre-sanitized.
2015-07-25 13:30:25 +02:00
