28db4587f2
Fixes #11354
2015-10-26 14:50:52 -04:00
d94ece66f1
Fixes : #11354
2015-10-25 21:52:11 -07:00
2f4d1dd7b1
Adds IPC specific halloss stun messages
2015-10-25 23:39:06 -04:00
5acf5f1b7b
Merge pull request #11177 from PsiOmegaDelta/150923-FlexibleSetup
...
Character setup refactor.
2015-10-26 05:44:13 +03:00
35ce07aa71
Merge pull request #11296 from mwerezak/pepperspray-fix
...
Pepperspray and chem smoke fixes
2015-10-26 05:42:59 +03:00
00e0014a3f
fixes #9962
2015-10-25 17:52:49 -07:00
e5ca86c168
fixes random name EAL naming thing... again.
2015-10-25 17:40:34 -07:00
e37394e8fa
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/human_helpers.dm
code/modules/reagents/reagent_containers/food/snacks.dm
2015-10-25 20:28:48 +01:00
a3027febee
Merge pull request #11373 from Baystation12/master
...
Dev-freeze.
2015-10-25 20:00:44 +01:00
7d4f51be8e
Merge pull request #10287 from mwerezak/attack-cleanup2
...
Refactors item attack click and mob melee attack handling code
2015-10-25 08:43:47 +01:00
28637334d4
Merge pull request #11329 from PsiOmegaDelta/151018-FlashRestoration
...
Relocates synth flash recharge code.
2015-10-24 18:59:02 +03:00
d845a2f587
Generalizes the feed and force feed checks.
2015-10-23 10:57:55 +02:00
8305404a14
Can no longer use utensils to eat if you lack the means.
...
Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly.
Fixes #11333 .
2015-10-22 16:52:07 +02:00
0b9b8feb1e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
2015-10-21 10:38:57 +02:00
db833735a8
Merge pull request #11340 from Baystation12/master
...
Dev-freeze.
2015-10-21 10:36:30 +02:00
18ae968bda
Merge pull request #11337 from PsiOmegaDelta/151020-Mmm_hydrogen
...
Fixes #11334 .
2015-10-21 01:56:16 +03:00
e5cda9ad60
Merge pull request #11332 from PsiOmegaDelta/151019-BloodUponBlood
...
Limits the number of runes to one per turf.
2015-10-21 01:56:08 +03:00
4c96cd62a7
Condiments now check for proximity before continuing with the rest of afterattack. Fixes #11334 .
2015-10-20 17:11:55 +02:00
55f6c1c0b5
Merge pull request #11204 from Hubblenaut/medical
...
Bruise Packs, Changes and small Fixes
2015-10-19 16:17:16 +02:00
b92be265ee
Limits the number of runes to one per turf.
...
Fixes #11248 .
2015-10-19 12:49:32 +02:00
a60103982b
Merge pull request #11311 from Ccomp5950/stop_stop_hes_already_dead
...
Dead people feel no pain.
2015-10-19 07:08:25 +02:00
64176f1c4e
Relocates synth flash recharge code.
...
Moves the flash recharge from security modules to all of them. Fixes #11322 .
2015-10-18 17:55:56 +02:00
e116721977
Character setup refactoring.
...
Begins breaking down the large character setup in more manageable modules, allowing for easier additions, edits, and removals.
2015-10-18 17:34:35 +02:00
9aea0cecc7
Dead people feel no pain.
...
Resolves #10797
2015-10-18 01:27:24 -04:00
ffc50c3cfa
Fixes #11321
2015-10-17 20:53:03 -04:00
105792686a
resprites xenoarch items (guns, eguns and other small stuff) and some large artifacts by skowron, reworks preset triggers to be a little more predictable for specific large artifact groups
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2015-10-17 02:02:55 +10:00
cbd0972bfa
Bruise packs are used per wound and take time to apply
2015-10-16 16:36:04 +02:00
cbcddcad53
Adjustment according to PsiOmegaDelta's suggestion
2015-10-16 14:44:01 +02:00
c3e1611178
Fixes #11149
...
- Corrects APC behavior when hacked by malfunctioning AI.
- It should now be possible to hack the APC to unlock it even when it is hacked by the AI. Normal IDs still don't work on hacked APCs.
- A little side-fix, removal of malfunctioning AI's hack of an APC should now work correctly.
2015-10-16 14:38:20 +02:00
a70ec21e64
Fixes #11276
...
- Re-adjusts two values to take new lighting in account.
- For reference. Turf which has light fixture (large) on it, has light value of 6. An average half-lit turf has around 1.5. These values were obtained via in-game tests.
- Using old values, diona would die (without another light source such as flashlight) when standing on any other turf other than turf with light fixture.
- Now it should be relatively similar to the old values before lighting changes.
2015-10-16 14:17:47 +02:00
299ad9580c
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/admin/admin.dm
code/modules/admin/topic.dm
2015-10-16 13:02:59 +02:00
fc4c1d6af7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/items/weapons/storage/storage.dm
2015-10-16 11:04:43 +02:00
111973ed5c
AI's can now use languages through holopads...
...
...and have it respect if the listener understands.
Resolves #11113 (AI's speech not timestamped through holopad)
Resolves #11183 (All languages can be understood when AI speaks them through a holopad.)
Resolves #6217 (pAIs cannot hear AI hologram speech)
2015-10-15 19:56:45 -04:00
0c474bc5a5
Merge pull request #11281 from mwerezak/autoantag
...
Cleans up antag auto-spawning, adds checks for active antags
2015-10-15 19:16:13 +03:00
2a88b4d0aa
Merge pull request #11219 from PsiOmegaDelta/150929-HumanoidVision
...
Overhauls humanoid vision handling.
2015-10-15 19:15:28 +03:00
d75a146cc3
Merge pull request #11306 from mwerezak/sunglasses-loadout
...
Fixes #11216
2015-10-15 07:47:21 -07:00
07881e7495
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2
...
Conflicts:
code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
2015-10-15 07:08:16 -04:00
e24313be2e
Fix macro
2015-10-15 07:02:57 -04:00
7272deb5ae
Fixes #11216
...
Sunglass-derived custom gear is now only available to roles that normally have access to them.
2015-10-15 06:58:25 -04:00
27fe99bdf0
Reagent transfer now checks simulated var
2015-10-15 06:46:07 -04:00
41e8798516
Adjusts chemsmoke breathing
...
Inhaled reagents are now split between bloodstream and ingestion.
Reagents are not inhaled if environment pressure is too low.
2015-10-15 06:45:22 -04:00
d260b3bb18
Fixes #11300
...
Atoms crossing a smoke cloud now get splashed with up to 10 units of reagent.
2015-10-15 06:44:21 -04:00
dcde34512c
Refactors pepperspray touch effect, adjusts pepperspray messages.
2015-10-15 06:42:08 -04:00
2fcaaf80c7
Chemistry machinery fixes.
...
Makes Topic() calls check parent. Adds proper operable() checks where applicable.
Makes the interact_offline only affect the NOPOWER flag.
Fixes #11116 . Fixes #11302 .
2015-10-15 11:31:57 +02:00
27429f7b0c
Less copypasta
2015-10-15 01:59:04 -04:00
39d384cbe4
Makes Deckard's gun usable.
2015-10-14 19:05:14 -04:00
4db9677c88
Fixes pepperspray confusion
...
Eye protection now prevents blindness, face protection prevents stun, instead of face protection doing both.
2015-10-14 14:49:52 -04:00
3fd28dd361
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
html/changelogs/.all_changelog.yml
2015-10-14 08:41:38 +02:00
3fd172ee63
Merge pull request #11294 from Baystation12/master
...
Dev-freeze
2015-10-14 08:40:03 +02:00
8c8b5a34d3
Merge pull request #11288 from PsiOmegaDelta/151310-RandomBlob
...
Blob spawn locations are now more random
2015-10-14 03:24:28 +03:00
mwerezak