3c5cdbefe3
forgot to typecast properly
2016-01-04 23:42:45 -08:00
3108162f1d
Merge pull request #14308 from tgstation/duncathan-patch-1
...
Cancelling while adding a custom objective no longer adds a free objective
2016-01-05 04:39:09 -03:00
869354f105
Revert commit f6d13b93 (blame rr)
...
This crashes the client
(burn code sets burn_state to ON_FIRE) setting it back to FIRE_PROOF kept it from detecting it was already on fire, so it kept re-adding the overlay
2016-01-04 23:30:15 -08:00
4e81912656
Merge pull request #14356 from phil235/AlienEvolveFix
...
Fixes some bug about alien evolving
2016-01-04 23:15:27 -06:00
3dfa1b4e55
Merge pull request #14368 from PKPenguin321/patch-8
...
experimentor typo fix
2016-01-05 05:51:13 +01:00
872bf0a692
Fix some typos, don't wash out button hover colors, fix APC delays
2016-01-04 22:01:14 -06:00
292837a248
Prevent flipping a coin if wired
...
Fixes graphical bug #14343 with extreme overkill. If the coin has an attached wire, it won't flip. Someone else might want to instead fix the animation so that the wire moves with the coin.
2016-01-04 18:36:32 -08:00
060fd8b529
Fixes gang implanter message
2016-01-04 20:22:24 -06:00
f9f12f6447
Merge pull request #14261 from KorPhaeron/SMES
...
SMES logging fix
2016-01-05 03:13:30 +01:00
3a1beb1521
Pluralize
...
Engineer's Quarters
to
Engineers' Quarters
(I find it unlikely that there's only one Engineer, but if I'm wrong, tell me!)
2016-01-04 18:12:50 -08:00
9e7b9f94f5
Fix missing plural apostrophe
...
Patients Rooms
to
Patients' Rooms
2016-01-04 18:01:55 -08:00
ec2648b81a
Merge remote-tracking branch 'refs/remotes/tgstation/master' into pod_launch_fix
...
# Conflicts:
# code/controllers/subsystem/shuttles/emergency.dm
2016-01-04 19:44:28 -06:00
3d74978881
Uses get_turf
2016-01-04 19:40:01 -06:00
2ed4643e74
forgot to remove that line.
2016-01-05 01:49:07 +01:00
c2a3be931b
Adds a space after the ghost follow link for messages that lacked it
2016-01-04 19:26:07 -05:00
c3aff8dffe
Merge pull request #14355 from ChangelingRain/justwatchthem
...
Adds follow links to overmind, revenant, and abductor chat
2016-01-05 01:15:10 +01:00
ede4a3b378
Merge pull request #14335 from KorPhaeron/refunds
...
Uplink refund refactor/fixes cyborg spawners not appearing in nuke purchase log
2016-01-05 01:11:26 +01:00
935ba88c48
Pod launch uses vars
2016-01-04 17:38:03 -06:00
41eeedfc46
Fixes doubled shadowling messages
2016-01-04 18:23:29 -05:00
fd80575f38
Removes a bunch of sleep(-1) and spawn(-1) from the code
...
This seems to be causing issues where if the queue was too long, byond would attempt to process through all of it while hanging everything else.
2016-01-04 15:17:12 -08:00
797bfe01ef
Merge pull request #14391 from neersighted/tgui_followup
...
Fix tgui proc signatures and thus AI APC reboot
2016-01-04 17:06:52 -06:00
174c25f53f
Initialize non-inlined UIs through a topic call
2016-01-04 16:58:40 -06:00
8b08ce8a6b
Better loop
2016-01-04 16:48:11 -06:00
aec6bc103c
Fix tgui proc signatures and thus AI APC reboot
...
This allows state overloading
Make AI reboot code use ui_interact instead of attack_ai
Fixes #13762
2016-01-04 16:25:20 -06:00
5811e00d1b
derp, some typos and a wrong number in the distance check.
2016-01-04 23:05:35 +01:00
e225fbc850
- Refactor the visible_message() proc to be much faster.
...
- Replacing some "for(var/mob/o in viewers()) show_message()" by "visible_message()".
- Replacing some "show_message()" by " << "..." " instead.
- Fixes being able to see the results of the health and slime analyzers while blind.
-
2016-01-04 22:49:27 +01:00
c13a2f97e5
Merge pull request #14342 from neersighted/tgui_followup
...
More tgui fixes and tweaks
2016-01-04 18:39:52 -03:00
31281dabf7
Add IE detection
...
Now we beg the user to upgrade, or to switch to No Frills mode
Also fix some minor IE bugs
2016-01-04 15:17:26 -06:00
3d32bde4a6
I mean, you shouldn't make any of these immune to damage types but it won't break the healing if you do.
2016-01-04 15:41:08 -05:00
4815a0f37c
Simple animals no longer convert other damage types to brute using the brute damage proc, allowing you to make mobs immune to brute but not all damage types.
...
No, no, do it properly not half-ass it
2016-01-04 15:29:23 -05:00
6060c4ce2f
Fixes modified clone records breaking
2016-01-04 21:17:20 +01:00
04fcc515aa
Merge pull request #14309 from tkdrg/hahaha_fuck
...
Fixes issues with destroying the narsie shell
2016-01-04 20:32:11 +01:00
421ecbeb9f
Merge pull request #14323 from Shadowlight213/Mindattacklog
...
Fixes VV attack logs being lost on cloning and body destruction and made gibbed antags show in check antags.
2016-01-04 20:31:37 +01:00
e84668a8d9
Merge pull request #14328 from Shadowlight213/Greenslimesynths
...
Reworks Green slime core blacklist to use a species flag.
2016-01-04 20:30:06 +01:00
5edf9f87e1
Merge pull request #14329 from KazeEspada/Mobfix1pointO
...
Fixes a runtime involving mobs that get deleted upon death.
2016-01-04 20:28:52 +01:00
e79f214d58
Merge pull request #14330 from KorPhaeron/leap_icon
...
Makes leap_icon a hunter var instead of mob var
2016-01-04 20:27:47 +01:00
fe16c5b50f
Merge pull request #14333 from KorPhaeron/venus_human_trap
...
Fixes venus human traps killing eachother
2016-01-04 20:26:10 +01:00
e0cb0e258e
Merge pull request #14334 from KorPhaeron/statue_buffs
...
Fixes drones freezing living statues
2016-01-04 20:25:35 +01:00
b922a105dc
Merge pull request #14336 from AnturK/flax
...
Fixes changeling form swap
2016-01-04 20:24:32 +01:00
9a18bf56fc
Merge pull request #14341 from phil235/CremationRuntimeFix
...
Fixes runtime when trying to cremate cockroach
2016-01-04 20:23:49 +01:00
c510fb69c2
Merge pull request #14337 from AnturK/miningbot
...
Fixes mining bot being hard to repair.
2016-01-04 20:23:23 +01:00
748e2e3485
Merge pull request #14345 from AnturK/mapjectors
...
Fixes injectors spawned before mutation table is ready
2016-01-04 20:21:48 +01:00
777302afa5
Merge pull request #14346 from AnturK/chambutts
...
Restores default chameleon projector disguise
2016-01-04 20:20:59 +01:00
94b003f7a7
Merge pull request #14339 from AnturK/cleaning
...
Removes some unused code
2016-01-04 20:20:18 +01:00
8994f95308
Clean some old comments
2016-01-04 12:22:22 -06:00
57cd223eb0
Fix contains proc to use a loop
2016-01-04 12:17:09 -06:00
dc69cbaefb
Allow UIs to be attached to datums; various fixes
2016-01-04 10:46:31 -06:00
dc1e7c11fa
Merge pull request #14273 from MrStonedOne/patch-110
...
Fixes lava turfs processing forever as well as some burn logic
2016-01-04 07:41:30 +00:00
f6d13b93a4
blame RR
...
[23:27:53] \<%Remie\> you know how it makes inflammable things burn
[23:28:02] \<%Remie\> (and that's buggy as fug but w/e)
[23:28:10] \<%Remie\> what about resetting it after the fire_act() call?
[23:28:21] \<%Remie\> that way inflammable things become inflammable again if they escape the lava
2016-01-03 23:31:33 -08:00
1451db4cc4
does the remie
2016-01-03 23:22:33 -08:00
Kyle Spier-Swenson
Aranclanos
Cheridan
duncathan salt
Bjorn Neergaard
Kole6738
KorPhaeron
KorPhaeron
phil235
Nerd Lord
phil235
tkdrg
AnturK
Remie Richards