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
79,499 Commits 9 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

568 Commits

Author SHA1 Message Date
Razgriz
1889d68b2b Update bullets_ch.dm 2021-01-21 18:41:23 -07:00
Razgriz
768c79d42d Update bullets_ch.dm 2021-01-21 18:33:44 -07:00
Razgriz
48e93151e9 Add 22 long rifle bullet 
Nothing currently shoots this, but I will make it the bullet of choice for the hivebot.
 2021-01-21 18:23:27 -07:00
Cadyn
35543399cd Ballistics v3.2 2021-01-19 17:31:36 -08:00
Cadyn
89b7b1d89a Make phasers be orange like classic star trek :) 2020-11-25 22:40:59 -08:00
Razgriz
39b810d0fc And humanoids 
Ok this should work for mercs as well
 2020-11-24 17:28:09 -07:00
Razgriz
a83b1ce6e3 And xenos 2020-11-24 16:17:59 -07:00
Razgriz
eb3c70d668 SA_bonus_damage to structures, beam dam tweak 2020-11-24 15:47:52 -07:00
Razgriz
5c3991ef47 Change phaser beam-type 
Because FUN FACT: Phasers were actually using regular beams.

After looking through the code during my gun and spear size PR, I made the realization that there are two types of phasers, but we were all under the impression that they only did 5 damage to people and full damage to mobs. This is true of phasers. However the Frontier Phasers are a Virgo weapon and apparently are not phasers at all, they are lasers, and do indeed use lasers, NOT phasers. So I am fixing that.

Pros of change:
-I created a new beam type for the phaser beam. The OG Phaser uses a short-ranged, slow-moving projectile. So I made that, but made it look like the default laser beam. I also copied the damage numbers, so you do lots more damage to animals now.
-You won't friendly fire people as badly because people were under the impression that these only did 5 damage to people.

Cons:
It won't do its full damage potential vs. non-animal MOB_CLASS, i.e. mercs and mechs.
 2020-11-24 03:11:29 -07:00
cadyn
148ce00235 borkfixes 2020-11-21 08:09:11 -08:00
cadyn
77a4076fd6 Forcing the glory of 5.7x28 onto my formulas 2020-11-19 21:05:47 -08:00
Cadyn
7f1579061b Ballistics v3 2020-11-19 17:02:22 -08:00
Razgriz
e4e0b08da6 Merge pull request #788 from cadyn/ballistics-v2 
Ballistics v2
 2020-11-11 19:32:40 -07:00
cadyn
e3953467d8 make buckshot not destroy walls instantly 2020-11-06 20:56:21 -08:00
Cadyn
6fa317794b Cadyn's ballistic Overhauls V2 Finale 2020-11-05 16:44:47 -08:00
Cadyn
67499d28c5 Ballistics v2 draft v2 
Introducing debugging messages and actually working ballistics
 2020-11-02 18:03:47 -08:00
Cadyn
b3ba48084f Ballistics v2 draft 2020-10-31 12:21:21 -07:00
Razgriz
d88ccdabf6 Merge pull request #759 from CHOMPStationBot/upstream-merge-9207 
[MIRROR] [MIRROR] Phoron bore utility improvements
 2020-10-28 20:21:26 -07:00
Verkister
57adb0bfca Merge pull request #9207 from VOREStation/upstream-merge-7680 
[MIRROR] Phoron bore utility improvements
 2020-10-27 08:16:22 +00:00
cadyn
13e5149a84 Actually turn that back 2020-10-22 00:10:31 -07:00
cadyn
4e362a2742 Getting rid of qdel 
Got rid of qdel and made dusting conditional on maxHealth
 2020-10-22 00:05:55 -07:00
Cadyn
e14dd48263 Blitz rods 2020-10-14 16:14:40 -07:00
Sym
18bc6fb6e3 Xenomorph Balancing Act 1.1 
Simple balances and fixes due to a recent event.

- Changed plasma cost for laying eggs, from 75 to 200.

- Changed Agony damage of neurotoxin, from 80 to 60.

- Finally fixed the fact that xenomorphs cannot see in the dark. Xenomorphs can now see turfs and mobs, but lose some range when in the dark.

- Changed ability name Gut to Slaughter, to more accurately describe what it does.
 2020-10-10 21:27:48 -04:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Kates
7177686b57 Bring shotgun slugs AP potential to 20% (#7621) 2020-09-05 11:11:34 -04:00
Atermonera
fb4d02df3d Merge pull request #7561 from Mechoid/ProjectileUpkeep 
Projectile Upkeep
 2020-08-31 18:23:39 -04:00
Atermonera
b2250d9b47 Improvements to mech missiles. 2020-08-25 19:16:57 -04:00
LunarFleet
843e2f36d4 Fixes my own stupidity 2020-08-18 08:19:33 -04:00
LunarFleet
1617ac4627 Flechette merc nerfs 
Praise
 2020-08-17 10:58:14 -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
be538243c1 various fixes 2020-05-27 22:43:33 +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
Atermonera
f1cabd6742 Removes limits on eating, centralizes nutrition changing. 2020-04-29 17:15:15 -04:00
Atermonera
2411a19038 Merge pull request #7023 from Mechoid/FixAndTweakRoiling 
Roiling Mold Blob Fix/Tweak
 2020-04-22 15:53:57 -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
Atermonera
2374a40908 A Tale of Blobs and Man 2020-04-13 01:35:01 -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
db87175163 Earlyport Fixes 2020-03-20 13:50:44 -04:00