cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,264 Commits 8 Branches 0 Tags
eb1d5a997c966c3d4596f0d91d6c9b51cca4333c
Commit Graph

1403 Commits

Author SHA1 Message Date
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
Novacat
42df71908b Merge pull request #4644 from VOREStation/upstream-merge-5803 
[MIRROR] Guns sounds refactor and improvements
 2019-03-27 12:35:26 -04:00
Novacat
dbd85f3243 Merge pull request #4656 from VOREStation/upstream-merge-5816 
[MIRROR] Guns should once again let people know that they've been fired
 2019-03-27 12:07:35 -04:00
Unknown
1e45296d31 Conflict Resolution 2019-03-27 10:58:53 -04:00
Spades
eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -04:00
Mechoid
c8006a6e84 Event / Future PoI / Other weaponry & tools. 2019-03-27 02:34:28 -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
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Screemonster
69d4688e28 Unpicks some mining spaghetti (#5978) 
* Untangle xenoarch from mining somewhat

* professionalism

* sonic jackhammers only for artefact-safe tunnelling

* destroy artefacts code disabled on everything
 2019-03-12 20:01:15 -04:00
Spades
d47c2366de Merge pull request #4558 from VOREStation/upstream-merge-5760 
[MIRROR] Adds BIOACID damage type
 2019-03-02 08:10:04 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Anewbe
b5c3aa3e26 Merge pull request #5954 from Mechoid/Aiming_Warns_Consequences 
Makes aiming more clear for the target.
 2019-02-13 23:59:20 -05:00
Atermonera
47bcf542fc I shouldn't do math at 2 AM 2019-02-10 00:10:00 -05:00
Anewbe
a32e90cca7 Merge pull request #5940 from Mechoid/Fix_DivZero 
Fix a div/0.
 2019-02-08 17:55:41 -05: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
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Neerti
b43d76b86e Merge pull request #5823 from Anewbe/egun_stun 
Egun stun beams are weaker
 2019-01-13 00:28:56 -05:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Atermonera
46d0277024 Merge pull request #5816 from Anewbe/gun_again 
Guns should once again let people know that they've been fired
 2019-01-09 21:14:49 -05:00
Anewbe
b5a4a58996 Merge pull request #5790 from Mechoid/Make_Security_Sad 
Drop the number of shots of normal and sec-xeno tasers back down to 5.
 2019-01-06 17:52:23 -05:00
Unknown
64fd3a11a6 Replaces Ace's ammo with HP 
Since 9mm has hollow point now.
 2018-12-12 21:53:24 -05:00
Spades
8ff334d67c Merge pull request #4526 from VOREStation/upstream-merge-5736 
[MIRROR] Fixes missing hollow point ammo for 9mm
 2018-12-12 21:25:22 -05:00
Atermonera
9b62a715c4 Merge pull request #5760 from Anewbe/bioacid 
Adds BIOACID damage type
 2018-12-06 16:20:03 -05:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Spades
4a27ffb35a Merge pull request #4515 from pontifexminimus2/dragor-HEYLOOKTHISMORONFORGOTHOWTODOSOURCETREEIBLAMEYOUARONAIFORMAKINGMEJUMPTHROUGHTHESEHOOPS 
Renames guns with proper names for a more generic name and edits their desc.
 2018-12-04 20:22:02 -05:00
Atermonera
67967c93af Merge pull request #5736 from SpadesNeil/pistol-ammo-fixes 
Fixes missing hollow point ammo for 9mm
 2018-12-01 00:28:04 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Spades
0468b18e7a Merge pull request #4484 from VOREStation/permits-updates 
Updates permits, adds Ace's pistol
 2018-11-26 09:03:38 -05:00
pontifexminimus2
784e48b895 Holy shit I hate this. 2018-11-25 16:45:37 +01:00
Spades
129a289052 Updates permits, adds Ace's pistol 
- Fixed some permit stuff.
- Removed expired permits and associated items.
- Added Ace's pistol plus a spare mag.
- Locked items to brig access, covering warden, HoS, and Captain, but
not roles like HoP. I think.
 2018-11-09 20:06:01 -05:00
Aronai Sieyes
848e7dd000 Undo phase damage changes 2018-11-02 15:19:44 -04:00
Unknown
635027a425 Removes a frontier phaser from the locker 2018-11-02 15:02:57 -04:00
Unknown
36ea7c4968 Removes AEG change 2018-11-02 14:24:05 -04:00
Unknown
f67de7bc84 Weapons Balance and Sprites 
- AEG now has 10 lethal shots
- Phase weapons bonus damage to animals removed
- Phase weapons now do real damage
- Charge cost bug fixed with phaser
- Overhauled sprite for holdout phaser
- Added Phaser Carbine, right now just a reskinned phaser
- One phaser carbine added to the Pathfinder's locker
 2018-11-02 12:31:22 -04:00
Kates
26089f3a72 Magazines improvements 2018-10-15 15:52:56 -04:00
Anewbe
741d6fbea5 Shotgun cycling animation framework 2018-10-03 14:30:56 -04:00
Spades
a36a591822 Merge pull request #4285 from VOREStation/upstream-merge-5611 
[MIRROR] Phase rifle size correction
 2018-10-01 09:28:38 -04:00
Atermonera
9619d3ad31 Merge pull request #5611 from Anewbe/phase_rifle 
Phase rifle size correction
 2018-09-28 22:37:14 -04:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018 
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2018-09-27 18:01:09 -04:00
Spades
b59fd4b551 Merge pull request #4122 from VOREStation/upstream-merge-5464 
[MIRROR] Makes arcing projectiles exist in the code.
 2018-09-17 14:11:46 -04:00
Spades
089655639b Merge pull request #4114 from VOREStation/upstream-merge-5458 
[MIRROR] Let beams be shown in the Type var selection in View Variables.
 2018-09-17 14:05:30 -04:00
Mechoid
4fb5455fd3 Makes Blobs more useful. 2018-09-16 22:12:17 -07:00
Anewbe
17a5010f44 Signal pistol can be reloaded (#5566) 2018-09-16 17:23:39 -07:00
Anewbe
08ddd217a8 Buffs the Vox 2018-08-31 22:58:25 -05:00
Anewbe
b5e9000e11 Catching is no longer guaranteed, accuracy code is more general 2018-08-27 22:37:53 -05:00
Mechoid
bbeb578a7e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mech_Equipment_Carepackage1 
# Fix Conflicts:
#	code/game/objects/items/weapons/grenades/explosive.dm
 2018-08-24 16:05:35 -07:00