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
67,776 Commits 5 Branches 0 Tags
b9cd1eddfe46f1baddc2866f53a06035a7482c9d
Commit Graph

442 Commits

Author SHA1 Message Date
Cadyn Bombaci
576545ef47 fix 2021-09-26 10:48:54 -07:00
Cadyn Bombaci
b55c94da13 linter 2021-09-26 10:37:24 -07:00
Cadyn Bombaci
1fa43a5406 compiler fixes 2021-09-26 10:35:18 -07:00
Cadyn Bombaci
4b5d036662 WIP new guns 2021-09-26 10:28:09 -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
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
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
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
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00: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
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation Bot
eff2f9f68b The Armory V1 2021-04-26 16:52:51 +00:00
Cadyn
59f9c43a6d Bugfix + Bolt-action sounds 2021-02-06 08:27:13 -08:00
Cadyn
5e9735fbac Touching up everything. 2021-02-04 23:31:13 -08:00
Cadyn
d93a3dac65 Ballistics v4 2021-02-04 01:56:16 -08:00
Cadyn
5364a0b965 Final touches 2021-01-19 18:56:14 -08:00
Cadyn
35543399cd Ballistics v3.2 2021-01-19 17:31:36 -08:00
Cadyn
670017d41b Ballistics v3.1 2020-11-29 04:51:18 -08:00
Razgriz
f0ace37d4f Spear and Gun sizes 
-Made all gun and spear sizes larger so that they will no longer fit into backpacks.
--Energy spears and energy swords will fit while deactivated, but not while active (unchanged)

-Tweaked the Floragun have no recoil for micros.
 2020-11-23 19:29:48 -07:00
cadyn
148ce00235 borkfixes 2020-11-21 08:09:11 -08:00
Cadyn
7f1579061b Ballistics v3 2020-11-19 17:02:22 -08:00
cadyn
d5d50d90bf charging_handle to charging handle reee 2020-11-08 13:49:33 -08:00
Cadyn
6fa317794b Cadyn's ballistic Overhauls V2 Finale 2020-11-05 16:44:47 -08:00
Cadyn
b3ba48084f Ballistics v2 draft 2020-10-31 12:21:21 -07:00
Cadyn
241e386284 Cadyn's ballistics overhaul part 1 2020-10-28 19:39:50 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Kates
19aa0200db Improve gun animations to be more modular. (#7645) 
* Improve gun animations to be more modular.
- This is a port of TGCM pull/4807. Credit to SplinterGP for helping me set things up.
- It essentially allows people to not need a '-pump' for their animation, but instead to just use whatever they please. They just need to write it down at the relevant intervals.

* Improve further.

* Update shotgun.dm
 2020-09-20 06:51:14 -04:00
izac112
9d8f2623de More thingus 2020-09-14 14:09:52 +02: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
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
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04: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
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
e44e346352 Release Update 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
 2020-04-16 21:07:33 -04:00
Unknown
5468301dc5 Ports Polaris 6992 and some Urist backpacks 
- Reenables Dual Wielding penalties on most heavy guns.
- Adds wielded sprites for all weapons with dual-wield penalties.
- Ports a ton of gun sprites from Urist McStation
- Removes mention of requires_two_hands in code since that is not used anymore.
- Adds some Urist mcstation backpacks (VS only)
 2020-04-13 10:40:24 -04:00
Unknown
323d5f838b Gun Refactors and Changes 
- The Protector is now a minature energy gun, it has 3 lethal, 6 standard stun, and no special stun shot anymore. It retains the alert level lock, there is a version without the lock.
- The energy net gun now gets 3 net shots, but loses its stun alternate fire. It also gets a new sprite from baystation.
- Refactors all Vorestation weapons in vore/fluffstuff to be in their appropriate directories.
- Removes all personalized custom weapons.
- KHI is no longer the manufacturer for the Protector, Net Gun, and AR Glasses. I wanted to make KHI a bit rarer, and their specialty mainly ultra high tech equipment.
- Refactors Expedition Phasers. No practical change, but now there are unlocked versions of all three phaser variants.
 2020-04-11 19:39:49 -04:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
Unknown
9f2d3f522d Ports Sniper Rifle QOL from Polaris 2020-03-29 21:36:27 -04:00
SplinterGP
07e4d28fb7 Balances and finishes scattershot stuff 2020-03-24 20:45:39 -03:00