cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,506 Commits 5 Branches 0 Tags
3c54fee611f39ce25bad513f04561b102f2d6191
Commit Graph

1419 Commits

Author SHA1 Message Date
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
Atermonera
422bd2545c Merge pull request #5516 from Anewbe/fragmentation 
Adds a new subset of grenades that shoot projectiles
 2018-08-24 15:47:01 -07:00
Atermonera
1cfefcf2ec Merge pull request #5501 from Anewbe/magazine_things 
Adds smart magazine, magazine functionality
 2018-08-24 14:35:55 -07:00
Mechoid
be703cee04 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mech_Equipment_Carepackage1 2018-08-23 20:17:49 -07:00
Mechoid
509addffdf Adds a whole bunch of Exosuit weapons and other miscellaneous parts. 2018-08-23 20:14:56 -07:00
Anewbe
4fc23e4051 Adds a new subset of grenades that shoot projectiles 2018-08-21 22:17:04 -05:00
Anewbe
ee48151135 Adds smart magazine, magazine functionality 2018-08-21 17:10:40 -05:00
Repede
ba3584c965 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
 2018-08-17 19:13:15 -04:00
Spades
887899f50b Merge pull request #4082 from VOREStation/upstream-merge-5439 
[MIRROR] Fixes layering issues for a few things
 2018-08-17 16:12:12 -04:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Anewbe
b88b70eb61 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-03 19:53:06 -05:00
Anewbe
c2794c571d Hopefully fixes some tool-conversion things 2018-08-03 15:13:29 -05:00
Anewbe
972486dde0 Merge pull request #5464 from Neerti/arc_projectile_fix 
Makes arcing projectiles exist in the code.
 2018-08-03 11:37:16 -04:00
Anewbe
c652369f34 Merge pull request #5464 from Neerti/arc_projectile_fix 
Makes arcing projectiles exist in the code.
 2018-08-03 10:37:03 -05:00
Anewbe
7f84aeab9f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-02 22:35:14 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Neerti
75048b8e14 btw i use arc 2018-08-02 15:11:09 -04:00
Neerti
0ca3915b83 Merge pull request #5458 from Mechoid/Beams_Finally 
Let beams be shown in the Type var selection in View Variables.
 2018-08-01 16:29:29 -04:00
Mechoid
8acd0ca4fc Adds beams to the Type var selection in View Variables. 2018-07-31 11:03:48 -07:00
Mechoid
b1a91fc0e3 Unfuck my Master 2018-07-31 11:02:09 -07:00
Mechoid
25e8739dfc Adds beams to the Type var list for View Variables. 2018-07-31 11:00:17 -07:00
Anewbe
0abdfff854 Merge pull request #5439 from Neerti/layer_fixes 
Fixes layering issues for a few things
 2018-07-25 17:27:05 -04:00
Neerti
066975bad0 Fixes some layering issues with trees, outdoor turf edges, and the targeting indicator. 2018-07-24 13:30:09 -04:00
Neerti
02e5b2eef0 Merge pull request #5430 from Anewbe/onmob_gun_fixes 
Fixes a few on-mob gun sprites
 2018-07-23 01:52:31 -04:00
Anewbe
bee5c030ec Fixes a few on-mob gun sprites 2018-07-21 21:35:08 -05:00
Repede
1b5cb2bafa Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 2018-07-17 20:30:33 -04:00
Aronai Sieyes
e5e6af1370 Merge pull request #4010 from VOREStation/upstream-merge-5384 
[MIRROR] Saber fix.
 2018-07-11 21:36:00 -04:00
Kates
fd0bfab228 Saber fix. (#5384) 
* Saber fix.

* Saber fix 2: Electric boogaloo

* parenthèse

* "And another one"

* Actually fixes the indentation

* Balance revert
 2018-07-11 00:49:32 -04:00
Kates
535cca9d0e Saber fix. (#5384) 
* Saber fix.

* Saber fix 2: Electric boogaloo

* parenthèse

* "And another one"

* Actually fixes the indentation

* Balance revert
 2018-07-10 23:49:11 -05:00
Arokha Sieyes
633bc2cc3d Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync07062018 
# Conflicts:
#	code/__defines/species_languages.dm
#	code/__defines/subsystems.dm
#	code/controllers/Processes/planet.dm
#	code/game/machinery/cloning.dm
#	code/game/machinery/recharger.dm
#	code/modules/mob/living/carbon/human/emote.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/paperwork/photography.dm
#	code/modules/projectiles/guns/energy/special.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-07-06 17:20:03 -04:00
Repede
cbea7f7c1a Nerfs blueshields more, fixes for jackhammer drums. 2018-07-02 11:21:37 -04:00
Repede
d7124a22cc Jackhammer can only hold 4 rounds instead of 10, sprites changed to reflect that. 2018-07-01 22:16:46 -04:00
Hawk_v3
ee27b03c01 Tyops will be the death of us all. 
I missed a T for Topmounted
 2018-07-01 21:27:35 +01:00
Hawk_v3
5605a87683 Wrapping up the Jackhammer 
Name change possible, but here. All match and are ready.
 2018-06-30 02:42:31 +01:00
Hawk_v3
b922664afa Forgot to set a name from placeholder. 
Whoops.
 2018-06-29 15:50:44 +01:00
Hawk_v3
9a38e88b9f Blueshield updates. New shotgun. 
Semiauto revolver shotgun for Blueshield and Warden. Sprites are placeholder.

Blueshield spawn gear boxes for weapon choice now.
 2018-06-29 15:03:01 +01:00
Repede
2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-23 17:53:13 -04:00
Aronai Sieyes
016166672a Merge pull request #3894 from VOREStation/upstream-merge-5356 
[MIRROR] Recharger refactor
 2018-06-17 19:24:16 -04:00
Aronai Sieyes
19c6b0f6ba Merge pull request #3896 from VOREStation/upstream-merge-5276 
[MIRROR] More Phase Guns
 2018-06-17 16:22:53 -04:00
Atermonera
cc161d7624 Merge pull request #5359 from Anewbe/arc_projectiles 
Adds arcing projectiles
 2018-06-17 15:58:50 -04:00
Atermonera
04d5f9e522 Merge pull request #5359 from Anewbe/arc_projectiles 
Adds arcing projectiles
 2018-06-17 12:58:41 -07:00
Anewbe
97c32f35f1 More Phase Guns 2018-06-17 13:35:54 -04:00
Anewbe
86901354fc More Phase Guns (#5276) 
* Adds new Phase weapons

* Fixes a thing

* Puts phase weapons in cargo

* Moves research designs, adds phase weapons

* Comments out a duplicate design

* Corrects duplicate design ID

* Last commit on this PR, I swear
 2018-06-17 10:35:03 -07:00
Atermonera
fe94038e7a Recharger refactor 2018-06-16 17:15:59 -04:00
Anewbe
6b8746956a Adds arcing projectiles 2018-06-16 11:37:41 -05:00
Anewbe
91edca4434 Recharger refactor 2018-06-14 15:37:22 -05:00