Commit Graph

353 Commits

Author SHA1 Message Date
kevinz000 826ed7d4f2 o k. 2020-02-07 23:39:09 -07:00
kevinz000 f8d5eae0c3 Update gravity.dm 2020-02-07 16:24:12 -07:00
kevinz000 673079f995 Update gravity.dm 2020-02-07 03:31:15 -07:00
Ghommie 0703c6eea6 First tweak to cargo reagents selling. 2020-02-06 22:34:54 +01:00
kevinz000 3d7fef76f3 Update sniper.dm 2020-02-05 05:57:16 -07:00
kevinz000 6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Ghommie a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +01:00
necromanceranne 66862db7ab Last change to this, now the damage is respected by energy armor 2020-02-01 14:07:23 +11:00
necromanceranne f9d6a9b9c4 Added the tweaks suggested by kevin but good fucking lord this changes a lot and also fuck the pka reload proc 2020-01-29 14:23:50 +11:00
kevinz000 611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
necromanceranne 5e7b7143de Additional adjustments, added more damage to the mini ebow becaues I forgot to do that originally and made large ebows bulky and heavy weapons 2020-01-27 11:48:56 +11:00
necromanceranne 8e489a7726 Hopefully I put in the override correctly 2020-01-27 10:41:27 +11:00
necromanceranne 5ce066a21e Altering the effects of the ebow to hopefully make it not terrible 2020-01-26 17:18:09 +11:00
kevinz000 8f60d01208 Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8 2020-01-20 22:47:21 -07:00
kevinz000 f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
kevinz000 7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000 45c92bcb6f s 2020-01-15 19:07:47 -07: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 7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08: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 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 375e59a77d Merge branch 'master' into Yeehaw 2019-12-29 22:12:40 +13:00
BlackMajor 206a5e168a More mining changes 2019-12-29 20:15:49 +13: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 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
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
Ghommie 5bf252a58c Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls." 2019-12-17 01:57:56 +01:00
BlackMajor 59d0376985 finished 2019-12-14 17:31:26 +13:00
BlackMajor 2bf35ec81c Nuclear fist 2019-12-14 02:15:09 +13:00
Ghommie 723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +01:00
Linzolle cc54e5230f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-11-25 21:01:25 -06:00
nik707 6d889e66c4 Merge pull request #9720 from Citadel-Station-13/kevinz000-patch-111
Is it the time of year to buff disablers again?
2019-11-20 22:51:11 -06:00
kevinz000 25efd11d9a Update code/modules/projectiles/projectile/energy/stun.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-11-20 21:44:17 -07:00
kevinz000 ab846bc584 Update stun.dm 2019-11-20 13:54:57 -07:00
Lin 6aa6eaafe6 Merge branch 'master' into abductor-update 2019-11-15 23:24:51 +00:00
GrayRachnid 3edaf75722 Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons. 2019-11-15 16:58:45 -05:00
kevinz000 dfa2296758 Merge pull request #9430 from Ghommie/Ghommie-cit220
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
2019-11-14 15:44:59 -07:00