73078a19ce
Merge pull request #11091 from mwerezak/lighting-fix
...
Fixes #10710
2015-09-16 14:59:39 +01:00
536a3a6070
fix #10882
2015-09-16 14:34:20 +03:00
7ce27f76fd
Macro refactoring.
...
Turns several of the is* procs into istype defines.
2015-09-16 12:57:14 +02:00
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
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
e731127b1c
Corrects HTML tag mismatch.
2015-09-15 20:39:33 +02:00
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
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
4a9dc8dc8f
Invisible / Missing Growth State Fix
...
Fixes a number of plants seemingly randomly having invisible plant
growth states.
- This was caused by overly-rounded math resulting in attempts to call
growth states that do not exist.
2015-09-14 17:35:33 -04:00
db95743784
Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair
...
Converts some loc = to forceMove()
2015-09-14 12:11:09 -04:00
eef1013db2
Fixes #10925
...
Makes psilocybin less robust, also cuts down emote spam
2015-09-14 16:54:24 +03:00
bb5680193f
Converts some loc = to forceMove()
...
Fixes #11102 .
2015-09-14 11:13:15 +02:00
9dd6f9762a
Resolves #11049
2015-09-14 12:05:28 +03:00
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
e29f5d108c
fix pill attack_log entry, switch to using key_name
2015-09-14 06:24:49 +01:00
a938c7b648
Prevents observer mice from spawning on the admin Z-level.
2015-09-13 11:35:47 +02:00
0d91ca0dfd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
2015-09-13 10:52:01 +02:00
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
810ca147d0
Fixes #10710
2015-09-12 19:34:43 -04:00
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
26f533bb01
Merge pull request #11076 from PsiOmegaDelta/dev
...
Dev
2015-09-12 13:17:47 +02:00
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
834d93df00
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-12 12:51:22 +02:00
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
26f1d02bda
Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
...
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2015-09-11 18:13:14 -04:00
adf19d674b
Merge pull request #11055 from mwerezak/coffee-fix
...
Returns coffee jitteriness to an overdose effect
2015-09-11 22:49:35 +02:00
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
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
8536fb08eb
Merge branch 'dev' into vv
2015-09-11 08:06:44 +01:00
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
0b433eb90c
Code relocation.
2015-09-11 08:45:49 +02:00
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
e1e47ac189
Merge branch 'master' into coffee-fix
2015-09-11 00:54:47 -04:00
b9ee4ebc5e
Merge branch 'master' into abandonedcrates
2015-09-10 15:21:15 -04:00
7b2041ea1d
Sensors - removing the random period
2015-09-10 20:48:25 +02:00
67fd31bd3e
Abandoned crates now again use unique digits for their codes
2015-09-10 00:42:14 -04:00
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
3a952d26df
Replace ';' with '; // do nothing' for clarity
2015-09-10 04:00:37 +01:00
4ed33603c2
Implement VV header and options for virus2 datums
2015-09-10 03:58:10 +01:00
a2c1bc1766
Adds apply_effect calls
2015-09-09 22:27:40 -04:00
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
19b195cd27
Revert "Reverts #10649 , fixes #10621 "
...
This reverts commit cb5df3963a
2015-09-09 21:12:24 -04:00
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
a58f70025d
Adds cooldowns to eating/feeding, allows attacking with reagent containers while on harm intent.
2015-09-09 15:44:46 -04:00
af52b475ff
Fixes missing cooldowns, missing cult blade sound.
2015-09-09 15:15:43 -04:00
6e66ad307c
Refactors bottle smashing, apply_hit_effect() now returns the blocked status.
2015-09-09 13:58:45 -04:00
2007004f3c
Qdel cleanup.
...
Replaces a few instances of del() with qdel().
2015-09-09 12:20:33 +02:00
cfa82e0c5e
Allows resisting while restrained, prevents stop-drop-and-roll while buckled.
2015-09-09 03:11:09 -04:00
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
43a7ca9271
Refactors robolimb emagging, fixes emag resolve_attackby not passing emag_source
2015-09-09 02:58:07 -04:00
GinjaNinja32