Commit Graph

1367 Commits

Author SHA1 Message Date
Atermonera
cd10c54d5c Merge pull request #6834 from Mechoid/RIGFixes
Fix various RIG issues
2020-03-17 01:06:31 -04:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Atermonera
ecd37a0c71 Merge pull request #6781 from Mechoid/RailgunTweakening
Tweak Station-Railguns
2020-03-13 17:16:17 -04:00
Atermonera
e45a95d365 Robotics Expansion: RIG-ged and Ready 2020-03-11 15:56:18 -04:00
Mechoid
acc712e1d5 Exosuit Expansion: Return of the Ripley 2020-03-08 00:52:32 -05:00
Novacat
6e23c5f45a Merge pull request #6709 from VOREStation/aro-mistake
Fix way too many vorestation edits
2020-03-05 19:03:58 -05:00
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase
VChat: Redone chat output in Vue.js
2020-03-01 10:51:29 -05:00
Aronai Sieyes
f475ecbdc6 Replace a bunch of VOREStation edits that can be sent to Polaris 2020-02-29 19:45:58 -05:00
Atermonera
55704e0760 Merge pull request #6729 from Mechoid/RailgunFixxo
Fix and tweak station Railguns.
2020-02-24 16:15:04 -05:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Arokha Sieyes
d5b820fc58 VChat: Redone chat output in Vue.js
Co-authored-by: Leshana <Leshana@users.noreply.github.com>
2020-02-19 19:55:01 -05:00
Arokha Sieyes
7f1aabbf25 Weird cases where to_chat freaks out 2020-02-12 19:38:45 -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
Mechoid
c3079004ea GameMaster Tuning (#6593)
* Actually Game Master but I am an idiot.
2020-01-05 01:39:28 -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
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Atermonera
a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Novacat
6b2c7cc29a Update energy.dm 2019-10-21 19:54:30 -04:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Atermonera
93bbae11e7 Merge pull request #6475 from R1f72r/Phoronboreupgrade
Allows you to upgrade Phoron Bore with manipulators
2019-10-08 04:22:06 -04:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Atermonera
6e4fc794d6 Merge pull request #6467 from Heroman3003/datum-timer-beam
Makes every single shot not create ~40 timers but 1
2019-09-27 16:07:25 -04:00
FelixRuin
93cf2d41e1 fix gun handle_suicide 2019-09-21 15:01:55 +03: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
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
Heroman
703c27da7e Refactors shadekin 2019-04-28 15:10:06 +10: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