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
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
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
mwerezak
a2c1bc1766
Adds apply_effect calls
2015-09-09 22:27:40 -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
0e2f44e3ac
Admin logs bought uplink items.
2015-09-07 20:02:43 +02:00
Zuhayr
412ee32d1c
Stops autotraitor grabbing minds from the lobby for antag roles.
2015-09-07 17:01:34 +09:30
GinjaNinja32
4b73518d49
Merge pull request #11036 from PsiOmegaDelta/150907-AlwaysDoItYourself
...
Re-adds recharge station checks.
2015-09-07 07:19:50 +01:00
PsiOmega
1633cde787
Adds missing </font>
2015-09-07 08:18:53 +02:00
PsiOmega
8e9705b6c7
Re-adds recharge station checks.
...
Because no one who stuffs non-operational/dead borgs into recharge stations will bother to eject them.
2015-09-07 08:16:31 +02:00
PsiOmega
3a2b1be8e1
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-07 08:09:01 +02:00
Zuhayr
787f48146e
Merge pull request #10980 from GinjaNinja32/autohiss
...
Add autohiss/purr on a per-client toggle
2015-09-07 15:37:46 +09:30
PsiOmega
8dea4d40c0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-07 08:01:15 +02:00
Zuhayr
211e426009
Tweak.
2015-09-07 14:43:20 +09:30
Zuhayr
c2908bfc50
Fixes #10951
2015-09-07 14:43:12 +09:30
Zuhayr
88b95e1207
Fixes #7951
2015-09-07 14:40:23 +09:30
Zuhayr
43a349ee2a
Fixes #11022
2015-09-07 14:25:45 +09:30
Zuhayr
e27eda4c86
Merge pull request #10672 from mwerezak/frag-grenade
...
Adds fragmentation grenades
2015-09-07 14:12:27 +09:30
Zuhayr
479e637823
Merge pull request #10398 from Soadreqm/patch-1
...
Increase changeling genetic points
2015-09-07 14:01:42 +09:30
Zuhayr
dd81250b1b
Merge pull request #10784 from Kelenius/masterRuntimes
...
Fixes two runtimes
2015-09-07 14:01:24 +09:30
Zuhayr
e0cfd8fdbd
Merge pull request #10420 from Kearel/sbike
...
[Feature] Space Bikes!
2015-09-07 13:58:25 +09:30
Zuhayr
0c56bdd448
Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
...
Makes it possible to define multiple tag pairs for the Travis check.
2015-09-07 13:57:09 +09:30
Zuhayr
fca95039bf
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/game/gamemodes/intercept_report.dm
code/game/gamemodes/traitor/traitor.dm
code/global.dm
code/modules/mob/inventory.dm
code/modules/mob/living/living.dm
html/changelogs/.all_changelog.yml
2015-09-07 11:31:19 +09:30
Zuhayr
b9c01bf2f2
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/objects/items/devices/uplink.dm
2015-09-07 11:17:06 +09:30
Zuhayr
9d5f14298d
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/gamemodes/traitor/traitor.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-09-07 11:03:41 +09:30
