cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,007 Commits 9 Branches 0 Tags
a1a395a1a93cdbc57e52d4069b24a7761282c33c
Commit Graph

1339 Commits

Author SHA1 Message Date
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
Anewbe
f18b82aa2b Merge pull request #6268 from Heroman3003/targetfix 
Fixes aiming at z-shadows breaking aiming
 2019-07-06 21:34:03 -04:00
Atermonera
3d31a77514 Multi-Tile Objects, Multi-Tile Hovershuttle 2019-07-01 20:43:53 -04:00
if there were two guys on the moon
d5f380984f Medbeam 2019-06-29 20:04:47 +01:00
ElectricB1ue
d9ebf54db0 Adds two new alternate sprites for the detective's revolver. (#6230) 
* Adds the sprites

* This should do things.
 2019-06-28 21:23:42 -04: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
Heroman3003
e3e715454b Makes placeholder entries for lore writing 2019-04-23 11:13:42 +10:00
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -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
3aa0fdfda5 Removes conductive flags from VR stuff 2019-03-28 21:45:38 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -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
Novacat
716207d55d Merge pull request #4763 from VOREStation/upstream-merge-5950 
[MIRROR] Fixes turrets, AI shooting, and makes mob AI shooting a little smarter.
 2019-03-28 20:22:52 -04:00
Unknown
9e329e2a92 Forgot something 2019-03-28 20:09:52 -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
7a518bc619 Merge branch 'master' into upstream-merge-5944 2019-03-28 19:19:44 -04:00
Spades
a184e67c93 Changes (R&D made) Saber SMG to Advanced SMG 2019-03-28 18:22:23 -04:00
Novacat
3a1c35f0ad Merge pull request #4768 from VOREStation/upstream-merge-5954 
[MIRROR] Makes aiming more clear for the target.
 2019-03-28 17:46:02 -04:00
Novacat
7e90225e81 Merge pull request #4736 from VOREStation/upstream-merge-5918 
[MIRROR] [READY] Fixes pixel projectiles critical bugs
 2019-03-28 17:44:22 -04:00
Novacat
04c5080426 Merge pull request #4755 from VOREStation/upstream-merge-5940 
[MIRROR] Fix a div/0.
 2019-03-28 17:39:34 -04:00
Novacat
a98ac52678 Merge pull request #4750 from VOREStation/upstream-merge-5886 
[MIRROR] Introduces caseless ammo, and a caseless rifle
 2019-03-28 16:40:13 -04:00
Unknown
75ede8c745 Fixes Merge Conflicts 2019-03-28 16:03:52 -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
Novacat
81d698b94c Merge pull request #4643 from VOREStation/upstream-merge-5790 
[MIRROR] Drop the number of shots of normal and sec-xeno tasers back down to 5.
 2019-03-28 15:48:47 -04:00
Novacat
a4919caba2 Merge pull request #4719 from VOREStation/upstream-merge-5636 
[MIRROR] [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
 2019-03-28 14:52:51 -04:00
Novacat
15dac0304f Merge pull request #4724 from VOREStation/upstream-merge-5877 
[MIRROR] Unfucks Vintage Rifle
 2019-03-28 14:42:43 -04:00
Novacat
741931aa31 Merge pull request #4723 from VOREStation/upstream-merge-5906 
[MIRROR] Gives the auto shotgun a new sprite
 2019-03-28 14:42:10 -04:00
Unknown
a4373601f0 Fixes Merge Errors 2019-03-28 13:53:03 -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
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