1c64360882
tgui atmos control computers
2016-01-18 14:21:57 -06:00
0a7236d955
Allow relabeling any canister; port MULEbot to tgui
2016-01-18 14:21:56 -06:00
4e0e763cff
Merge pull request #14677 from Buggy123/patch-8
...
Reflectors now give back the materials used to construct it when deconstructed.
2016-01-17 22:01:21 -03:00
4d3b4d8e47
Merge pull request #14684 from Buggy123/patch-11
...
Adds detonation tracking to grenades.
2016-01-17 18:31:27 -03:00
4da17c198b
Never
2016-01-17 16:07:20 -05:00
fa8cc5cd12
Merge pull request #14669 from xxalpha/shingles
...
Objects under rwindows don't break.
2016-01-17 17:30:57 -03:00
6d56fafa1c
fasdasdjaidfhasiufh
...
conflix
fuck that
mistake
Clearer if
2016-01-17 20:14:02 +00:00
84ba5cad1f
Added tracking for who last touched the grenade, and corrected grammar.
2016-01-17 14:44:39 -05:00
bed2037840
Adds detonation tracking to grenades.
2016-01-16 21:58:20 -05:00
c3257ff8fb
Corrected syntax error
2016-01-16 18:19:06 -05:00
01cb4cb340
Reflectors now give back the materials used to construct it when deconstructed.
2016-01-16 18:12:40 -05:00
e4150ac88e
Merge remote-tracking branch 'upstream/master' into shingles
2016-01-16 18:37:40 +00:00
6ff3817a89
Repath windows (oh god), nerf normal windows ex_act.
2016-01-16 18:27:16 +00:00
2cc55c3ba0
Changed floor ex_act to not break grilles & src if under r-windows.
2016-01-16 17:43:33 +00:00
828c1ddf2c
* Generalized AStar check for objects preventing passability
...
* Fixed AStar not detecting plastic flaps as impassable for mobs that can't pass them (fixes #14616 )
2016-01-16 15:27:31 +01:00
4aea0db29b
Merge pull request #14120 from duncathan/listmos
...
[READY] Listmos & "Datum Gases"
2016-01-15 11:58:05 +03:00
bcdb01caba
Merge pull request #14557 from Buggy123/patch-1
...
Graffiti no longer explicitly stated to be drawn with crayons.
2016-01-14 17:04:02 -06:00
9066bc7c4f
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
code/controllers/subsystem/air.dm
code/datums/gas_mixture.dm
code/game/objects/items/devices/scanners.dm
code/modules/mob/living/carbon/human/species.dm
code/modules/mob/living/carbon/life.dm
tgui/assets/tgui.css
tgui/assets/tgui.js
tgui/scripts/interfaces/atmos_filter.ract
2016-01-13 20:07:21 -06:00
fed4212716
Updates guardian HUD button icons.
...
Adds two new holoparasite colors, light purple and crimson.
Replaces silver in the possible holoparasite prefix list with platinum.
Updates descriptions for the guardian types traitors have access to.
Adds glow effects when guardians teleport or recall, including fire guardian teleporting and support guardian teleporting.
2016-01-12 16:39:08 -05:00
692d3a6100
Fuck it just genericize the description.
2016-01-10 18:46:38 -05:00
18bab22f25
New spraypaint decal
2016-01-10 18:23:43 -05:00
ebb7e62edc
Update crayon.dm
2016-01-10 02:54:22 -05:00
30ceab8c19
Spraypainted stuff no longer appears to be drawn with crayons.
2016-01-10 02:33:07 -05:00
03da055f5c
Maybe now it'll compile?
2016-01-10 01:58:44 -05:00
2d6ba27ce8
Update mirror.dm
2016-01-10 01:38:44 -05:00
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
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
4dd308c278
fix
...
glass windows no strong
Affect all levels if in devastating range.
2016-01-09 23:00:24 +00:00
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
990efcbb7a
Merge pull request #14526 from KorPhaeron/virus
...
Fixes virus grenade kit being empty
2016-01-09 18:40:58 -03:00
1d9b334e50
Fixes layers
2016-01-09 15:32:35 -06:00
a35cdae739
Fixes grenade kit as well
2016-01-08 16:03:17 -06:00
b6474aa48f
virus
2016-01-08 15:58:35 -06:00
50bb3263bb
Merge pull request #14485 from lordpidey/Mop_bucket
...
Can put mop in janicart when dry
2016-01-08 18:14:47 -03:00
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
227b3149b2
Merge pull request #14441 from SouDescolado/master
...
Fixes abandoned crates minigame / Also fixes tuberculosis kit
2016-01-08 07:16:22 -06:00
33a9f7cb15
Can put mop in janicart when dry
...
Fixes #5428
2016-01-07 11:02:06 -05:00
83b9ed8e18
Merge pull request #14433 from bgobandit/fixuno
...
Windows now give a message when repaired.
2016-01-07 03:18:48 -03:00
18b9d67ab5
Merge pull request #14364 from swankcookie/cockroach_guts_fix
...
Cockroach guts fix
2016-01-06 22:50:15 -06:00
1ce90959ef
Notify
2016-01-06 22:40:50 -06:00
98d4b9076d
Moves contraband to a more fitting location
...
Signed-off-by: swankcookie <__X__>
2016-01-06 22:12:00 -06:00
d4c3048a31
Removes redundant anchor tags
...
Signed-off-by: swankcookie <__X__>
2016-01-06 22:08:17 -06:00
5d6b18b177
Merge pull request #14446 from KorPhaeron/take_their_boxes_away
...
Fixes cardboard boxes deleting people
2016-01-06 15:52:14 -03:00
cf537737a1
Closets
2016-01-06 12:39:07 -06:00
1e516a68c7
Merge pull request #14347 from Iamgoofball/patch-143
...
Tesla Nerf (shh dont tell aran)
2016-01-06 12:22:05 -06:00
783e669c2d
Fixes Tuberculosis kit
...
Name was wrong
2016-01-06 15:52:38 -02:00
b1dbe47bbf
Windows give a message when repaired.
2016-01-06 01:30:19 -05:00
3b257854f0
Merge pull request #1 from tgstation/master
...
Merge shit
2016-01-05 14:44:37 -02:00
92b3c84a22
Make the code beautiful
...
Less lines, same code.
Trying to fix merge conflict.
Gah
2016-01-05 14:36:39 -02:00
de09f8ee0b
Merge pull request #14306 from MrStonedOne/patch-114
...
Makes pda cartridges use proper type safety.
2016-01-05 05:21:51 -03:00
Bjorn Neergaard
tkdrg
Buggy123
xxalpha
Menshin
Razharas
duncathan salt
Nerd Lord
Cheridan
KorPhaeron
Mike Long
swankcookie
SouDescolado
bgobandit