tkdrg
70a69ae1e7
Merge pull request #15141 from KorPhaeron/practice
...
Makes practice lasers scarier
2016-02-05 00:58:16 -03:00
KorPhaeron
8c25882aad
Gives ops pinpointers by default
2016-02-04 21:22:13 -06:00
tkdrg
b3daf4be22
Merge pull request #14981 from neersighted/510
...
BYOND 510
2016-02-05 00:04:59 -03:00
Bjorn Neergaard
ac03d5f617
Fix flashlights actually stunning
...
Also make clear_fullscreen() waitfor = 0 to be safe,
and bump travis version
2016-02-04 20:50:26 -06:00
GunHog
5bf76a3c14
Now supports all the types, yayA!
2016-02-04 20:29:34 -06:00
KorPhaeron
7ed46468f5
preserves name
2016-02-04 19:41:12 -06:00
xxalpha
68dedb9ee2
Reverts #15187
2016-02-05 01:28:44 +00:00
xxalpha
3316070ac0
Merge remote-tracking branch 'upstream/master' into putin
2016-02-05 01:27:26 +00:00
phil235
1be9855d4f
Merge pull request #15174 from kingofkosmos/healthanalyzerhealthfix
...
Health analyzer percentage fix
2016-02-05 02:07:57 +01:00
tkdrg
058f93a052
Merge pull request #14911 from MMMiracles/L6butbetter
...
local man rebalances bulldog and SAW, ruins everything
2016-02-04 21:59:28 -03:00
phil235
5728358b6b
Some errors and merge conflicts fixing mistakes.
2016-02-05 01:12:39 +01:00
duncathan salt
d9672fa638
Merge pull request #15176 from ChangelingRain/fixedblobchemicals
...
Blob tweaks and a new blob chemical
2016-02-04 18:02:45 -06:00
KorPhaeron
d27268f094
Grammar fixes, adds carp-sie plushie
2016-02-04 17:58:47 -06:00
Nerd Lord
f96290ff81
weakens death EMP
2016-02-04 18:54:01 -05:00
Bjorn Neergaard
5fc59f53a1
Fix lizard hissing
2016-02-04 17:19:47 -06:00
Bjorn Neergaard
a5f09e103e
Remove eroneous code; click catcher define; bygex path fix
2016-02-04 17:19:47 -06:00
Bjorn Neergaard
ef19e7904f
Support Regex in replaceall, re-implement lizard hiss limits
2016-02-04 17:19:46 -06:00
Bjorn Neergaard
e3bd22b481
Stub regex.Replace, re-implement SQL note conversion
2016-02-04 17:19:46 -06:00
Bjorn Neergaard
4a3da5d77a
Properly layer and set/clear fullscreen overlays
...
This fixes ordering issues and admin ghosting
2016-02-04 17:19:45 -06:00
Bjorn Neergaard
7a47b43c53
Re-implement screen overlays
...
This fixes 510 showing all overlays in the rightclick menu
2016-02-04 17:19:44 -06:00
Bjorn Neergaard
2500e241ca
Re-implement lizard hissing
...
Note that this reverts #13656 , due to this bug (http://www.byond.com/forum/?post=2027070 )
2016-02-04 17:19:44 -06:00
Bjorn Neergaard
1c11ca778e
Stub out 510 API
...
Also update travis to 1321
2016-02-04 17:19:43 -06:00
Bjorn Neergaard
063dd9fb84
Get the code running on 510
...
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
2016-02-04 17:19:40 -06:00
tkdrg
ba699024ab
Merge pull request #15204 from neersighted/hrefs
...
[s]Fix bad checks in holodeck
2016-02-04 20:03:30 -03:00
Bjorn Neergaard
ccc229a157
Fix bad checks in holodeck
2016-02-04 16:29:23 -06:00
phil235
4d63a481dd
Fixes merge conflict erro (readd datum/hud/Destroy())
...
Fixes cyborg sight not updating when equiping/unequiping sight modules.
2016-02-04 20:43:28 +01:00
KorPhaeron
744b0946a2
Bot turret fix
2016-02-04 12:06:49 -06:00
kingofkosmos
a251e61621
Reverts the span change in time of death.
2016-02-04 19:50:08 +02:00
AnturK
c8862a0c23
Removes unused debug datum
2016-02-04 17:23:53 +01:00
phil235
16d0154d9f
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 17:04:10 +01:00
GunHog
95f86ffea8
Nuke Tiles
...
AI's Doomsday Device and Stations' self-destruct now turn all blue
circuit tiles to red when activated.
Fixed a bug where cancelling the self-destruct via the "Safety" button
did not change the tiles back to normal.
2016-02-04 09:16:56 -06:00
phil235
0daa87f9be
More merge conflict fixes.
2016-02-04 15:48:33 +01:00
phil235
8b11d87b1d
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
...
Conflicts:
code/ATMOSPHERICS/components/unary_devices/cryo.dm
code/_onclick/hud/alert.dm
code/_onclick/hud/hud.dm
code/datums/mutations.dm
code/datums/wires/robot.dm
code/game/atoms.dm
code/game/gamemodes/blob/overmind.dm
code/game/machinery/alarm.dm
code/game/machinery/machinery.dm
code/game/machinery/suit_storage_unit.dm
code/game/objects/items/weapons/tanks/tanks.dm
code/game/objects/items/weapons/tools.dm
code/game/objects/structures/morgue.dm
code/modules/admin/verbs/adminjump.dm
code/modules/atmospherics/machinery/atmosmachinery.dm
code/modules/mob/inventory.dm
code/modules/mob/living/carbon/alien/humanoid/death.dm
code/modules/mob/living/carbon/alien/larva/death.dm
code/modules/mob/living/carbon/brain/death.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/human/death.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_damage.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/species.dm
code/modules/mob/living/carbon/human/species_types.dm
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/monkey/death.dm
code/modules/mob/living/life.dm
code/modules/mob/living/living.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/ai/death.dm
code/modules/mob/living/silicon/ai/life.dm
code/modules/mob/living/silicon/pai/death.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/mob/living/silicon/robot/death.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/mob/living/simple_animal/guardian/guardian.dm
code/modules/mob/login.dm
code/modules/mob/mob.dm
code/modules/projectiles/gun.dm
code/modules/reagents/chemistry/reagents/blob_reagents.dm
tgstation.dme
2016-02-04 14:34:45 +01:00
xxalpha
cda1db92dd
Fixed doomsday device not qdeling when it should.
...
asdiasda
2016-02-04 10:31:30 +00:00
xxalpha
cdef1324d3
Fixes var edited SMES starting with no charge.
2016-02-04 08:52:26 +00:00
KorPhaeron
a638e1ab37
Theatre Access for Chaplain
2016-02-04 01:21:45 -06:00
Jordie
35a9a2ed90
Merge pull request #15187 from KorPhaeron/revert-15137-Again-and-again-and-again-and-again-do-it-again-do-it-again-again-and-again
...
Revert "Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue"
2016-02-04 17:26:18 +11:00
Cheridan
1b585711ac
Merge pull request #14170 from optimumtact/sillycones
...
Make all ai turrets have the silicon faction
2016-02-03 23:23:03 -06:00
KorPhaeron
8d4351fd04
Revert "Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue"
2016-02-03 22:03:22 -06:00
Nerd Lord
79d7758321
Anomalies now appear on the POI list.
2016-02-03 22:22:42 -05:00
Incoming
995352b818
Poly will now speak a line or emote when pet.
...
Poly is now much more likely to drop a line from active recall after saying a line. This doesn't actually impact how often poly says something, just how stale his "short term memory" is. Keep in mind that due to the wonders of saycode the line poly drops isn't the same necessarily as the one he said, so the "poly might say this line twice" factor is still higher than the 20% this pull implies. Also this mechanic means it's entirely possible to have roundstart lines be dropped having never been said.
speak_chance is now a proper percentage chance, before it was actually out of 200 for some strange reason. Animals with high speak chances have had their chance halved to preserve their level of chatter (except for poly).
Poly will now keep track of if he died last round and how many rounds in a row he's lived. While he's building on his record he'll have a few special lines he might say at some point near the beginning of the round and also talks FAR more often (to be annoying).
Adds a dumb monty python joke to dead parrots because we literally don't have any
2016-02-03 21:37:50 -05:00
Nerd Lord
20b61a351c
shitcoder no shitcoding
2016-02-03 21:16:56 -05:00
Nerd Lord
d412c90ba8
If we let the threshold be on by default, we cuck blob chemicals.
...
Let's not do that.
2016-02-03 21:10:33 -05:00
Nerd Lord
96b276cd8c
not so simple now, holy shit
2016-02-03 20:43:14 -05:00
oranges
ba4f5101f7
Remove uncessary spawn from turret code
2016-02-04 14:33:57 +13:00
tkdrg
8b10c648e5
Merge pull request #15144 from lzimann/debugverbs
...
Makes debug verbs toggleable
2016-02-03 22:12:56 -03:00
tkdrg
6cf4feb348
Merge pull request #15137 from tgstation/Again-and-again-and-again-and-again-do-it-again-do-it-again-again-and-again
...
Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue
2016-02-03 22:10:01 -03:00
tkdrg
1c2727d765
Merge pull request #15133 from Firecage/Moremodulemoves
...
Moves some more files to the modules section.
2016-02-03 22:09:12 -03:00
tkdrg
0e7578fcea
Merge pull request #15132 from octareenroon91/patch-35
...
Improve player medbot
2016-02-03 22:03:30 -03:00
tkdrg
b1d431f243
Merge pull request #15129 from bgobandit/morevalentines
...
Adds more Valentine messages.
2016-02-03 22:01:46 -03:00