Commit Graph

108 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
ed79946ade [MIRROR] some istype to macros (#9802)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-01-05 23:01:49 +01:00
CHOMPStation2StaffMirrorBot
fd5d9267ff [MIRROR] Converts gas, ore, plants and reagent strings to defines (#9611)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2024-12-12 02:11:06 +01:00
CHOMPStation2
464ebe7360 [MIRROR] Glamour mob pack (#9225)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-10-13 22:31:24 +02:00
CHOMPStation2
ab154b48b2 [MIRROR] refactors most spans (#9139)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-10-04 15:00:17 +02:00
CHOMPStation2
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084)
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-09-30 21:36:41 +02:00
Guti
7c3fb6fb64 Maintenance Deck (#8146)
Co-authored-by: Raeschen <rycoop29@gmail.com>
2024-04-07 08:25:38 +02:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750)
Co-authored-by: Raeschen <rycoop29@gmail.com>
2024-02-16 10:54:47 +01:00
CHOMPStation2
4667401397 [MIRROR] Redgate Laserdome (#7319)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-12-03 12:54:20 +01:00
Digi Purpur
47d6a439f1 All the changes required for coilgun FXs to work
Changes object/effects from "pointdefense" to "coildefense" to use when you prefer "projectile" PD turrets (point defense turrets vars and such should just use the old laser effects for cases where we wanna use those instead of the new ones Rykka and I added here!)
2023-06-17 09:04:05 -07:00
Nadyr
d7e6bacafd powder that makes you say yes 2023-04-25 21:44:57 -04:00
Heroman3003
317fc95a7e Ion Beam Redux 2023-04-22 05:41:47 +00:00
Razgriz
2b204b9194 Port old point defense stuff I rage-closed
Tech-debt repo-man called
https://github.com/CHOMPStation2/CHOMPStation2/pull/1790
2022-10-02 21:39:21 -07:00
Rykka
0cdd2da44c Adds hud_states to almost all weaponry, credit to Serdy
Reshuffles files to match Polaris
2022-04-10 09:04:18 -06:00
Rykka
85e69ffba4 Progress Commit 2 - Energy Gun HUD works, starting Projectiles
Saving progress to resume later.
2022-04-10 09:03:20 -06:00
Casey
51bd77e5c2 Firearms 1 2022-03-26 03:56:42 +00:00
Razgriz
c09ad1baa9 powder that makes you say yes and hate the map changes 2022-03-04 15:23:33 -07:00
Casey
80f5298a18 Ammo Boxes 2022-03-03 21:23:43 +00:00
Chompstation Bot
eff2f9f68b The Armory V1 2021-04-26 16:52:51 +00:00
Razgriz
241c6447c8 Update beams.dm 2021-04-21 21:48:30 -07:00
Chompstation Bot
147887545f [MIRROR] Practice/Lasertag weapons no longer excavate 2021-04-21 06:31:39 +00:00
Sym
9b69e4ab34 Clean the addition
Oh god I forgot to update the branch before I did all this stuff.
2021-02-05 00:16:11 -05:00
Sym
da52aa33cc Updoot?
Oh god what is it doing
2021-02-05 00:02:34 -05:00
Sym
420a38a8c4 Balance 1.1, less damage
Reduce from 55 to 48.
2021-02-04 23:55:47 -05:00
cadyn
3bc058624e Merge branch 'master' into Precursorpewpew 2021-02-04 20:49:25 -08:00
Sym
2d641fed65 Adds Precursor Projectile for alien guns
Replaces default cyan beam with new precursor beam, complete with new icon. Credit to Kassc for sprucing up the sprite.
2021-02-04 23:15:51 -05:00
cadyn
6e569ca7de Merge pull request #1209 from MisterGrimm/GammaJamma
Adds the GA-X Experimental Gamma Laser for mechs
2021-02-03 13:16:02 -08:00
Sym
6edff03a2e Remove a comment
Thats alot of balance
2021-01-29 18:50:07 -05:00
Sym
9739b67368 Balance buff
Hurt me more baby
2021-01-29 16:18:48 -05:00
Sym
55a6523bc0 Adds Gamma Laser for mech, tweaks gamma laser
Tweaking Gamma Laser projectile to be used in mech weapon
2021-01-29 15:04:36 -05:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786
[MIRROR] Gadgets & Gizmos
2021-01-24 06:55:05 +00:00
Atermonera
101c9c33c5 QoL: Projectiles 2020-03-17 00:55:56 -04:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05: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
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
Novacat
1519496d9f Merge pull request #4849 from VOREStation/upstream-merge-5978
[MIRROR] Unpicks some mining spaghetti
2019-03-28 22:01:36 -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
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
Spades
eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -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
Neerti
b43d76b86e Merge pull request #5823 from Anewbe/egun_stun
Egun stun beams are weaker
2019-01-13 00:28:56 -05:00
Mechoid
509addffdf Adds a whole bunch of Exosuit weapons and other miscellaneous parts. 2018-08-23 20:14:56 -07: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
09effef4f9 More projectiles now ignite things 2018-03-11 15:47:48 -05:00
Anewbe
534a588a6a Gun changes (#4185)
* Various background gun changes

* Forgot to include the sounds, woops

* Fixes some more gun stuff

* Makes the cham gun work again
2018-02-12 23:12:14 -08:00
Neerti
01aaccf893 Finishes UFO PoI 2017-11-26 15:10:25 -05:00
Anewbe
71ea1b2b3a Adjusts egun stun amount 2017-07-23 17:36:58 -05:00
Anewbe
6816af4485 More toys kikiki 2017-01-25 22:20:52 -06:00