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

568 Commits

Author SHA1 Message Date
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
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Repede
7fc70caa43 Resetting master 2020-02-22 12:28:01 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
 2020-01-31 18:23:50 +01: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
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
Hawk_v3
2cc8800ede Merge remote-tracking branch 'upstream/master' 2019-10-08 15:14:36 +01:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Hawk_v3
6d4ec50e08 Merge remote-tracking branch 'upstream/master' 2019-09-01 19:02:01 +01:00
Unknown
aa2a3682b9 Merge remote-tracking branch 'VOREStation/master' into medbeam 2019-08-31 15:32:22 -04:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01: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
Hawk_v3
8654b6bdf4 Merge remote-tracking branch 'upstream/master' 2019-07-19 22:05:31 +01: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
Hawk_v3
7bb9c92c9a Merge remote-tracking branch 'upstream/master' 2019-06-03 12:31:48 +01:00
Atermonera
f78a4e1dc8 Sif Trees and Icon Scaling 2019-05-28 13:21:39 -04:00
Hawk_v3
c2d90f5c3f Merge remote-tracking branch 'upstream/master' 2019-05-23 22:46:42 +01:00
Mechoid
7a35723d85 Sif Animal Expansion 1 2019-05-21 19:58:19 -04:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
 2019-04-07 19:40:12 -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
Hawk_v3
b6988c5a09 Merge remote-tracking branch 'upstream/master' 2018-12-15 19:37:28 +00: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