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

1168 Commits

Author SHA1 Message Date
Anewbe
534a588a6a Gun changes (#4185) 
* Various background gun changes

* Forgot to include the sounds, woops

* Fixes some more gun stuff

* Makes the cham gun work again
 2018-02-12 23:12:14 -08:00
Screemonster
2cd47f9c80 squashed commits - ion pistol refactor and away mission emp nerf 2018-02-11 09:27:40 +00:00
Leshana
1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07 
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
 2018-02-07 19:30:50 -05:00
Anewbe
442b5cbdf6 Comments out the automatic firemode code (#4748) 2018-02-07 09:59:42 -08:00
Andromeda-K22
58cf8000ba Automatic firemode for guns (#4730) 
* New gun firemode: automatic

Full-auto destruction at the tip of your fingers! If you're an admin. Switch the automatic var to 1 to make any gun automatic.

This code is largely donated by Mport and the SS:CM project. Relevant modifcations are located in automatic.dm, special.dm, and automagical.dm

* Removes '/blue's

* Removes a block of pseudocode.

* Welp. Missed some things.

* Automatic removed from the Suppression gun, as requested by @Anewbe in #4730

* Requested changes.
 2018-02-06 22:57:53 -06:00
Anewbe
52398aa0cf Adds Phase Pistols 2018-02-05 17:53:12 -06:00
Andromeda-K22
cee3066a41 RUST additions and updates, Modular guns, and Lead. (#4667) 
* expanding rupture procs
adds hydromagnetic traps for power production.

* Minor tweaks.

* Adds modular guns using research components.

* Updates materials to have a radiation_resistance variable, used in calculating radiation. Adds Lead as a material.

* Un-zeros stock material radiation resistance.

* Adds, and enables four 'end-events' for the RUST in place of the old Rupture() proc.

* Map muckery?

* absolute pathing i guess?

* getting angry, travis.

* TRAVIS
STAHP

* I...
Comments? Lists? Who the hell knows.
 2018-02-04 18:04:28 -06:00
Kelshark
85f9061592 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/controllers/autotransfer.dm
#	code/datums/supplypacks/contraband.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme
 2018-01-24 19:52:12 -05:00
Spades
8e42db3e7f More guns for the gun box 
- NT Mk98 (re)added.
- P92X added.
 2018-01-18 18:53:43 -05:00
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018 
Planes, layers, human/update_icon()
 2018-01-17 17:56:51 -05:00
Leshana
5d5f052eb7 Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10 
# Conflicts:
#	code/game/machinery/atmoalter/area_atmos_computer.dm
 2018-01-15 13:27:39 -05:00
Spades
b441ccd6e3 9mm pistol updates (#4480) 
* These aren't supposed to be here!!

* Adds new Security pistol and large capacity magazines

* Removes new pistol from Security spawns

* Removed references of Beretta because it's not one
 2018-01-14 14:45:15 -06:00
Cyantime
36f8c56537 Fixes 'varient' 2018-01-08 16:42:20 -05:00
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04 
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
 2018-01-04 22:44:04 -05:00
Arokha Sieyes
53372f4317 Tweak out-of-ammo behavior on railguns 
I personally like to imagine we live in a world where 'eject' is not a synonym for 'annihilate'.

Just makes the sound the railguns play when empty be a var, and makes them ACTUALLY eject the magazine instead of just deleting it (copypaste error probably, from the magnetic type, which does that).
 2017-12-28 18:02:43 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Anewbe
c0615e47cf Merge pull request #4437 from Belsima/whatifgammer 
more grammer
 2017-12-12 19:31:06 -06:00
Belsima
430746d863 more grammer 2017-12-11 20:33:59 -05:00
Anewbe
a841d57239 Changes the Laser Carbine/Rifle 2017-12-05 23:36:05 -06:00
Neerti
01aaccf893 Finishes UFO PoI 2017-11-26 15:10:25 -05:00
Neerti
7497aef295 work 2017-11-26 12:08:05 -05:00
Kelshark
33d109b2dd Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2017-11-25 11:35:10 -05:00
Anewbe
6e3bbd31c0 Removes the mosin-nagant, moves the sprites 2017-11-22 01:14:14 -06:00
Neerti
d36d09d937 Merge pull request #4176 from Anewbe/battery_things 
Swaps non-mounted recharging guns to batteries
 2017-11-19 21:28:06 -05:00
Anewbe
fd7990028f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into battery_things 2017-11-19 02:38:42 -06:00
Anewbe
b2917b9716 Tones down the Darkmatter Beam 2017-11-17 20:15:53 -06:00
killer653
70e53b96bb Polaris Sync 2017-11-10 11:37:41 -05:00
sabess
77e4aa2cf4 fixed a thing 2017-11-07 21:40:00 +11:00
Sabess
c96781499f Allows detectives to take an optional revolver + some other stuff (#4217) 
* I'm like 99% sure this works

* uhm

* accidentally broke something after I tested but before I PRed, fixed now
 2017-11-05 22:53:11 -06:00
Kelshark
92980edc93 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/jobs/job/science.dm
#	code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
 2017-10-29 18:14:56 -04:00
Anewbe
c9cbbd3a9b Swaps non-mounted recharging guns to batteries 2017-10-27 20:43:31 -05:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Neerti
9c0ac5ec2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/20/2017_syndie_borgs_are_back 2017-10-20 13:26:06 -04:00
Neerti
1aff3fc8c0 Syndicate Borgs II, Return of the Salt 
Adds an option in mercenary uplinks to purchase three different 'classes' of drones.
See PR for more details.
 2017-10-20 13:01:45 -04:00
Mechoid
920e823a46 Fuel-Rod Gun, Minor fixes related. (#4103) 
* A whole load of things.

* Fixes the SM Rod's travel distance.
 2017-10-19 15:07:52 -05:00
Kelshark
3ab70b7996 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
#	vorestation.dme
 2017-10-17 08:49:37 -04:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Neerti
0a3d85647a Merge pull request #4011 from Anewbe/railgun 
Ports Bay's railguns, and assorted gun sprites
 2017-10-14 01:43:45 -04:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Anewbe
ff7c4fe45a Makes a bunch of things fit in holsters 2017-10-07 17:24:18 -05:00
Kelshark
9e4136784d Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/species/akula/mask_vr.dmi
#	icons/mob/species/fennec/mask_vr.dmi
#	icons/mob/species/fox/mask_vr.dmi
#	icons/mob/species/nevrean/mask_vr.dmi
#	icons/mob/species/vulpkanin/mask.dmi
#	icons/mob/vore/taurs_vr.dmi
 2017-10-03 19:04:51 -04:00
Anewbe
a248a4a4a1 Ports Bay's railguns, and assorted gun sprites 2017-10-02 17:29:24 -05:00
Cyantime
96190e94aa Allows emitters to blast through rocks again. 2017-09-29 01:05:40 -04:00
Anewbe
6d0e6c4b0f Merge pull request #3757 from SpadesNeil/Ace-infuriates-Anewbe-with-another-vintage-weapon 
Adds M1 Garand
 2017-09-26 01:09:46 -05:00
Kelshark
457ff1356a Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	code/modules/vore/resizing/resize_vr.dm
#	config/custom_items.txt
 2017-09-23 11:40:55 -04:00
Anewbe
c80b535a29 Merge pull request #3902 from Neerti/9/19/2017_lost_drone 
Adds the Lost Drone
 2017-09-22 15:24:05 -05:00
Neerti
afd7b15442 Adds the Lost Drone 2017-09-22 01:17:53 -04:00
killer653
2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Kelshark
c91dbd0057 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2017-09-21 18:37:11 -04:00
Anewbe
61936496b1 Merge pull request #3813 from Belsima/clickityclack 
Adds a metric assload of sounds.
 2017-09-20 22:20:17 -05:00