Commit Graph

1224 Commits

Author SHA1 Message Date
silicons 384e5ae311 Merge branch '13167' 2020-08-16 18:51:48 -07:00
silicons 53fe2c95c5 Merge branch 'pr-13122' 2020-08-16 18:45:01 -07:00
Detective-Google 13f6df3991 nerfs plasma cutters 2020-08-14 19:38:14 -05:00
Trilbyspaceclone 1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
lolman360 3aba9eb5a6 kee 2020-08-12 15:11:55 +10:00
Hatterhat eeefc1cbaa heho woundies 2020-08-11 16:01:29 -05:00
lolman360 8c70b56706 whoops 2020-08-11 19:04:59 +10:00
lolman360 472ef6165f imamurderer 2020-08-11 18:52:26 +10:00
silicons a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
2020-08-11 01:47:32 -07:00
Hatterhat 8370a31942 funny adminspawn wound bullets 2020-08-10 12:12:32 -05:00
silicons 6876edbd85 Merge pull request #12992 from Hatterhat/rifle-book-pt2
unatomic as shit PR about nukie guns
2020-08-06 19:40:09 -07:00
TrilbySpaceClone 3ae10ac826 update? 2020-08-06 13:09:41 -04:00
silicons 0a36f9fbb5 changes 2020-08-04 22:40:28 -07:00
timothyteakettle a3b3e23bac fix ricochets 2020-08-04 23:41:55 +01:00
Timothy Teakettle ef53f3faea the old system isnt needed really but sure i guess 2020-08-04 11:43:15 +01:00
Hatterhat 25ab96cf53 funny revolver reskins 2020-08-03 20:39:06 -05:00
Timothy Teakettle 91664f5064 bracket 2020-08-03 22:17:35 +01:00
Timothy Teakettle 3a0b34fb1b funny aim go brr 2020-08-03 21:58:58 +01:00
Timothy Teakettle 8a3e69d32f no more inaccuracy 2020-08-03 21:40:10 +01:00
silicons 42db990836 why am i doing this 2020-08-03 13:37:37 -07:00
Timothy Teakettle 2153f9ea35 i too, want people to be hit their ricochets 2020-08-03 17:36:40 +01:00
Trilbyspaceclone e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
Timothy Teakettle 9b34407c9f uplink 2020-08-03 15:27:17 +01:00
Timothy Teakettle 2bbe4631d6 working ricochets 2020-08-03 14:46:24 +01:00
Timothy Teakettle 0bf9553eca hmm 2020-08-02 19:13:39 +01:00
Timothy Teakettle 03d01d917f Merge branch 'master' into wounds-part-2 2020-08-02 18:10:31 +01:00
Hatterhat 6a5e26eb1c unatomic as shit 2020-08-01 12:31:13 -05:00
silicons f02bc4a572 Update toy.dm 2020-07-29 19:49:11 -07:00
Timothy Teakettle 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Lin bbffd41d55 Merge pull request #12883 from Citadel-Station-13/silicons-patch-49
beam rifles are now practical in emitters
2020-07-28 22:05:39 -05:00
Lin 81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
Trilbyspaceclone ccca78a1ca Update spellcard.dm 2020-07-28 00:34:32 -04:00
Trilbyspaceclone 3a6d72af54 Update spellcard.dm 2020-07-28 00:20:14 -04:00
Trilbyspaceclone c8fff28395 Update spellcard.dm 2020-07-28 00:12:00 -04:00
Lin 87eac49bbf Merge pull request #12862 from Citadel-Station-13/silicons-patch-44
you can now shoot yourself with a gun by using disarm intent will this cause balance issues maybe do i care not really
2020-07-27 11:46:37 -05:00
Lin 2514f4111d Merge pull request #12900 from Citadel-Station-13/silicons-patch-53
drops 1.5 second taser alt fire delay to normal fire rate (0.4 seconds)
2020-07-27 11:43:31 -05:00
Ghom 4fad4ad969 Merge pull request #12888 from Citadel-Station-13/silicons-patch-50
sorry gamers, no more self healing with a medbeam
2020-07-27 15:27:07 +02:00
silicons 1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons 2a29f73ac8 ok 2020-07-25 17:34:12 -07:00
silicons 23465355d0 Update stun.dm 2020-07-24 22:16:06 -07:00
timothyteakettle 3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
timothyteakettle 8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons 1c4249c99d Update medbeam.dm 2020-07-24 00:57:30 -07:00
silicons f47a7449e3 Update gun.dm 2020-07-23 18:52:23 -07:00
silicons 0b4185e26f Update beam_rifle.dm 2020-07-23 18:52:18 -07:00
silicons ce18584fb1 Update beam_rifle.dm 2020-07-23 18:47:22 -07:00
silicons 99737b6e11 Update projectile.dm 2020-07-23 18:35:32 -07:00
Lin 1f7488aad2 Merge pull request #12821 from Citadel-Station-13/silicons-patch-36
Increases projectile speed across the board by around 40-45%
2020-07-23 13:41:17 -05:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00