Commit Graph

11 Commits

Author SHA1 Message Date
Atermonera
35e0eeec78 Makes Heavy-Duty Cell Chargers Constructable 2019-07-30 20:18:33 -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
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
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Anewbe
b5a4a58996 Merge pull request #5790 from Mechoid/Make_Security_Sad
Drop the number of shots of normal and sec-xeno tasers back down to 5.
2019-01-06 17:52:23 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Anewbe
5212fa152b Species names should now use defines 2018-03-15 20:24:45 -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
Mechoid
251297a2ba Promethean Balancing, Lore-compliant Modification of Security Equipment (#4722)
* Works on Balancing Prometheans

* Reorganize from Master Merge

* Tries to fix that gun conflict that the DMI merger apparently did fine?
2018-02-08 14:58:17 -06:00
Anewbe
a66072fcf2 Shifts around a few Tech Levels. 2017-09-23 12:54:04 -05:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00