c0
d7eee00a0b
Fixes runtimes in sensory deprivation symptom
2016-06-13 17:51:25 +03:00
c0
4d01e17ba0
Refactors mech directional armor
2016-06-13 17:07:21 +03:00
c0
9fdbe269d6
More fixes
2016-06-13 12:43:25 +03:00
c0
5ce52dbcb3
Fixes unkillable ash dragon
2016-06-13 12:17:57 +03:00
Xhuis
50fd38c4ac
Bandaid fix for plasmaman wizards ( #18446 )
2016-06-11 16:04:20 -05:00
Cheridan
d933226d16
Merge pull request #18435 from KorPhaeron/pope
...
Fixes pope spam
2016-06-11 14:04:15 -05:00
Cheridan
47e2f50de5
Merge pull request #18440 from JStheguy/slave
...
Easiest Fixes Ever Double Feature
2016-06-11 13:29:44 -05:00
Cheridan
d9e96281de
Merge pull request #18438 from ChangelingRain/componentscarcity
...
Makes clockwork component generation slightly less crazy
2016-06-11 13:16:39 -05:00
Cheridan
81e6679aed
Merge pull request #18442 from drynwyn/Stupi
...
Removes a superfluous addition of the "slime" faction to slimepeople.
2016-06-11 13:14:13 -05:00
JStheguy
87ae4675fe
Unhides Jumpsuits
...
Wow, that was easier.
2016-06-11 12:52:23 -05:00
Joan Lung
88c96aa5e8
brief delay
2016-06-11 10:25:36 -04:00
Jordie
0777916328
Merge pull request #18402 from optimumtact/flamingfunremoval
...
Better logging and notification of setting on fire
2016-06-11 23:53:34 +10:00
Jordie
264aafbe23
Merge pull request #18378 from optimumtact/banditrevival
...
Photocopying secret documents actually works now
2016-06-11 23:52:02 +10:00
oranges
d97d8e6d6e
Merge pull request #18432 from Core0verload/newmask
...
Adds explorer gas mask for lavaland miners
2016-06-12 01:14:48 +12:00
oranges
29a1c6be5f
Merge pull request #18433 from KorPhaeron/standard_borg
...
New Standard Cyborg Module Gear
2016-06-12 01:13:33 +12:00
Joan Lung
3018b4bec1
restore
2016-06-11 09:13:31 -04:00
oranges
f2a19e08c5
Merge pull request #18434 from bgobandit/cameraicons
...
Camera icons now properly update upon EMP and deactivation.
2016-06-12 01:13:07 +12:00
oranges
f58b13d099
Explicitly return parent value
...
This prevents it returning false incorrectly
2016-06-11 13:09:25 +00:00
oranges
bf9643563d
Ensure we only log and notify admins when person is set on fire
...
This takes advantage of the now refactored IgniteMob returning true when
it successfully ignites the mob
2016-06-11 13:08:05 +00:00
Joan Lung
35e6f676c8
Merge branch 'master' of https://github.com/tgstation/tgstation into componentscarcity
...
Conflicts:
code/game/gamemodes/clock_cult/clock_structures.dm
code/game/turfs/simulated/walls_misc.dm
2016-06-11 09:06:06 -04:00
oranges
8141d5d60b
Refactors IgniteMob to return true if the mob was set on fire
...
Also moves the DNA species ignite mob check to a better proc name to
make it clearer that it checks for a mob species that is valid to set on
fire
2016-06-11 13:04:09 +00:00
oranges
3bc56655e4
Rename proc, move updateUsrDialog call
...
Ensures the dialog is called after the photocopy/doccopy is removed and
so the interface updates correctly
2016-06-11 12:54:00 +00:00
Joan Lung
e49849048e
faster floors
2016-06-11 08:50:26 -04:00
oranges
d286cf4dd6
Merge pull request #18428 from Core0verload/clocker_fix
...
Fixes tinker's cache exploit
2016-06-12 00:50:14 +12:00
oranges
39612b3ba2
Merge pull request #18430 from coiax/fix-18258
...
Countdowns follow bomb; fixes syndibomb countdown
2016-06-12 00:41:18 +12:00
oranges
611151d25f
Merge pull request #18278 from coiax/somebody-at-the-door
...
Ghosts are notified when someone joins
2016-06-12 00:40:57 +12:00
Joan Lung
616dc140b4
Clockwork Proselytizer now uses a proc instead of a huge else if ( #18419 )
...
Instead of a huge else if chain, it's a proc that returns either an associated list with the values the proselytizer will use for it or FALSE, if it can't be proselytized.
This makes it easier to mess with and also saves like 5 lines!
Bonus; harm intent no longer disables proselytizing because wow that's a pain in the butt, holy crap.
2016-06-12 00:40:14 +12:00
oranges
7063db51c9
Merge pull request #18424 from drynwyn/master
...
Adds "plants" and "vines" factions to pod people
2016-06-12 00:38:57 +12:00
Joan Lung
96990431be
Merge pull request #18431 from coiax/fix-18351
...
Deathrattle preferences fix; ignores Z2 deaths
2016-06-11 08:18:13 -04:00
Leo
467ce07292
No more leg-less full speed, hopefully. ( #18417 )
2016-06-11 12:35:09 +02:00
c0
1a6fa0031d
Adds explorer gas mask for lavaland miners
2016-06-11 10:38:53 +03:00
Joan Lung
ff6b5028f9
Anima Fragments get a number after their name ( #18463 )
2016-06-10 22:42:37 -05:00
Joan Lung
42c253d854
Merge pull request #18416 from KorPhaeron/megafauna
...
Boss tweaks
2016-06-10 21:04:39 -04:00
oranges
ab73b4569a
Merge pull request #18413 from phil235/FixAssortment1
...
Fives Fixes
2016-06-11 10:05:35 +12:00
oranges
b3bbe1aef3
Merge pull request #18414 from bgobandit/lizwine
...
Adds lizard wine to the game.
2016-06-11 10:05:17 +12:00
drynwyn
24e0f6a333
Removes superfluous addition of the slime faction.
2016-06-10 13:36:25 -04:00
Jack Edge
beeced08be
Ghosts are notified when someone joins
...
🆑 coiax
rscadd: Ghosts are notified when someone arrives on the Arrivals
Shuttle. This is independent of the announcement system, and the (F)
link will follow the arrived person.
/🆑
Also I got rid of a trailing return.
2016-06-10 17:17:26 +01:00
Joan Lung
077745a6a6
description
2016-06-10 12:15:38 -04:00
Joan Lung
82e5b7fb99
failed scripture refunds components
2016-06-10 12:11:11 -04:00
coiax
fd20fa8b10
Observers can see clockcult description on sigils ( #18411 )
...
No longer be confused by the difference between a dull sigil, an ominous
sigil or a sulking sigil.
2016-06-10 11:02:12 -05:00
drynwyn
14bdb5995d
Removes superfluous faction adding.
2016-06-10 11:13:26 -04:00
drynwyn
aa81f49540
Faction adding in species_gain rather than pod.
2016-06-10 11:12:11 -04:00
Joan Lung
eaf0e464a3
use the right proc
2016-06-10 10:49:17 -04:00
Joan Lung
f73ae66659
testing
2016-06-10 10:37:09 -04:00
Joan Lung
4faa1124b6
Makes clockwork component generation slightly less crazy
2016-06-10 10:30:03 -04:00
KorPhaeron
bc37db117a
Fixes pope spam
2016-06-10 08:52:45 -05:00
AnturK
859082829b
Merge pull request #18401 from optimumtact/skorvydorvy
...
Adds admin notice and game log entry to the grief (lava) staff
2016-06-10 15:44:10 +02:00
Joan Lung
352e6831f9
Clockwork structures are now slightly more resistant to lava ( #18410 )
...
* Clockwork structures are now slightly more resistant to lava.
* flying mobs that are immune to lava what a shocker
* sanity
* ,
2016-06-11 01:37:28 +12:00
oranges
daf413704a
Merge pull request #18427 from Core0verload/mining_split
...
Splits equipment_locker.dm
2016-06-11 01:36:57 +12:00
bgobandit
1c7ef8267c
Camera icons now properly update upon EMP and deactivation.
2016-06-10 09:35:48 -04:00
