cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,276 Commits 5 Branches 0 Tags
67eaef488693c5af1a2d8ed57ffce4f589d11d0e
Commit Graph

980 Commits

Author SHA1 Message Date
Nadyr
67eaef4886 Merge branch 'master' into upstream-merge-11464 2021-08-25 23:32:47 -04:00
Nadyr
2797027a41 Merge branch 'master' into upstream-merge-11426 2021-08-25 22:49:43 -04:00
Nadyr
f19dc1b2eb Merge pull request #2874 from cadyn/upstream-merge-11421 
Merge Upstream Pull Request 11421
 2021-08-25 22:38:53 -04:00
Aronai Sieyes
af8d866e1b Upstream-11426 2021-08-24 21:10:42 -07:00
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Aronai Sieyes
e19a87e44a Upstream-11408 2021-08-24 21:09:43 -07:00
Aronai Sieyes
680587480a Merge pull request #11449 from VOREStation/upstream-merge-8182 
[MIRROR] New Shotguns/Rifles
 2021-08-24 23:59:42 +00:00
Chompstation Bot
593dd3ea79 Stun Revolver Fix 2021-08-24 23:58:41 +00:00
Rykka
096b64ffb1 Changes all pistols to move_delay = 0 via CHOMPEdits 
Some of these are probably redundant, I did this quickly in response to a request so it could get in before an event.

I'll do a more thorough move_delay lookover later and determine what weapons should be fire-able on the move vs not.
 2021-08-18 14:59:37 -07:00
Rykka
54b0844ff4 Adds custom firing sounds for weapons - Serdy's Request 
AKM Variants all use ak74.ogg
Glock uses 9mmpistol.ogg
VP70 uses 40pistol.ogg
Molniya uses molniyab.ogg
Plamya uses plamya.ogg
SKS uses sks.ogg
Type 901 uses type901.ogg
Vityaz uses vityaz.ogg
 2021-08-18 14:07:26 -07:00
cadyn
0ab03cf119 fix open bolt guns 2021-08-15 02:55:41 -07:00
Nadyr
47c017bbc0 Merge pull request #2785 from CHOMPStation2/BallisticsAgain 
Ballistics again
 2021-08-14 21:50:46 -04:00
Razgriz
5d23c0d5b6 Bring back ballistics 
Now with ez "use old damages" change.
 2021-08-12 21:45:10 -07:00
Razgriz
dddeb35523 I used the shotgun 2021-08-12 21:11:09 -07:00
Aronai Sieyes
b2fb505121 Merge pull request #11347 from ResidentCody/phoron-bore-shoots-slower 
Phoron Bore - Adds Hefty Recoil When Firing
 2021-08-06 22:14:42 +00:00
Chompstation Bot
9acfa8fcca SMART Rifle 2021-08-05 21:48:45 +00:00
Darlantan
9604899135 Revert ballistics overhaul 2021-07-30 21:25:04 -04:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Aronai Sieyes
0f547b6314 Merge pull request #11149 from VOREStation/Arokha/bows2 
Bows do damage
 2021-07-19 21:40:58 +00:00
Nadyr
5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Nadyr
3320513c69 Merge pull request #2561 from CHOMPStationBot/upstream-merge-11098 
[MIRROR] Add bows, recipe for wooden one
 2021-07-15 20:56:26 -04:00
Chompstation Bot
3d2783aec7 Ports new Bay SolGov suits as Commonwealth suits 2021-07-15 19:29:34 -04:00
Chompstation Bot
5843c3776e Add bows, recipe for wooden one 2021-07-15 22:13:21 +00:00
Chompstation Bot
16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
Nadyr
7ddc05bfda powder that makes you say yes 2021-07-09 21:57:23 -04:00
Nadyr
73196eaa8c powder that makes you say yes 2021-07-09 21:55:45 -04:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Nadyr
babb859f5f powder that makes you say yes 2021-07-03 22:11:19 -04:00
Nadyr
6baa72b9e7 Merge pull request #2367 from CHOMPStationBot/upstream-merge-10819 
[MIRROR] Swap some guns for Eris ones
 2021-07-03 20:46:52 -04:00
Aronai Sieyes
bfb7428426 Merge pull request #10819 from VOREStation/Icons/guns 
Swap some guns for Eris ones
 2021-07-03 21:14:00 +00:00
Aronai Sieyes
30a01c6490 Merge pull request #10792 from VOREStation/Arokha/portamed 
Eris portable freezer, medical briefcase
 2021-07-03 20:26:49 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Razgriz
21e967898d Merge pull request #2275 from CHOMPStationBot/upstream-merge-10729 
[MIRROR] Netgun Upgrade
 2021-06-25 00:43:28 -07:00
Razgriz
48bf05e801 powder that makes you say yes 2021-06-25 00:27:42 -07:00
Razgriz
878ff0b936 powder that makes you say yes 2021-06-24 17:44:08 -07:00
Chompstation Bot
7736ba260f Netgun Upgrade 2021-06-23 16:30:49 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Razgriz
123c2666bb please become funny 2021-06-20 22:29:51 -07:00
Razgriz
4636e0ba2d please become unshit 2021-06-20 22:28:40 -07:00
Nadyr
424575d5d6 powder that makes you say yes 2021-06-20 21:07:35 -04:00
Chompstation Bot
5160052a5d stops handbow changes overiding engery bow 2021-06-20 21:44:15 +00:00
Razgriz
40be458a88 Add files via upload 2021-06-19 20:25:14 -07:00
Nadyr
678de50987 Merge pull request #2211 from CHOMPStationBot/upstream-merge-10657 
[MIRROR] adds the phaser handbow
 2021-06-19 21:20:22 -04:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Novacat
fafe1bc65c Merge pull request #10657 from TheDavestDave/phaser-handbow 
adds the phaser handbow
 2021-06-17 19:50:01 +00:00
Nadyr
d02804affe powder that makes you say yes 2021-05-31 22:20:02 -04:00
Chompstation Bot
78acd45edc Remove extra asterisks from rune audible messages 2021-05-31 17:26:54 +00:00