cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,761 Commits 9 Branches 0 Tags
f0b51aba36717e7db2b0e1d1a0d5b2d956837ca0
Commit Graph

184 Commits

Author SHA1 Message Date
LordSaladin
b443ea1cb8 fixes the laws of thermodynamics for .45 LC i hope 
god imagine having to add mat values for all of these other bullets
 2022-05-05 16:36:49 +01:00
LordSaladin
5fa1cfaa28 adds .45 LC to the autolathes 
now you can be a real space cowboy
 2022-04-20 19:45:16 +01:00
Ocelot
fc6c0038fe oops 
forgot a few things
 2022-04-08 07:30:51 -04:00
Ocelot
114dbb73a3 more gun tweaks 
added nonlethal magazines, magazines that were missing, changed a few things, and added the Colt SAA.
 2022-04-08 07:08:39 -04:00
Ocelot
77d7259a59 fuck 2 electric boogaloo 
gun gun gun gun gun
 2022-04-06 11:26:19 -04:00
Ocelot
d4f24ccc2a Guns 3: The un-oofening 
see https://github.com/CHOMPStation2/CHOMPStation2/issues/3068 for a general idea of what i fixed
 2022-04-06 10:10:11 -04:00
Casey
51bd77e5c2 Firearms 1 2022-03-26 03:56:42 +00:00
Casey
dc618675c1 Shotguns and Bolt-Action Rifles 2022-03-21 09:54:13 +00:00
Casey
8e0552a788 Colts, Revolvers, and Tasers 2022-03-20 03:10:23 +00:00
Casey
acf0aa858d Merge pull request #12421 from GhostActual/Donk-Co.-Toys 
Foam Dart Fix
 2022-03-12 17:29:48 +00:00
Casey
80f5298a18 Ammo Boxes 2022-03-03 21:23:43 +00:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00
Casey
a8d3dce15f Merge pull request #12122 from VOREStation/upstream-merge-8385 
[MIRROR] Adds caseless BB rounds for common gun types
 2022-02-03 06:28:45 +00:00
BlackMajor
dbb5a4083b more progress 2021-12-07 01:46:21 +13:00
Cadyn Bombaci
4b5d036662 WIP new guns 2021-09-26 10:28:09 -07:00
Razgriz
d160a8528c Fix m41 magazine caliber 2021-08-12 22:30:31 -07:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
d76e756e5f [MIRROR] Reverts recipe changes from Industrial Expansion 2021-05-27 17:17:01 +00:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Cadyn
d93a3dac65 Ballistics v4 2021-02-04 01:56:16 -08:00
Cadyn
35543399cd Ballistics v3.2 2021-01-19 17:31:36 -08:00
izac112
9d8f2623de More thingus 2020-09-14 14:09:52 +02:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Atermonera
b2250d9b47 Improvements to mech missiles. 2020-08-25 19:16:57 -04:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Mechoid
c20bab52d4 Exosuit Modular Internals, The Squeakening 2020-08-05 19:22:23 -04:00
SplinterGP
7a2de0520d Weapons changes 2020-07-20 22:12:01 -03:00
izac112
0f05106e95 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-15 12:27:54 +02:00
Cerebulon
f1f2196077 Flavour Enhancement: Guns 2020-07-13 23:06:11 -04:00
izac112
0d1fe7d706 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-30 16:01:43 +02:00
Aronai Sieyes
39935255e4 VS: KHI rail pistol 2020-05-28 16:47:50 -04:00
Aronai Sieyes
cff9440d2e Tweak railguns, add flechette pistol 2020-05-28 16:47:07 -04:00
izac112
9bbc812fdf more touch ups 2020-05-25 15:53:16 +02:00
izac112
7339c768ea mag and round cleanup 2020-05-25 15:47:44 +02:00
izac112
2461737756 No idea why its called boxes 2020-05-25 15:31:11 +02:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Killian
24b507ad9c scatter speedloader & box printing 2020-05-05 16:17:28 +01:00
Mechoid
7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
 2019-04-07 19:40:12 -04:00
Spades
a184e67c93 Changes (R&D made) Saber SMG to Advanced SMG 2019-03-28 18:22:23 -04:00
Novacat
a98ac52678 Merge pull request #4750 from VOREStation/upstream-merge-5886 
[MIRROR] Introduces caseless ammo, and a caseless rifle
 2019-03-28 16:40:13 -04:00
Novacat
741931aa31 Merge pull request #4723 from VOREStation/upstream-merge-5906 
[MIRROR] Gives the auto shotgun a new sprite
 2019-03-28 14:42:10 -04:00
Novacat
1e5b351f43 Merge pull request #4711 from VOREStation/upstream-merge-5875 
[MIRROR] Tommygun now Tommy Gun
 2019-03-27 20:45:46 -04:00
Spades
eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Spades
41e8615c4e Introduces caseless ammo, and a caseless rifle 2019-02-07 00:35:27 -05:00
Anewbe
15c62c99d1 Gives the auto shotgun a new sprite 2019-01-27 15:59:52 -05:00
Spades
b86d6dab13 Tommygun now Tommy Gun (#5875) 
* Tommygun now Tommy Gun

https://github.com/PolarisSS13/Polaris/pull/5837

* Corrects sprite names

I figure this can stay as it is.
 2019-01-22 23:22:23 -05:00