tkdrg
fa8cc5cd12
Merge pull request #14669 from xxalpha/shingles
...
Objects under rwindows don't break.
2016-01-17 17:30:57 -03:00
xxalpha
6d56fafa1c
fasdasdjaidfhasiufh
...
conflix
fuck that
mistake
Clearer if
2016-01-17 20:14:02 +00:00
xxalpha
e4150ac88e
Merge remote-tracking branch 'upstream/master' into shingles
2016-01-16 18:37:40 +00:00
xxalpha
6ff3817a89
Repath windows (oh god), nerf normal windows ex_act.
2016-01-16 18:27:16 +00:00
xxalpha
2cc55c3ba0
Changed floor ex_act to not break grilles & src if under r-windows.
2016-01-16 17:43:33 +00:00
Menshin
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
duncathan
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
Buggy123
03da055f5c
Maybe now it'll compile?
2016-01-10 01:58:44 -05:00
Buggy123
2d6ba27ce8
Update mirror.dm
2016-01-10 01:38:44 -05: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
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
KorPhaeron
cf537737a1
Closets
2016-01-06 12:39:07 -06: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
Aranclanos
a9ef05807e
Merge pull request #14362 from Bawhoppen/czechbarmanhelp
...
Gives barman back his new gear
2016-01-05 04:52:21 -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
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
Lularian
f5bc4b6b4f
woops
2016-01-03 17:50:20 -06:00
MrStonedOne
5d86ed49f6
Merge conflic fix
2016-01-03 14:51:14 -08: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
Lularian
5931214cf7
did i duck it up
2016-01-03 00:20:18 -06:00
MrStonedOne
b50e8d2a63
removes a bunch of unneeded spawns
...
spawns have a high overhead.
I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
duncathan
b18c6c2c5c
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
nano/assets/nanoui.js
nano/bower.json
nano/templates/atmos_filter.dot
2016-01-02 18:02:54 -06:00
tkdrg
7717aa27d1
Merge pull request #14244 from AnturK/tubefix
...
Fixes diagonal transit tube flipping
2016-01-02 13:50:32 -03:00
tkdrg
e28576b1ce
Merge pull request #14207 from KorPhaeron/spike
...
Meat spiking someone removes the grab from your hand
2016-01-01 16:32:56 -03:00
AnturK
1cdafe8a1d
Fixes transit tube flipping
2016-01-01 13:39:43 +01:00
Cheridan
cb27e966eb
Merge pull request #14144 from TheRealGLH/electric_chair
...
Containment fields and electric chairs now use electrocute_act
2015-12-31 19:01:52 -06:00
bawhoppen
3f5101d84d
oops?
2015-12-31 16:39:28 -06:00
Lularian
8e8526fd14
did I do it mum
2015-12-31 16:37:22 -06:00
KorPhaeron
7fd33d23a5
Meat spike
2015-12-31 12:50:05 -06:00
TheRealGLH
9cb962cbc1
removes argument that did not need to be specified
2015-12-30 09:34:42 +01:00
duncathan
17f167bcb7
associative list
2015-12-29 13:33:12 -06:00
TheRealGLH
d7097594ff
removes the burn_skin proc
...
removes the burn_skin proc
2015-12-29 13:48:38 +01:00
Martijn Daniels
a7865bd9cf
electrocute_act
...
Changes containment field and electric chair effects to use
electrocute_act
2015-12-29 13:36:16 +01:00
tkdrg
2d990ea834
Merge pull request #14076 from RemieRichards/VehicleFramework
...
Simple Vehicle Framework
2015-12-28 19:41:59 -03:00
duncathan
cc9c5768ca
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
code/datums/gas_mixture.dm
2015-12-28 13:59:16 -06:00
tkdrg
e88bf4e2b5
Merge pull request #14084 from MrStonedOne/GOOOOOF
...
Upgrades do_after and progress bars.
2015-12-28 14:35:34 -03:00
duncathan
b18cb5fca8
making shit compile
2015-12-28 08:31:20 -06:00
tkdrg
f6db2f4ac9
Merge pull request #14067 from AnturK/mulecratefix
...
Fixes mulebot crates
2015-12-27 14:21:47 -03:00
MrStonedOne
5f68bedcd1
Upgrades do_after and progress bars
2015-12-26 21:04:19 -08:00
Remie Richards
bd22fc8c6d
Converted janicarts into a simple to use vehicle framework with customisable speed, converted all existing vehicles to the new framework, added a atv type with a turret on it.
2015-12-26 22:54:15 +00:00
AnturK
af70509257
Fixes mulebot crates
2015-12-26 17:24:16 +01:00
KorPhaeron
64bc7ee1e1
Detective starts with his bowman on
2015-12-25 02:14:19 -06:00
tkdrg
130a4e0242
Merge pull request #13877 from LanCartwright/thesethingsdontgrowontreesyouknow
...
Removes Bulldogs from roundstart syndicate ship
2015-12-24 22:21:55 -03:00
Akke
5821dd81ad
we dont have a shotgun tree you know
2015-12-21 13:37:31 +00:00
Incoming
1e7fcd3e9f
unbricks the rpgloot event.
...
fixes a rare issue with the imposter event.
2015-12-20 01:15:03 -05:00
