688 Commits

Author	SHA1	Message	Date
kevinz000	a01d7260d8	Merge pull request #10641 from jakeramsay007/Calibers-101 ... Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa.	2020-01-23 04:34:24 -07:00
Chayse Ramsay	5e5d80238b	Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa. ... Effectively it means you can load .38 rubber into a .357 revolver to make it less than lethal, or use the various different .38 ammo types.	2020-01-21 22:29:15 +00:00
kevinz000	ed5172f9ca	changes	2020-01-20 23:17:58 -07:00
kevinz000	8f60d01208	Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8	2020-01-20 22:47:21 -07:00
Ghommie	9c0b78bc09	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265	2020-01-18 01:23:08 +01:00
kevinz000	aea0de30d1	Merge pull request #10125 from Ghommie/Ghommie-cit449 ... Ports a few projectile code updates by ke:b:inz.	2020-01-17 15:15:08 -07:00
kevinz000	b0c2e4cbdd	Revert "shotgun pointblanking people actually throws them"	2020-01-15 01:13:26 -07:00
Ghommie	c14439494a	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265	2020-01-12 19:18:03 +01:00
Ghommie	02fbbd4f95	Ouch.	2020-01-12 16:54:08 +01:00
AffectedArc07	16a37e2769	Standardises all files from CRLF to LF	2020-01-12 14:28:01 +00:00
Ghommie	825b4f01c2	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490	2020-01-10 02:26:19 +01:00
Putnam3145	b09ef97ae3	Merge pull request #10305 from BlackMajor/Yeehaw ... Various Mining borg changes. And some extras.	2020-01-07 16:50:21 -08:00
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
kevinz000	39461e2806	Update beams.dm	2020-01-05 15:16:04 -08:00
kevinz000	aca8c33149	Update beams.dm	2020-01-05 15:08:12 -08:00
kevinz000	f26c02801a	Update beams.dm	2020-01-05 15:04:51 -08:00
kevinz000	ab23a934fc	Update beams.dm	2020-01-05 15:01:12 -08:00
Ghommie	686a76dd1d	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265	2020-01-04 13:35:05 +01:00
Ghommie	f5b251db66	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490	2020-01-03 18:24:39 +01:00
Lin	b1ccd512db	Merge pull request #10215 from Ghommie/Ghommie-cit473 ... Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."	2020-01-03 00:00:51 +00:00
BlackMajor	08d042901c	thank you github	2020-01-02 22:16:47 +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
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
Ghommie	49f1176170	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490	2019-12-30 16:06:16 +01:00
kevinz000	310d343242	Merge pull request #10095 from Ghommie/Ghommie-cit443 ... Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.	2019-12-30 00:03:21 -08:00
BlackMajor	375e59a77d	Merge branch 'master' into Yeehaw	2019-12-29 22:12:40 +13:00
BlackMajor	2e03a529bf	checking off the list	2019-12-29 22:11:10 +13:00
BlackMajor	206a5e168a	More mining changes	2019-12-29 20:15:49 +13:00
Ghommie	37441437d1	a	2019-12-28 23:02:28 +01:00
Ghommie	b4c0433d6d	more work.	2019-12-27 17:45:19 +01:00
BlackMajor	4e1a9b83cf	Pushing work for tonight.	2019-12-28 01:01:26 +13:00
Ghommie	d88f50ac15	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265	2019-12-23 05:02:31 +01:00
Ghommie	e74339ce8b	Jfc that's a lot of work!	2019-12-23 04:24:13 +01:00
Ghom	19fc981cc1	Merge pull request #9596 from Linzolle/abductor-update ... Bring abductors up-to-date with /tg/.	2019-12-21 11:15:29 +01:00
Ghommie	9db79ff958	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265	2019-12-20 23:40:21 +01:00
Ghom	d33feb6c35	Merge pull request #9888 from Citadel-Station-13/kevinz000-patch-116 ... The high voltage from tasers can now set people with fire stacks (so things like dousing in fuel) on fire	2019-12-20 14:26:50 +01:00
Linzolle	70e50e57cd	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update	2019-12-17 20:21:49 -06:00
BlackMajor	95c0eddc2a	Merge pull request #10072 from Useroth/new-tg-plants ... Ported bamboo stuff from tg.	2019-12-18 01:02:29 +13:00
Ghommie	5bf252a58c	Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."	2019-12-17 01:57:56 +01:00
BlackMajor	74cc1ec547	Merge pull request #10177 from BlackMajor/FIST ... NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.	2019-12-16 14:14:35 +13:00
Putnam3145	c39a5d0462	Merge pull request #10011 from Arturlang/Bloodsuckers ... Bloodsuckers, or, yknow, vampires.	2019-12-15 14:41:36 -08:00
BlackMajor	59d0376985	finished	2019-12-14 17:31:26 +13:00
BlackMajor	2bf35ec81c	Nuclear fist	2019-12-14 02:15:09 +13:00
Lin	9ec8458803	Merge pull request #9983 from Ghommie/Ghommie-cit408 ... refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.	2019-12-10 23:52:31 +00:00
Putnam3145	5522b3d11d	Merge pull request #10037 from Ghommie/Ghommie-cit421 ... Doubles locomotion circuit ext cooldown. Nerfs gun & pneumatic cannons circuits with sanity checks.	2019-12-09 13:34:23 -08:00