cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,499 Commits 5 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

518 Commits

Author SHA1 Message Date
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
SplinterGP
3814aa8f82 (update) scattershot 2020-03-24 20:29:29 -03:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
RadiantFlash7
faf6e95ce3 Revert "Revert "Major map change+misc changes"" 
This reverts commit f0d4f38bf1.
 2020-01-12 01:19:47 -05:00
RadiantFlash7
f0d4f38bf1 Revert "Major map change+misc changes" 
This reverts commit fd22b5ca87.
 2020-01-12 01:16:31 -05:00
RadiantFlash7
fd22b5ca87 Major map change+misc changes 
Moves holodeck next to AI core,
expands botany and kitchen, adds fishfarm
Adds photocopiers and pappershredders about.
Fixes some bad cameras,
adds detective pistol back in, Why wasn't it there prior?
Adds ballestics back in.
 2020-01-11 18:41:51 -05:00
Hawk_v3
bc7ea8379a Merge remote-tracking branch 'upstream/master' 2019-07-02 17:54:29 +01:00
ElectricB1ue
d9ebf54db0 Adds two new alternate sprites for the detective's revolver. (#6230) 
* Adds the sprites

* This should do things.
 2019-06-28 21:23:42 -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
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -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
a4919caba2 Merge pull request #4719 from VOREStation/upstream-merge-5636 
[MIRROR] [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
 2019-03-28 14:52:51 -04:00
Novacat
15dac0304f Merge pull request #4724 from VOREStation/upstream-merge-5877 
[MIRROR] Unfucks Vintage Rifle
 2019-03-28 14:42:43 -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
Neerti
3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -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
Spades
41e8615c4e Introduces caseless ammo, and a caseless rifle 2019-02-07 00:35:27 -05:00
Spades
d667a8ac62 Unfucks Vintage Rifle (#5877) 
* Unfucks Vintage Rifle

I'm going to slap whoever copypasted this blindly.

Also this really shouldn't be 7.62/.308 but hurr durr out of scope
¯\_(ツ)_/¯

* Apparently I'm going crazy and the icon was fine

* Ammo naming consistency
 2019-01-27 16:05:15 -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
Hawk_v3
b6988c5a09 Merge remote-tracking branch 'upstream/master' 2018-12-15 19:37:28 +00:00