17693 Commits

Author	SHA1	Message	Date
BlackMajor	05a644cc41	Revert "Merge branch 'master' into Yeehaw" ... This reverts commit 972c03f79f, reversing changes made to 8ebd698763.	2020-01-08 12:26:45 +13:00
BlackMajor	972c03f79f	Merge branch 'master' into Yeehaw	2020-01-08 12:25:50 +13:00
BlackMajor	b41c9cd844	Sync with master	2020-01-08 12:25:22 +13:00
BlackMajor	5a97259ba9	Fix a couple of bugs, add wrapping paper and destination tagger	2020-01-07 15:33:16 +13:00
BlackMajor	a4d2ea0281	Small fix	2020-01-03 22:39:58 +13:00
BlackMajor	dd68be6d31	IM NOT TRYING TO EDIT CARBON.DM GITHUB, PLEASE.	2020-01-02 22:20:54 +13:00
BlackMajor	8e5b7c1cba	Get outta here	2020-01-02 22:17:56 +13:00
BlackMajor	08d042901c	thank you github	2020-01-02 22:16:47 +13:00
BlackMajor	da3ab71222	Revert "Revert "Revert "Revert "Merge branch 'master' into Yeehaw"""" ... This reverts commit 74a646490f.	2020-01-02 22:16:09 +13:00
BlackMajor	74a646490f	Revert "Revert "Revert "Merge branch 'master' into Yeehaw""" ... This reverts commit 189e1af175.	2020-01-02 22:15:40 +13:00
BlackMajor	189e1af175	Revert "Revert "Merge branch 'master' into Yeehaw"" ... This reverts commit 1b25996e55.	2020-01-02 22:15:36 +13:00
BlackMajor	1b25996e55	Revert "Merge branch 'master' into Yeehaw" ... This reverts commit 490fb3ab61, reversing changes made to aabb39a364.	2020-01-02 22:15:31 +13:00
BlackMajor	490fb3ab61	Merge branch 'master' into Yeehaw	2020-01-02 22:13:52 +13:00
BlackMajor	aabb39a364	Revert "Merge branch 'master' into Yeehaw" ... This reverts commit 30e3edaac1, reversing changes made to 62c8fce043.	2020-01-02 22:06:31 +13:00
BlackMajor	30e3edaac1	Merge branch 'master' into Yeehaw	2020-01-02 22:03:58 +13:00
BlackMajor	3239acf74d	Sync	2020-01-02 22:02:55 +13:00
kevinz000	67d9923ff7	Merge pull request #10371 from kappa-sama/patch-15 ... call of duty loot boxes	2020-01-01 22:08:20 -08:00
kevinz000	16172f68aa	Merge pull request #10366 from Hatterhat/beaker-buff ... beaker buff - alt title fuck hypovials and fuck making them free and better alternatives to beakers	2020-01-01 22:07:40 -08:00
kevinz000	e771ea9066	Merge pull request #10374 from Trilbyspaceclone/patch-260 ... [s] Fixes Dragon's Tooth Sword 50% armor penetration by making it 35%	2020-01-01 22:07:18 -08:00
nik707	a881231149	Merge pull request #10395 from Hatterhat/shit-and-cum ... space cola isnt a reagent idiot, codeside change only	2020-01-01 20:45:33 -06:00
Hatterhat	1195762f86	space cola isnt a reagent idiot	2020-01-01 20:37:09 -06:00
nik707	1e6a485976	Merge pull request #10368 from Hatterhat/orm-laser-fix-question-mark ... ORM lasers actually affect point return	2020-01-01 20:32:48 -06:00
nik707	75d5e324ec	Merge pull request #10379 from Hatterhat/tg-47443-shotgunpbs ... shotgun pointblanking people actually throws them	2020-01-01 20:32:16 -06:00
nik707	e232b13119	Merge pull request #10369 from Hatterhat/patch-4 ... crusher trophy drop chance increase	2020-01-01 20:28:35 -06:00
nik707	be9912227f	Merge pull request #10372 from Hatterhat/the-one-with-the-forcefields ... forcefield projectors on toolbelts, cool and good sprites for atmos holofan/forcefield proj	2020-01-01 20:28:15 -06:00
Lin	c836889944	Merge pull request #10370 from Hatterhat/blood-drunk-cripple-bad ... blood drunk buff probably shouldnt cripple you	2020-01-01 21:21:39 +00:00
Hatterhat	200de62b8e	tweaks transfer amounts, uncucks hypovials	2020-01-01 08:50:15 -06:00
kevinz000	68bc6dcc2a	Update megafauna.dm	2020-01-01 02:43:43 -08:00
Hatterhat	0374870c41	bulldogs knockback too	2020-01-01 02:04:03 -06:00
Hatterhat	318a6812c3	manually copied tgstation#47443	2019-12-31 21:38:11 -06:00
kevinz000	ec67a38093	Merge pull request #10330 from keronshb/keronnanite ... More nanites from /tg/station	2019-12-31 19:32:05 -08:00
kevinz000	c222ea0bb3	Merge pull request #10356 from deathride58/sprintprefs ... Adds space to sprint and toggle sprint as preferences	2019-12-31 19:29:47 -08:00
kevinz000	1051d99fdf	Merge pull request #10361 from CameronWoof/fashion-ghosts ... Ghost Cafe patrons now spawn with chameleon kits	2019-12-31 19:28:55 -08:00
CameronWoof	58e50de434	grampa ghommles doesn't like kids and their newfangled technology and also the VA denied his claim and now he hates bureaucracy	2019-12-31 17:44:18 -08:00
Lin	b651bbcdb3	Merge branch 'master' into Ghommie-cit367	2019-12-31 22:37:59 +00:00
Ghom	cba4bc27ef	Merge pull request #10349 from KathrinBailey/CE-locker ... CE Locker Vengeance: The Removaling + Welding locker consistency changes + Empty lockers for mappers	2019-12-31 18:01:23 +01:00
KathrinBailey	243aebe12a	dab 2x	2019-12-31 16:54:59 +00:00
KathrinBailey	0a19f62fa9	dab	2019-12-31 16:45:06 +00:00
KathrinBailey	f2e9ba2a8e	Makes lockers into subtypes ... Adds new lockers cleanly at the bottom instead and as subtypes.	2019-12-31 16:41:23 +00:00
Ghom	93e090d229	Merge pull request #10309 from Seris02/disablerglasses ... disabler sechuds, let the adminbus commence	2019-12-31 14:43:39 +01:00
Ghom	4660465115	Merge pull request #10362 from Trilbyspaceclone/patch-258 ... Corrects bottle/pill/patch/condiments "#$39;"	2019-12-31 14:39:34 +01:00
Ghom	0453363d4c	Merge pull request #10345 from Trilbyspaceclone/patch-256 ... Buffs bandoliers to hold more types of casings.	2019-12-31 14:36:53 +01:00
Ghom	78e4c608ad	Merge pull request #10319 from Seris02/coconutsyep ... porting azarak's coconuts from hyper station	2019-12-31 13:16:07 +01:00
BlackMajor	8085022d97	Couple of changes. Starting on the point bank.	2019-12-31 23:28:30 +13:00
Trilbyspaceclone	c81d0e8b66	Update energy.dm	2019-12-31 05:25:12 -05:00
Hatterhat	5a497b02ac	hey i'm WALKIN here	2019-12-31 01:56:01 -06:00
kappa-sama	c0bc53ea81	more	2019-12-31 01:43:42 -05:00
kappa-sama	970814adbc	it begins	2019-12-31 01:42:07 -05:00
Hatterhat	76e789d3d1	getting limb crippled is a 4head bruh	2019-12-31 00:14:52 -06:00
Hatterhat	4c5f6f895b	tgstation 42481	2019-12-31 00:07:36 -06:00