izac112
a0ab995551
updates README.md to actually refer to us
2020-02-23 20:52:07 +00:00
izac112
e62690f2c4
Updates CONTRIBUTING.md to actually refer to us
2020-02-23 20:51:57 +00:00
Repede
dbae1367c5
Merge pull request #607 from SplinterGP/Upstream-update
...
Adds our AMI suit and Helmet sprite back.
2020-02-22 13:37:36 -05:00
SplinterGP
9e157e5acc
Adds our AMI suit and Helmet sprite back.
2020-02-22 15:25:10 -03:00
Repede
7ff67d6909
Fixes typo
2020-02-22 12:44:30 -05:00
Repede
4cf7f71be6
Merge branch 'release' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/area/Away Mission areas.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/items/weapons/teleportation.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/events/event_container_vr.dm
# code/modules/mining/ore_box.dm
# code/modules/paperwork/paper.dm
# code/modules/rogueminer_vr/zone_console.dm
# config/custom_items.txt
# icons/mob/items/lefthand_suits.dmi
# icons/mob/items/righthand_suits.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/suits.dmi
# maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
Repede
7fc70caa43
Resetting master
2020-02-22 12:28:01 -05:00
Repede
d2be757363
Merge pull request #596 from KillianKirilenko/kk-miscstuff
...
Fashion Attack II: Jackets Edition
2020-02-21 19:38:31 -05:00
Killian
d7f156ac13
fashion attack 2: jackets
2020-02-19 22:45:01 +00:00
Repede
641b8eddd5
Merge pull request #593 from Yawn-Wider/rinfluff
...
Rin Deimos fluff item, just a crystal that does nothing.
2020-02-18 20:41:05 -05:00
Repede
1950b800d0
Rin Deimos fluff item, just a crystal that does nothing.
2020-02-18 19:33:17 -05:00
Novacat
5ab3654a44
Merge pull request #6602 from VOREStation/master
...
Emergency Hotfix
2020-02-18 18:27:07 -05:00
Novacat
04e273910c
Merge pull request #6601 from Heroman3003/medfix
...
More fixes for broken medical
2020-02-18 18:16:01 -05:00
Heroman
a6d6cf7825
More fixes for broken medical
2020-02-19 08:35:37 +10:00
Aronai Sieyes
0539e8abe6
Merge pull request #6600 from VOREStation/master
...
Release
2020-02-18 14:26:21 -05:00
Aronai Sieyes
ffefb8b486
Merge pull request #6599 from Heroman3003/iconfix
...
Fixes some shuttle chairs still having broken icons
2020-02-18 14:16:09 -05:00
Aronai Sieyes
24ebfa36f1
Merge pull request #6581 from Heroman3003/pluspineapple
...
Adds pineapple pizza to pizza voucher pool
2020-02-18 14:08:53 -05:00
Heroman
b3ab8938f0
Fixes some shuttle chairs still having broken icons
2020-02-19 04:56:28 +10:00
Novacat
1f357d58da
Merge pull request #6597 from Heroman3003/master
...
Fixes broken optable light in surface medical
2020-02-18 09:05:57 -05:00
Novacat
aefff4d18e
Merge pull request #6596 from Heroman3003/surgfix
...
Fixes broken tool usability logic for surgery
2020-02-18 09:05:44 -05:00
Heroman
ed414bad57
Fixes broken optable light in surface medical
2020-02-18 18:16:22 +10:00
Heroman
cdd0885c93
Fixes broken tool usability logic for surgery
2020-02-18 18:11:35 +10:00
Novacat
82b6b89145
Merge pull request #6594 from Heroman3003/chair-icon
...
Fixes missing icons on comfy chairs and shuttle chairs
2020-02-17 22:56:51 -05:00
Heroman
f238c1554e
Fixes missing icons on comfy chairs and shuttle chairs
2020-02-18 13:20:58 +10:00
Novacat
21531a8407
Merge pull request #6564 from VOREStation/master
...
Release PR - Feb 17 2020
2020-02-17 20:51:31 -05:00
Novacat
314c290392
Merge pull request #6590 from VOREStation/ss-timer-debugging
...
Add debugging logs in an effort to track down the Timer subsystem failure point.
2020-02-17 20:41:30 -05:00
Leshana
25fd4147c5
Add debugging logs in an effort to track down the Timer subsystem failure point.
...
Given unsuccessful attempts to reproduce in testing, we need logging in production. These logging statements can be removed once the root cause is discovered.
2020-02-17 20:27:26 -05:00
Novacat
11e6ed63a3
Merge pull request #6589 from Meghan-Rossi/fluffstuff
...
Fluff items and species whitelisting
2020-02-17 20:09:55 -05:00
Meghan-Rossi
dfc42293c7
Fluff items and species whitelisting
...
*Adds AmareWolf to Xenochimera whitelist - approved in https://forum.vore-station.net/viewtopic.php?f=46&t=1655
*Adds medal of unity for Roy Tilton - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1629
*Adds balaclava for Monty Kopic - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1628
*Adds warning collar for Excess - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1593
*Deletes obsolete/unused file "custom_items.txt"
2020-02-18 00:27:36 +00:00
Novacat
3c816a6a30
Merge pull request #6588 from Heroman3003/mining-areas
...
Adjustments to solars z-level's areas
2020-02-17 18:39:52 -05:00
Heroman
a1eb556417
Adjustments to solars z-level's areas
2020-02-18 08:55:22 +10:00
Izac Joof Forsgren
96765c08bf
Merge pull request #589 from KillianKirilenko/kk-miscstuff
...
[FIX] AR-M Glasses Unselectable
2020-02-17 23:10:35 +01:00
Izac Joof Forsgren
b8de07f1b8
Merge branch 'master' into kk-miscstuff
2020-02-17 22:53:10 +01:00
Killian
891761e96a
quickfix
2020-02-17 21:49:36 +00:00
Izac Joof Forsgren
107cd6e124
Merge pull request #588 from Rykka-Stormheart/shep-dev-air-pump-loop-fix
...
I am officially dumb - Idle should be 70, 110.
2020-02-17 22:21:21 +01:00
Novacat
ed37b715aa
Merge pull request #6582 from Novacat/nova-basicfixes
...
Replaces Tramadol maint pills with Paracetamol
2020-02-17 16:12:28 -05:00
Novacat
9bead57015
Merge pull request #6587 from Rykka-Stormheart/shep-dev-air-loop-fix
...
Final fix of air pump loop length. 7 x 10 is 70, not 110.
2020-02-17 16:12:07 -05:00
Rykka
5e2f2db1ed
Final fix. I swear.
2020-02-17 14:02:10 -07:00
Izac Joof Forsgren
7fd7906eb8
Merge branch 'master' into shep-dev-air-pump-loop-fix
2020-02-17 22:02:05 +01:00
Rykka
a2f5391190
I am the big smart. Adjust this to 70, not 110.
2020-02-17 14:00:21 -07:00
Novacat
a41430ae20
Merge pull request #6586 from VOREStation/randomverbs
...
Don't talk to strangers
2020-02-17 15:11:23 -05:00
Izac Joof Forsgren
2950b03e5a
Merge pull request #579 from KillianKirilenko/kk-traffic
...
[PORT] Improved Traffic System (with Updates!)
2020-02-17 18:53:32 +01:00
Arokha Sieyes
14942ee6c7
VS: Don't talk to strangers
2020-02-17 12:44:17 -05:00
Arokha Sieyes
3cbd51c6d1
Don't talk to strangers
2020-02-17 12:44:10 -05:00
Killian
72acdd2dac
Merge branch 'master' into kk-traffic
2020-02-17 17:35:47 +00:00
Izac Joof Forsgren
6dfb0753d4
Merge pull request #581 from SplinterGP/YWiconadd
...
Adds AMI helmet and suit sprite for vulps. also adds magboots and gauntlets to all species.
2020-02-17 18:30:00 +01:00
Izac Joof Forsgren
0554a83b12
Merge branch 'master' into YWiconadd
2020-02-17 18:08:07 +01:00
Izac Joof Forsgren
616e02effb
Merge pull request #582 from KillianKirilenko/kk-miscstuff
...
[LOADOUT] Department AR Glasses
2020-02-17 18:07:03 +01:00
Novacat
af6a2b5e55
Merge pull request #6583 from VOREStation/upstream-merge-6693
...
[MIRROR] Fixes mining borg ore box movement astral sorcery
2020-02-17 11:45:26 -05:00
Novacat
8c6bdf1854
Merge pull request #6585 from Rykka-Stormheart/shep-dev-air-loop-fix
...
EARLYPORT: Fix Air Pump loop sound stacking multiple times per pump.
2020-02-17 11:45:12 -05:00
