Cheridan
6c9fa9eb72
Merge pull request #14389 from phil235/VisibleMessageRefactor
...
Refactor the visible_message() proc to be faster in some cases.
2016-01-09 22:16:57 -06:00
tkdrg
7bf3834b5e
Merge pull request #14487 from xxalpha/shingles
...
Floor level objects will now be protected from explosions until they are exposed.
2016-01-09 20:30:02 -03:00
xxalpha
4dd308c278
fix
...
glass windows no strong
Affect all levels if in devastating range.
2016-01-09 23:00:24 +00:00
tkdrg
24b7eaa23a
Merge pull request #14488 from KorPhaeron/wall_layer
...
Walls are a slightly higher layer than floors
2016-01-09 18:41:59 -03:00
tkdrg
990efcbb7a
Merge pull request #14526 from KorPhaeron/virus
...
Fixes virus grenade kit being empty
2016-01-09 18:40:58 -03:00
KorPhaeron
1d9b334e50
Fixes layers
2016-01-09 15:32:35 -06:00
KorPhaeron
a35cdae739
Fixes grenade kit as well
2016-01-08 16:03:17 -06:00
KorPhaeron
b6474aa48f
virus
2016-01-08 15:58:35 -06:00
tkdrg
50bb3263bb
Merge pull request #14485 from lordpidey/Mop_bucket
...
Can put mop in janicart when dry
2016-01-08 18:14:47 -03:00
tkdrg
6c41d0e437
Merge pull request #14468 from KorPhaeron/fuck_off_already
...
Stops defibs/cloners notifying suicides when people are trying to revive them
2016-01-08 18:09:29 -03:00
duncathan salt
227b3149b2
Merge pull request #14441 from SouDescolado/master
...
Fixes abandoned crates minigame / Also fixes tuberculosis kit
2016-01-08 07:16:22 -06:00
Mike Long
33a9f7cb15
Can put mop in janicart when dry
...
Fixes #5428
2016-01-07 11:02:06 -05:00
tkdrg
83b9ed8e18
Merge pull request #14433 from bgobandit/fixuno
...
Windows now give a message when repaired.
2016-01-07 03:18:48 -03:00
duncathan salt
18b9d67ab5
Merge pull request #14364 from swankcookie/cockroach_guts_fix
...
Cockroach guts fix
2016-01-06 22:50:15 -06:00
KorPhaeron
1ce90959ef
Notify
2016-01-06 22:40:50 -06:00
swankcookie
98d4b9076d
Moves contraband to a more fitting location
...
Signed-off-by: swankcookie <__X__>
2016-01-06 22:12:00 -06:00
swankcookie
d4c3048a31
Removes redundant anchor tags
...
Signed-off-by: swankcookie <__X__>
2016-01-06 22:08:17 -06:00
tkdrg
5d6b18b177
Merge pull request #14446 from KorPhaeron/take_their_boxes_away
...
Fixes cardboard boxes deleting people
2016-01-06 15:52:14 -03:00
KorPhaeron
cf537737a1
Closets
2016-01-06 12:39:07 -06:00
Cheridan
1e516a68c7
Merge pull request #14347 from Iamgoofball/patch-143
...
Tesla Nerf (shh dont tell aran)
2016-01-06 12:22:05 -06:00
SouDescolado
783e669c2d
Fixes Tuberculosis kit
...
Name was wrong
2016-01-06 15:52:38 -02:00
bgobandit
b1dbe47bbf
Windows give a message when repaired.
2016-01-06 01:30:19 -05:00
SouDescolado
3b257854f0
Merge pull request #1 from tgstation/master
...
Merge shit
2016-01-05 14:44:37 -02:00
SouDescolado
92b3c84a22
Make the code beautiful
...
Less lines, same code.
Trying to fix merge conflict.
Gah
2016-01-05 14:36:39 -02:00
tkdrg
de09f8ee0b
Merge pull request #14306 from MrStonedOne/patch-114
...
Makes pda cartridges use proper type safety.
2016-01-05 05:21:51 -03:00
Aranclanos
a9ef05807e
Merge pull request #14362 from Bawhoppen/czechbarmanhelp
...
Gives barman back his new gear
2016-01-05 04:52:21 -03:00
Kyle Spier-Swenson
3c5cdbefe3
forgot to typecast properly
2016-01-04 23:42:45 -08:00
duncathan salt
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
Cheridan
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
KorPhaeron
8b08ce8a6b
Better loop
2016-01-04 16:48:11 -06:00
Bjorn Neergaard
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
phil235
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
tkdrg
c13a2f97e5
Merge pull request #14342 from neersighted/tgui_followup
...
More tgui fixes and tweaks
2016-01-04 18:39:52 -03:00
duncathan salt
9a18bf56fc
Merge pull request #14341 from phil235/CremationRuntimeFix
...
Fixes runtime when trying to cremate cockroach
2016-01-04 20:23:49 +01:00
duncathan salt
748e2e3485
Merge pull request #14345 from AnturK/mapjectors
...
Fixes injectors spawned before mutation table is ready
2016-01-04 20:21:48 +01:00
duncathan salt
777302afa5
Merge pull request #14346 from AnturK/chambutts
...
Restores default chameleon projector disguise
2016-01-04 20:20:59 +01:00
Bjorn Neergaard
dc69cbaefb
Allow UIs to be attached to datums; various fixes
2016-01-04 10:46:31 -06:00
swankcookie
a7508350e5
Gives /cleanable.dm "anchored = 1"
2016-01-03 20:43:48 -06:00
MrStonedOne
6632a4c547
fixes explosions
2016-01-03 17:42:04 -08:00
Lularian
cb50a25772
gives barman his cool stuff again
2016-01-03 19:35:49 -06:00
bawhoppen
3543175c51
Revert "fixes attempt two"
2016-01-03 19:05:52 -06:00
tkdrg
473eb8291e
Merge pull request #14216 from Bawhoppen/czechfixes2
...
fixes attempt two
2016-01-03 21:02:20 -03:00
Lularian
f5bc4b6b4f
woops
2016-01-03 17:50:20 -06:00
MrStonedOne
5d86ed49f6
Merge conflic fix
2016-01-03 14:51:14 -08:00
Iamgoofball
e1828f363e
nerfs machine bounce range
2016-01-03 10:25:10 -08:00
AnturK
bbaca08f74
Restores default chameleon projector disguise
2016-01-03 19:19:17 +01:00
AnturK
ff6d88f4e6
Fixes injectors spawned before mutation table is ready
2016-01-03 18:49:10 +01:00
phil235
78295d8238
Fixes runtime when trying to cremate an animal that deletes itself upon death (mouse, cockroach).
2016-01-03 18:11:18 +01:00
Razharas
10b74eb793
Merge pull request #14174 from Buggy123/Buggy123-IEDBUFF2
...
Buffs IEDS 2: electric boogaloo
2016-01-03 13:17:42 +03:00
KorPhaeron
8a72f5a55c
Fixes cyborg teleport
2016-01-03 04:11:19 -06:00