95f270ad3a
Xenomorph Queens can now infest victims.
2015-09-21 20:36:51 +09:30
22ef779f65
Cherrypicked xenophage-rewrite mechanics over.
2015-09-21 20:36:45 +09:30
7d7f0da2ca
Merge pull request #11156 from PsiOmegaDelta/150920-PunPunOnTheTable
...
Species tweaks
2015-09-21 19:08:53 +09:30
02661be540
Merge pull request #11136 from PsiOmegaDelta/150918-BiasedMeteors
...
Meteor events are now direction biased.
2015-09-21 11:54:10 +03:00
d891fba1cc
Mob size tweaks.
...
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
2015-09-20 17:12:07 +02:00
292c1545cb
Species datums now include pass flags.
...
Utilized to allow Pun-Pun and other monkeys to once again climb tables.
2015-09-20 16:13:20 +02:00
6103f688cf
Merge pull request #11143 from PsiOmegaDelta/150919-GlowyThings
...
More glowy stuff.
2015-09-20 04:51:01 +03:00
bd3b4c5d81
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-19 21:37:05 +02:00
de9e68cdcd
Merge pull request #11151 from Baystation12/master
...
Dev-freeze
2015-09-19 21:25:15 +02:00
59c5807157
Active stunbatons now glow.
2015-09-19 21:12:19 +02:00
d65ebf8b90
Meteor events are now direction biased.
...
When a meteor event triggers it now selects a main edge to arrive from, with a 20% probability to come from either neighboring edge. Will never arrive from the opposite edge.
The meteor event end time is now made more useful, and is based on a longest delay between meteor waves scenario.
The meteor event now supports multiple station Z-levels.
Removes the meteor sounds, as they can rarely be heard over the explosions anyway.
2015-09-18 21:45:15 +02:00
232dd5bfb1
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-09-18 08:51:10 +02:00
9946c837e4
Merge pull request #11134 from Baystation12/master
...
Dev-freeze
2015-09-18 08:50:11 +02:00
dcc4655026
Merge pull request #11112 from caelaislinn/missing_spawn
...
QOL feature for mappers
2015-09-17 21:11:52 +02:00
0e4f51413b
Merge pull request #11074 from GinjaNinja32/title
...
Title screen update
2015-09-17 21:11:31 +02:00
f65649c8ba
Fixes Pun-Pun (and other monkeys) pushing people around.
...
At some point a return had snuck in before the mob-push/swap flag settings. I blame a merge.
Relocated that code to handle_post_spawn() to hopefully ensure it'll always fire when appropriate.
2015-09-17 09:40:19 +02:00
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
5d1b1cd123
Merge pull request #11096 from PsiOmegaDelta/150913-SneakyMice
...
Prevents observer mice from spawning on the admin Z-level.
2015-09-17 05:42:15 +03:00
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
7ce27f76fd
Macro refactoring.
...
Turns several of the is* procs into istype defines.
2015-09-16 12:57:14 +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
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
db95743784
Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair
...
Converts some loc = to forceMove()
2015-09-14 12:11:09 -04:00
bb5680193f
Converts some loc = to forceMove()
...
Fixes #11102 .
2015-09-14 11:13:15 +02: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
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
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
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
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
7b2041ea1d
Sensors - removing the random period
2015-09-10 20:48:25 +02: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
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
30069d1dce
Merge pull request #11044 from Kelenius/beepskyFixes
...
Makes beepsky less brutal
2015-09-08 10:41:30 +02:00
388159c7f1
Makes beepsky less brutal
...
Fixes #10979
Fixes beepsky beating up handcuffed people
2015-09-08 11:36:55 +03:00
787f48146e
Merge pull request #10980 from GinjaNinja32/autohiss
...
Add autohiss/purr on a per-client toggle
2015-09-07 15:37:46 +09:30
e0cfd8fdbd
Merge pull request #10420 from Kearel/sbike
...
[Feature] Space Bikes!
2015-09-07 13:58:25 +09:30
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
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
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
a1b9dc2b4a
Resomi language tweaks, fixes every species' names being generated in Galcom
2015-09-06 22:10:39 +01:00
2563821832
Merge pull request #10972 from Zuhayr/resomi
...
Adds the Resomi.
2015-09-06 13:09:34 +03:00
ef21f562fd
Added some Resomi uniforms/loadout options.
2015-09-06 18:49:33 +09:30
63cb207eb8
Merge pull request #10890 from PsiOmegaDelta/150826-AltLangKeys
...
Languages now use alternative prefix keys.
2015-09-06 17:20:51 +09:30
Zuhayr