Novacat
84e138f13e
Merge pull request #7134 from Novacat/nova-pathfinder
...
Removes Xenoarch access on Mining Shuttle
2020-04-05 00:09:23 -04:00
Novacat
9514a8ca01
Merge pull request #7138 from VOREStation/upstream-merge-6947
...
[MIRROR] Fixes supply shuttle display timer
2020-04-04 22:52:08 -04:00
Novacat
a3336d7499
Merge pull request #7137 from VOREStation/upstream-merge-6946
...
[MIRROR] cataloguers fit in belt slot
2020-04-04 22:43:09 -04:00
Novacat
978f936950
Merge pull request #7135 from VOREStation/upstream-merge-6945
...
[MIRROR] Adds confirmations message to cancel vote
2020-04-04 22:42:56 -04:00
Atermonera
6ad92358b6
Fixes supply shuttle display timer ( #6947 )
...
* Fixes supply shuttle display timer
* Update shuttle_supply.dm
* Radio_frequency dark magicks
2020-04-04 22:36:30 -04:00
Atermonera
b6eff8d0cf
cataloguers fit in belt slot ( #6946 )
2020-04-04 22:33:13 -04:00
Atermonera
0d9a420df4
fixes telebaton hand sprite ( #6944 )
2020-04-04 22:29:54 -04:00
Atermonera
c467445cba
Adds confirmations message to cancel vote ( #6945 )
2020-04-04 22:29:43 -04:00
Unknown
1755760a2d
Removes Xenoarch access on Mining Shuttle
...
On request from Admins
2020-04-04 21:55:18 -04:00
KasparoVy
04378e159e
Abstract Eating of Ore to Fix Unintentional Prompt
...
Using the verb with nothing in your hand brings up a prompt to select an object due to the argument in the verb.
This resolves the issue, instead just showing the "nothing in your hand" message as intended.
2020-04-03 23:14:42 -04:00
Atermonera
f8b7a706e1
Merge pull request #6917 from VOREStation/pol-telecube
...
Telecube tweaks
2020-04-03 16:24:50 -04:00
Aronai Sieyes
94d6ccd763
Merge pull request #7117 from VOREStation/aro-lookingglass
...
Add Looking glass holodeck
2020-04-03 15:14:00 -04:00
Aronai Sieyes
97986327bd
Merge pull request #7119 from VOREStation/upstream-merge-6904
...
[MIRROR] Clean up various things
2020-04-03 13:15:16 -04:00
Aronai Sieyes
b82c48ee2c
Merge pull request #7112 from Novacat/nova-shuttle
...
Adds Mechanicus Techpriest Robes
2020-04-03 13:11:33 -04:00
Novacat
ae4c21b931
Merge pull request #7120 from VOREStation/upstream-merge-6927
...
[MIRROR] Adjust turret target finding process
2020-04-03 12:58:24 -04:00
Aronai Sieyes
67dd92e196
Merge pull request #7111 from Heroman3003/slottening
...
Gives slots to most fluff items
2020-04-03 12:35:12 -04:00
Aronai Sieyes
763608fc36
Update portable_turret.dm
2020-04-03 12:25:47 -04:00
Aronai Sieyes
496a34ab2b
Update grown.dm
2020-04-03 12:24:58 -04:00
Aronai Sieyes
58dc70861c
Update unsorted.dm
2020-04-03 12:23:21 -04:00
Atermonera
2789cbe639
Adjust turret target finding process
2020-04-03 03:16:23 -04:00
Atermonera
d7a9416bb8
Clean up various things
2020-04-03 03:15:06 -04:00
Aronai Sieyes
307bea35d9
Fix console html tag
2020-04-03 00:17:39 -04:00
Aronai Sieyes
e39494a87f
VS: Vorey holodeck things
2020-04-02 23:43:13 -04:00
Aronai Sieyes
74134e4ac9
Looking Glass Holodecks
2020-04-02 23:42:47 -04:00
Aronai Sieyes
df58a60554
Fix mines qdel
2020-04-02 20:28:40 -04:00
Aronai Sieyes
6ac1c2b2fa
VS: Remove unused vorestation edits
2020-04-02 20:23:56 -04:00
Heroman
1ae1900cd3
Fixes a random v
2020-04-03 10:13:23 +10:00
Heroman
7e3019971d
Fixes identetions
2020-04-03 10:08:49 +10:00
Unknown
6d7cb1cf7a
Adds Mechanicus Techpriest Robes
...
https://www.youtube.com/watch?v=ztzq05IzYds
Adminbus Only.
2020-04-02 19:44:21 -04:00
Heroman
525bbb5650
Gives slots to most fluff items
2020-04-03 09:01:39 +10:00
Unknown
dbf10c7dbf
Finishes this PR
2020-04-02 18:28:21 -04:00
Unknown
37c563d56c
I should be more consistent in naming things
2020-04-02 15:04:53 -04:00
Unknown
575ac1018a
Voidsuit Additions
...
- Adds a Captain's voidsuit for the Captain, replaces the old Colony Director armor.
- Adds a Prototype Voidsuit. Currently has mercenary voidsuit stats and does not spawn in anywhere.
- Adds new cyclers for the new voidsuits.
2020-04-02 14:59:19 -04:00
Aronai Sieyes
edb63dc978
Merge pull request #7104 from VOREStation/aro-blahtercooler
...
Remove watercooler shields until Joan does icons
2020-04-02 11:37:42 -04:00
Aronai Sieyes
a2bf4c602a
Remove watercooler shields until Joan does icons
2020-04-02 11:23:52 -04:00
Aronai Sieyes
2f31a3dbe6
Account DB console icon fix
2020-04-02 11:20:56 -04:00
Aronai Sieyes
1626df366c
Merge pull request #7102 from VOREStation/aro-fakez
...
Improves space edge-of-map behavior and add mapping tools
2020-04-02 10:58:13 -04:00
Aronai Sieyes
e406481227
Merge pull request #7096 from VOREStation/upstream-merge-6859
...
[MIRROR] Port Bay computer icons
2020-04-02 10:58:02 -04:00
Aronai Sieyes
d16b19949d
Merge pull request #7095 from VOREStation/upstream-merge-6912
...
[MIRROR] [PORT] Speed up map load significantly
2020-04-02 10:57:40 -04:00
Aronai Sieyes
ff718f4aef
Merge pull request #7085 from KasparoVy/i-could-swear-kobolds-ate-rocks
...
Adds Ore/Gem Eater Trait
2020-04-02 10:55:36 -04:00
Aronai Sieyes
ef32afa133
Merge pull request #7083 from VOREStation/vplk-pointdefense
...
Port Point Defense Batteries
2020-04-02 10:53:29 -04:00
Aronai Sieyes
a7d5b37488
Merge pull request #7081 from VOREStation/aro-flip
...
Improves *flip, adds Traceur trait
2020-04-02 10:53:10 -04:00
Aronai Sieyes
bedcdd8d0c
Merge pull request #7082 from Heroman3003/colorwraps
...
Makes cloth footwraps colorable in loadout
2020-04-02 10:52:58 -04:00
Aronai Sieyes
9e00215790
Merge pull request #7075 from VOREStation/aro-multiwngs
...
Allow wings with a secondary color
2020-04-02 10:52:37 -04:00
Atermonera
df77f1bcf2
Port Bay computer icons
2020-04-02 10:30:21 -04:00
Aronai Sieyes
f080a4baf3
[PORT] Speed up map load significantly
2020-04-02 10:25:03 -04:00
KasparoVy
ddb22e8e97
Merge branch 'i-could-swear-kobolds-ate-rocks' of https://github.com/KasparoVy/VOREStation into i-could-swear-kobolds-ate-rocks
2020-04-02 09:53:49 -04:00
KasparoVy
5ba1fda952
Slight Grammar Adjustment
2020-04-02 09:53:25 -04:00
Aronai Sieyes
09003a6c61
Improve space map edges
2020-04-02 01:08:07 -04:00
ArgobargSoup
5b21fa1ff5
Makes fish meat non-toxic, attempt number 2
2020-04-01 21:39:24 -07:00