PsiOmegaDelta
dcc4655026
Merge pull request #11112 from caelaislinn/missing_spawn
...
QOL feature for mappers
2015-09-17 21:11:52 +02:00
PsiOmegaDelta
0e4f51413b
Merge pull request #11074 from GinjaNinja32/title
...
Title screen update
2015-09-17 21:11:31 +02:00
GinjaNinja32
a7ed0ff2fb
Merge pull request #11124 from PsiOmegaDelta/150916-LawChanneling
...
Makes the additional law channel handling more flexible.
2015-09-17 06:27:41 +01:00
Chinsky
5383bc129b
Merge pull request #11120 from PsiOmegaDelta/150916-DefineMe
...
Macro refactoring.
2015-09-17 05:39:14 +03:00
Chinsky
7e9c84c0f6
Merge pull request #11122 from PsiOmegaDelta/150915-PowernetDestroy
...
Improves powernet destruction.
2015-09-17 05:38:38 +03:00
PsiOmegaDelta
48ce35a179
Makes the additional law channel handling more flexible.
...
It has no particular purpose at this time, except to be a general improvement.
2015-09-16 16:36:04 +02:00
Dennok
536a3a6070
fix #10882
2015-09-16 14:34:20 +03:00
PsiOmegaDelta
7ce27f76fd
Macro refactoring.
...
Turns several of the is* procs into istype defines.
2015-09-16 12:57:14 +02:00
PsiOmegaDelta
f8a38ec7cf
Improves powernet destruction.
...
While we currently do hard del datums this is a step towards a better world.
2015-09-16 08:00:22 +02:00
Cael Aislinn
00c9402656
enables spawning at latejoin landmarks instead of space if unable to find appropriate job spawn landmark
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2015-09-16 12:48:37 +10:00
PsiOmega
e731127b1c
Corrects HTML tag mismatch.
2015-09-15 20:39:33 +02:00
PsiOmega
5863112d2d
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
2015-09-15 20:31:59 +02:00
PsiOmega
5c1b8380a4
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/tanks/jetpack.dm
code/game/objects/items/weapons/tanks/tanks.dm
2015-09-15 20:25:13 +02:00
mwerezak
db95743784
Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair
...
Converts some loc = to forceMove()
2015-09-14 12:11:09 -04:00
PsiOmegaDelta
bb5680193f
Converts some loc = to forceMove()
...
Fixes #11102 .
2015-09-14 11:13:15 +02:00
Kelenius
9dd6f9762a
Resolves #11049
2015-09-14 12:05:28 +03:00
PsiOmegaDelta
b79f061877
Merge pull request #11103 from GinjaNinja32/pills
...
fix pill attack_log entry, switch to using key_name
2015-09-14 07:31:07 +02:00
GinjaNinja32
e29f5d108c
fix pill attack_log entry, switch to using key_name
2015-09-14 06:24:49 +01:00
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
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
GinjaNinja32
30782cde8f
Remove the need to map in the title screen, move title screen icons into a single file
2015-09-12 08:34:28 +01: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
e1e47ac189
Merge branch 'master' into coffee-fix
2015-09-11 00:54:47 -04:00
mwerezak
b9ee4ebc5e
Merge branch 'master' into abandonedcrates
2015-09-10 15:21:15 -04:00
Sligneris
7b2041ea1d
Sensors - removing the random period
2015-09-10 20:48:25 +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
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
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
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
94b4c483ba
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-08 08:22:37 +02:00
