80688df26c
and adds the actual delay
2016-03-25 15:00:35 -04:00
c141cc59a2
updates pills to alow for a delay because inheritance
2016-03-25 14:58:35 -04:00
ec46771fc5
Merge pull request #15921 from Iamgoofball/goon_port
...
Goon Port #1 : Stock Market
2016-03-23 04:42:22 +03:00
156b7487b0
sdasdfadqadqd
2016-03-22 18:28:57 -07:00
57b2faf988
wake me up
2016-03-22 18:25:02 -07:00
88b0f8a87b
aaaaaaaaaaaaaaaaaaaa
2016-03-22 17:37:33 -07:00
6df3dd47d6
Merge pull request #16266 from Lumipharon/botany5001
...
Makes some plants a bit better
2016-03-22 19:24:59 -05:00
d70279e203
Merge branch 'master' of https://github.com/tgstation/-tg-station into goon_port
2016-03-22 16:13:17 -07:00
09c3bb3be1
stock market
2016-03-22 16:09:36 -07:00
b6b8a3eb09
Merge pull request #16260 from Bawhoppen/grenadesholyshithelp
...
Grenade belt for nukeops
2016-03-22 19:35:43 +01:00
6a00718ed0
Merge pull request #16252 from erwgd/PmanJsuitExtgshFix
...
Plasmaman jumpsuit now only extinguishes wearer if they are on fire
2016-03-22 19:27:58 +01:00
0252a01115
Merge pull request #16181 from Jordie0608/goodcodingpracticesarelikeusefulcommentsthisfilehasneither
...
Cleanup of polling code
2016-03-22 19:25:56 +01:00
2a327b1b7b
Merge pull request #16188 from Robustin/zap
...
Singularity beacon now attracts the Tesla Ball
2016-03-22 19:18:45 +01:00
c5746e84ae
Merge pull request #16267 from CPTANT/Staminafixnew
...
fixes #15316 - Stamina resistance being applied twice
2016-03-22 13:03:14 -05:00
9164bbdb20
Merge pull request #16263 from KorPhaeron/mine_turfs
...
Cleans up mining turf code
2016-03-22 13:30:16 -04:00
9862f9b8d4
Layers
2016-03-21 17:08:14 -05:00
4865ca6a7e
a donk
2016-03-21 18:08:05 -04:00
f062e54887
too close must conflict
2016-03-21 17:30:39 -04:00
cfe7af21e7
Mine turf cleanup
2016-03-21 15:55:31 -05:00
6b65866444
Merge pull request #16210 from ChangelingRain/lightningmaster
...
Adds Lightning Holoparasites
2016-03-21 15:34:59 -05:00
7627e1c0e2
Merge pull request #15859 from Core0verload/wall_flash
...
Wall mounted flashes are now buildable
2016-03-21 12:32:55 -05:00
f8a59bb002
Update uplink_item.dm
2016-03-21 10:52:26 -04:00
fbbd5b0259
fixes stamina resistance
2016-03-21 14:49:47 +01:00
acb3941312
Improved various plants and added extra chemicals to others - Being a botanist should now be more FUN.
2016-03-22 00:07:11 +13:00
a29aba94e9
Merge pull request #16206 from JJRcop/JJRcop-patch-1-1
...
buffs milk for skeletons and plasmamen (not stolen)
2016-03-21 03:59:54 -05:00
110c027792
Merge pull request #16245 from MrStonedOne/patch-172
...
Fixes ssair trying to proc unsimulated turfs.
2016-03-21 03:22:02 -05:00
b52e8cb847
Merge pull request #16213 from AnturK/buildmode_fix
...
Fixes buildmode dir
2016-03-21 03:16:31 -05:00
c95e64c17e
Makes mine turfs less garbage
2016-03-21 03:00:51 -05:00
0fafccf9ef
Merge pull request #16178 from KazeEspada/GPStendrils
...
Necropolis Tendrils emit an eerie signal.
2016-03-21 02:53:15 -05:00
bb97cb8a2a
Merge pull request #16237 from PKPenguin321/patch-9
...
tweaks some evil fucking punctuation
2016-03-21 02:16:49 -05:00
5f4b341a4b
fixes and user notification
2016-03-21 16:32:27 +11:00
d31bc85106
Merge pull request #16082 from Core0verload/plants-revengeofGMO
...
Adds a test version of bioengineering
2016-03-21 15:57:40 +11:00
07ca0c9515
compromising is hard
2016-03-20 20:57:50 -05:00
d410b37e2d
more comrpomise
2016-03-20 20:12:36 -05:00
f71de178c0
compromised
2016-03-20 20:10:22 -05:00
83624574e5
tkdrg said to name commits something useful
2016-03-20 19:50:22 -05:00
dae163e814
Merge pull request #16226 from KorPhaeron/tentacle2
...
Anchors goliath tentacles
2016-03-20 19:25:33 -05:00
d7f81ba433
Merge pull request #16190 from KorPhaeron/tastetherainbow
...
Mineral Golems
2016-03-20 18:38:00 -04:00
47c9660b03
plasmaman jumpsuit extinguishes wearer only if they are on fire
2016-03-20 18:01:33 +00:00
c533a17259
Merge pull request #16216 from phil235/CanisterBreakFix
...
Canister breaking open now properly disconnects from possible connect…
2016-03-20 11:47:50 -05:00
ee0b605e22
Merge pull request #16209 from MrStonedOne/1328fix
...
Fixes wall mounted objects under 510.1332 and up.
2016-03-20 14:09:17 +01:00
50fc26edea
Fixes ssair trying to proc unsimulated turfs.
...
An active/excited simulated turf would get deleted and converted to space, so this would change the turf in ssair's active_turfs list to a space turf, then it would runtime trying to call process_cell on it.
before a : and some lack of caring and a type check handled this.
this OOP way seems better.
2016-03-20 03:23:49 -07:00
be1770a475
Merge pull request #16208 from KorPhaeron/cargo_guard
...
Gives sec cargo guard access to the mining station
2016-03-20 01:24:17 -05:00
3bd3ff20ec
adds a couple of naughty missing periods
...
@cheridan uuuu
2016-03-19 23:11:51 -07:00
03198df8a8
removes evil fucking comma from experimentor.dm
...
jesus fuck this thing annoyed me every single god damn time i saw it and i am so glad i am finally removing it
2016-03-19 22:24:03 -07:00
b07f39771b
slow-ass lightning overlords
2016-03-19 23:07:59 -04:00
c6ab8b0041
Merge pull request #16165 from ChangelingRain/cultlock
...
Nar-Sie will now corrupt airlocks, tables, windows, and windoors
2016-03-19 21:58:12 -05:00
46a9de4e43
terrifying lightning overlords
2016-03-19 22:54:09 -04:00
72256282cf
Merge pull request #16162 from KorPhaeron/cats
...
Restores runtime to his original look
2016-03-19 21:48:21 -05:00
9a6e95e336
Merge pull request #16047 from RandomMarine/hallelujah
...
Adds holy hand grenades.
2016-03-19 21:43:48 -05:00
Supermichael777
Razharas
AndrewJacksonThe2nd
KorPhaeron
AnturK
Joan Lung
KorPhaeron
Cheridan
Robustin
CPTANT
Lumipharon
Jordie0608
bawhoppen
Lularian
erwgd
Kyle Spier-Swenson
PKPenguin321