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 |
|
Lularian
|
5931214cf7
|
did i duck it up
|
2016-01-03 00:20:18 -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 |
|
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 |
|
tkdrg
|
e88bf4e2b5
|
Merge pull request #14084 from MrStonedOne/GOOOOOF
Upgrades do_after and progress bars.
|
2015-12-28 14:35:34 -03: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 |
|
tkdrg
|
3d75589f02
|
Merge pull request #13689 from KorPhaeron/volcanic_rocks
Volcanic Rocks
|
2015-12-18 03:27:02 -03:00 |
|
oranges
|
134a76cc8f
|
Line ending apocalypse
|
2015-12-17 14:12:37 +13:00 |
|
MMMiracles
|
cde4df61ae
|
conFLICTS
|
2015-12-16 06:26:54 -05:00 |
|
Jordie
|
b8925a1b49
|
Merge pull request #13621 from xxalpha/airlox
Added maintenance glass airlock and external glass airlock.
|
2015-12-16 21:34:24 +11:00 |
|
KorPhaeron
|
571d30a25c
|
Volcanic rocks
|
2015-12-15 23:31:14 -06:00 |
|
MMMiracles
|
392ca2a505
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold
|
2015-12-15 16:54:22 -05:00 |
|
MMMiracles
|
d07f300063
|
i did things
|
2015-12-15 16:46:24 -05:00 |
|
xxalpha
|
e9e4ff735d
|
Added maintenance glass airlock and external glass airlock.
|
2015-12-14 00:48:01 +00:00 |
|
KorPhaeron
|
d8a37204e7
|
Makes burn_state use defines
|
2015-12-13 05:36:55 -06:00 |
|
KorPhaeron
|
0ece383776
|
Fixes girders on low layer
|
2015-12-11 02:29:46 -06:00 |
|
MMMiracles
|
f222dfe36e
|
mostly final changes, wowzers
|
2015-12-08 21:20:31 -05:00 |
|
MMMiracles
|
c384aae4c3
|
more map edits, loot table balancing, bug fixes, also ATV VROOM VROOM
|
2015-12-08 00:43:53 -05:00 |
|
MMMiracles
|
6c685d6d67
|
wew
|
2015-12-06 02:14:26 -05:00 |
|
MMMiracles
|
8ab579cb21
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold
Conflicts:
icons/mob/animal.dmi
|
2015-12-04 18:55:10 -05:00 |
|
MMMiracles
|
6ac96194ba
|
snow stuff.
|
2015-12-04 18:52:17 -05:00 |
|
Vincent
|
6f6968773b
|
Fixes #13418
|
2015-12-03 22:46:56 -05:00 |
|
MMMiracles
|
77b36e2415
|
iced windows, more ice variants of shit in general.
more stuff, ice everything.
wew
conflict fix
|
2015-12-01 16:45:09 -05:00 |
|
Vincent
|
bf530cc3dd
|
Fixes untouchable windows
Sorry about that. Fixes #13354
|
2015-12-01 11:54:09 -05:00 |
|
Vincent
|
16303c1c1f
|
Changes flag name from ABSTRACT to NODECONSTRUCT
Removes holo-tables and holo-windows since those typepaths are no longer needed.
Updates Z2 to reflect this. Removes spurious tag tags in Z2.
|
2015-11-30 20:26:03 -05:00 |
|
Vincent
|
b31b5e3f77
|
Fix Conflicts:
code/game/machinery/doors/windowdoor.dm
|
2015-11-30 18:56:43 -05:00 |
|
Razharas
|
78c95ab035
|
Merge pull request #13317 from neersighted/airlock_electronics
NanoUI Airlock Electronics
|
2015-11-30 20:43:33 +03:00 |
|
Vincent
|
05ae680b06
|
Fixing conflicts:
code/game/machinery/computer/computer.dm
code/game/machinery/doors/windowdoor.dm
code/game/objects/structures/window.dm
|
2015-11-29 19:02:30 -05:00 |
|
Bjorn Neergaard
|
f214e547cb
|
NanoUI Airlock Electronics
Also reworks a lot of the AE code.
|
2015-11-29 11:32:56 -06:00 |
|
Jordie
|
38eddb1421
|
Merge pull request #13179 from AnturK/academy
Wizard Academy Away Update
|
2015-11-29 21:06:34 +11:00 |
|
Jordie
|
da0c466f82
|
Merge pull request #13149 from Firecage/toolspeed
Adds toolspeed
|
2015-11-29 21:06:15 +11:00 |
|
Cheridan
|
2abaa2b0f1
|
Merge pull request #13045 from KorPhaeron/laserbox
Fixes reflector structure being on a low layer
|
2015-11-28 20:42:21 -06:00 |
|