PsiOmega
0d91ca0dfd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
2015-09-13 10:52:01 +02:00
PsiOmega
830d2feb0d
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
code/game/objects/structures/crates_lockers/largecrate.dm
2015-09-13 10:44:06 +02:00
mwerezak
26d0a35699
Merge pull request #11085 from PsiOmegaDelta/150912-ForceMarch
...
Fixes #10988 .
2015-09-12 23:29:03 -04:00
GinjaNinja32
5721e55f72
Merge pull request #11078 from PsiOmegaDelta/150912-StateYourLaws
...
Ensures the AI should always be able to state ion laws.
2015-09-13 02:23:27 +01:00
PsiOmega
0c21ef741e
Fixes #10988 .
...
Lights now update when objects are moved into crates and lockers.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1926 .
2015-09-12 20:43:24 +02:00
PsiOmega
81861f4dd6
Ensures the AI should always be able to state ion laws.
...
Switched the first character selection to a number to avoid collision with custom language keys on dev.
2015-09-12 15:02:42 +02:00
PsiOmega
8d57b2d0a0
Fixes observers being unable to see silicon antag status.
...
target_list contains mob/living mobs while the previous loop only looped over living/carbon/human.
To make things a bit of a headache hud_list is defined separately for living/carbon/human and living/silicon, instead of directly on /living.
It is certainly possible to define hud_list at mob/living instead but adding an extra loop for silicons is the method that is least likely to break things, thus the most appropriate for a master fix.
2015-09-12 14:39:10 +02:00
PsiOmegaDelta
26f533bb01
Merge pull request #11076 from PsiOmegaDelta/dev
...
Dev
2015-09-12 13:17:47 +02:00
PsiOmega
e722da01f6
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
2015-09-12 13:10:29 +02:00
PsiOmega
834d93df00
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-12 12:51:22 +02:00
Chinsky
adf19d674b
Merge pull request #11055 from mwerezak/coffee-fix
...
Returns coffee jitteriness to an overdose effect
2015-09-11 22:49:35 +02:00
Chinsky
83f4425826
Merge pull request #11062 from Sligneris/patch-5
...
Sensors - removing the random period from the action verb
2015-09-11 22:49:28 +02:00
SomeoneElse
7e4191d212
[minor] Fix ATM transfer code, remove badly placed 'break'.
...
code/modules/economy/Accounts.dm:
remove break from charge_to_account()
2015-09-11 16:44:00 +06:00
GinjaNinja32
8536fb08eb
Merge branch 'dev' into vv
2015-09-11 08:06:44 +01:00
PsiOmegaDelta
a7fa8cde49
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/spacesuits/void/merc.dm
code/modules/mob/living/living.dm
code/modules/mob/living/simple_animal/borer/borer_captive.dm
code/modules/mob/mob_grab_specials.dm
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
html/changelogs/.all_changelog.yml
2015-09-11 08:54:03 +02:00
PsiOmegaDelta
0b433eb90c
Code relocation.
2015-09-11 08:45:49 +02:00
PsiOmegaDelta
f81ac77884
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-09-11 08:38:28 +02:00
mwerezak
196c0db87f
Merge branch 'master' into abandonedcrates
2015-09-11 00:56:33 -04:00
mwerezak
e1e47ac189
Merge branch 'master' into coffee-fix
2015-09-11 00:54:47 -04:00
mwerezak
23816477b1
Merge branch 'dev' into tajaran-metabolism
2015-09-10 15:23:07 -04:00
mwerezak
b9ee4ebc5e
Merge branch 'master' into abandonedcrates
2015-09-10 15:21:15 -04:00
Vivalas
ae5810d6ed
Fixes #10729
2015-09-10 13:50:24 -05:00
Sligneris
7b2041ea1d
Sensors - removing the random period
2015-09-10 20:48:25 +02:00
PsiOmegaDelta
fea2960d5c
Merge branch 'dev' into 150907-UplinkUses
2015-09-10 08:09:11 +02:00
PsiOmegaDelta
9ce56f3f91
Correctly intends a world-message.
2015-09-10 08:05:35 +02:00
PsiOmegaDelta
9857961509
Merge branch 'master' into 150909-DelQdel
2015-09-10 07:05:09 +02:00
PsiOmegaDelta
8b36433c50
Merge branch 'master' into 150909-DelQdel
2015-09-10 06:48:05 +02:00
mwerezak
67fd31bd3e
Abandoned crates now again use unique digits for their codes
2015-09-10 00:42:14 -04:00
mwerezak
c8fcdf5170
Makes coffee poisonous to tajaran
...
Also fixes skrell protein toxicity not applying when protein is injected.
2015-09-09 23:11:47 -04:00
GinjaNinja32
3a952d26df
Replace ';' with '; // do nothing' for clarity
2015-09-10 04:00:37 +01:00
GinjaNinja32
4ed33603c2
Implement VV header and options for virus2 datums
2015-09-10 03:58:10 +01:00
mwerezak
a2c1bc1766
Adds apply_effect calls
2015-09-09 22:27:40 -04:00
GinjaNinja32
be2279106f
Merge remote-tracking branch 'upstream/dev' into vv
...
Conflicts:
code/modules/admin/verbs/debug.dm
code/modules/admin/view_variables/topic.dm
2015-09-10 03:06:27 +01:00
mwerezak
19b195cd27
Revert "Reverts #10649 , fixes #10621 "
...
This reverts commit cb5df3963a
2015-09-09 21:12:24 -04:00
mwerezak
f69c723d40
Made flares a bit brighter
2015-09-09 20:42:40 -04:00
mwerezak
8e66d3b31a
Fixes IPCs being knocked unconscious when being hit in the head with a melee weapon
...
Replaces the hardcoded def_zones with a headcheck() proc to handle species who have "brains" are located in non-standard places.
2015-09-09 19:49:46 -04:00
mwerezak
4c74b916ce
Merge branch 'master' into do_mob-fix
2015-09-09 16:07:32 -04:00
mwerezak
124609ad71
Fixes various actions occuring instantly
...
Feeding food/drinks in particular.
2015-09-09 16:04:59 -04:00
PsiOmegaDelta
2007004f3c
Qdel cleanup.
...
Replaces a few instances of del() with qdel().
2015-09-09 12:20:33 +02:00
mwerezak
cfa82e0c5e
Allows resisting while restrained, prevents stop-drop-and-roll while buckled.
2015-09-09 03:11:09 -04:00
HarpyEagle
5e6617e7e6
Cleans up living/say broadcast and verb logic
...
Human say_quote() will use the language to obtain a speech verb while
silicon say_quote() will use synth speech verbs, so no need for the extra
language flag. Will mean that silicons will always use their synth speech
verbs regardless of language, however. Logic for what silicons use as
their verb should probably go in say_quote() anyways, so future updates to
that can go there instead of branching in living say code.
2015-09-09 03:04:18 -04:00
PsiOmegaDelta
cbd621ae41
Merge remote-tracking branch 'upstream/dev' into 150907-UplinkUses
2015-09-09 08:18:26 +02:00
mwerezak
5e478b58e8
Fixes #10746
...
Stumps can now be amputated, but not removed by taking damage.
2015-09-09 00:17:37 -04:00
PsiOmegaDelta
30069d1dce
Merge pull request #11044 from Kelenius/beepskyFixes
...
Makes beepsky less brutal
2015-09-08 10:41:30 +02:00
Kelenius
388159c7f1
Makes beepsky less brutal
...
Fixes #10979
Fixes beepsky beating up handcuffed people
2015-09-08 11:36:55 +03:00
PsiOmegaDelta
6a956d0d0a
Uplink fixes.
...
Adds a default welcome message. Was lost in a game mode cleanup.
Traitors should now have telecrystals again. Also lost in the game mode cleanup.
Uplinks without correctly defined owners are now also printed in the round end summary.
2015-09-08 08:43:40 +02:00
PsiOmegaDelta
23a3433e67
Moves nanomanager.close_uis(src) into datum/proc/Destroy() instead of /obj/Destroy() now that NanoUI supports datums.
2015-09-08 08:32:09 +02:00
PsiOmegaDelta
94b4c483ba
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-08 08:22:37 +02:00
PsiOmegaDelta
ec7e2491be
Updates "on merge" entries. Relocates code.
2015-09-08 08:03:14 +02:00
PsiOmegaDelta
2f183e1cee
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/devices/uplink.dm
code/modules/nano/modules/human_appearance.dm
2015-09-08 07:58:25 +02:00
PsiOmega