cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,081 Commits 5 Branches 0 Tags
7066d04df5143b09ba17f39c319d97ab6fce7eca
Commit Graph

404 Commits

Author SHA1 Message Date
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
Atermonera
2374a40908 A Tale of Blobs and Man 2020-04-13 01:35:01 -04:00
Unknown
db87175163 Earlyport Fixes 2020-03-20 13:50:44 -04:00
Atermonera
101c9c33c5 QoL: Projectiles 2020-03-17 00:55:56 -04:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Atermonera
ecd37a0c71 Merge pull request #6781 from Mechoid/RailgunTweakening 
Tweak Station-Railguns
 2020-03-13 17:16:17 -04:00
Mechoid
acc712e1d5 Exosuit Expansion: Return of the Ripley 2020-03-08 00:52:32 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
aaf71ecbbf Merge pull request #6615 from Shadow-Quill/Ion-Fix 
Fixes ion proj not EMPing when hitting walls
 2020-01-15 23:10:55 -05:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Unknown
aa2a3682b9 Merge remote-tracking branch 'VOREStation/master' into medbeam 2019-08-31 15:32:22 -04:00
Andrew
69ed422019 Adds Laser Tag Turrets Plus Changes (#6324) 
* Adds Laser Tag Turrets

* Adds changelog

* Reverts Lethal Turrets Shooting to Kill

* Small No Longer Means Misc Life

* Revert "Merge branch 'master' into Turret"

This reverts commit 0300e6723b1aec0c47f8f82f7db770aa29af2483, reversing
changes made to 219348783d49b3205c3ed64bdd604f61791e6e72.

* Revert "Revert "Merge branch 'master' into Turret""

This reverts commit ca3d13b3372f2c5587d8d2cc449a6da8503494e4.

* Github why

* Change laser.dm to master?

* Revert "Change laser.dm to master?"

This reverts commit da562f6bc1ec43fe0cf5fe6ec5af61ada3474dd9.
 2019-07-27 15:45:58 -04:00
Novacat
3fcc7e1465 Merge pull request #5500 from VOREStation/upstream-merge-6285 
[MIRROR] Adds the SLED.
 2019-07-24 06:24:34 -04:00
Atermonera
f519272525 Merge pull request #6290 from Mechoid/SubMunitions 
Adds Submunition projectiles, and a laser gun showcasing them.
 2019-07-23 23:35:05 -04:00
Atermonera
a6d7c4ee81 Merge pull request #6285 from Mechoid/SLED 
Adds the SLED.
 2019-07-23 16:21:42 -04:00
Atermonera
9325f590ca Mining Expansion, the Diggening. 2019-07-13 03:48:38 -04:00
if there were two guys on the moon
d5f380984f Medbeam 2019-06-29 20:04:47 +01:00
Atermonera
f78a4e1dc8 Sif Trees and Icon Scaling 2019-05-28 13:21:39 -04:00
Mechoid
7a35723d85 Sif Animal Expansion 1 2019-05-21 19:58:19 -04:00
Novacat
1519496d9f Merge pull request #4849 from VOREStation/upstream-merge-5978 
[MIRROR] Unpicks some mining spaghetti
 2019-03-28 22:01:36 -04:00
Unknown
2dbf8499f4 Conflict Resolution 2019-03-28 21:04:21 -04:00
Anewbe
38c4b88ded BTW I USE (FIXED) ARC 2019-03-28 20:53:50 -04:00
Anewbe
d2e8078348 Fixes turrets, AI shooting, and makes mob AI shooting a little smarter. 2019-03-28 20:07:44 -04:00
Novacat
1827a34381 Merge pull request #4674 from VOREStation/upstream-merge-5823 
[MIRROR] Egun stun beams are weaker
 2019-03-28 15:49:06 -04:00
Unknown
cf39c61c2d Conflict Resolution 
This one made a lynx cry.
 2019-03-28 13:19:19 -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
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
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
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
9b62a715c4 Merge pull request #5760 from Anewbe/bioacid 
Adds BIOACID damage type
 2018-12-06 16:20:03 -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
Aronai Sieyes
848e7dd000 Undo phase damage changes 2018-11-02 15:19:44 -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
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
Mechoid
4fb5455fd3 Makes Blobs more useful. 2018-09-16 22:12:17 -07: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
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