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
Killian
d7f156ac13
fashion attack 2: jackets
2020-02-19 22:45:01 +00:00
Repede
1950b800d0
Rin Deimos fluff item, just a crystal that does nothing.
2020-02-18 19:33:17 -05:00
Heroman
a6d6cf7825
More fixes for broken medical
2020-02-19 08:35:37 +10: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
cdd0885c93
Fixes broken tool usability logic for surgery
2020-02-18 18:11:35 +10: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
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
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
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
0554a83b12
Merge branch 'master' into YWiconadd
2020-02-17 18:08:07 +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
Izac Joof Forsgren
d2010f54c5
Merge branch 'master' into kk-miscstuff
2020-02-17 17:44:09 +01:00
Izac Joof Forsgren
7831355f08
Merge branch 'master' into promwaterchemreagentreadd
2020-02-17 17:09:04 +01:00
Killian
510878e3af
Merge branch 'master' into kk-traffic
2020-02-17 16:02:43 +00:00
Izac Joof Forsgren
d3877ca734
Merge branch 'master' into YWiconadd
2020-02-17 16:45:40 +01:00
Izac Joof Forsgren
e2c3bba626
Merge branch 'master' into kk-fixes
2020-02-17 16:42:57 +01:00
Izac Joof Forsgren
db054858c4
Merge branch 'master' into promwaterchemreagentreadd
2020-02-17 16:42:44 +01:00
Izac Joof Forsgren
4bfb037be2
Merge branch 'master' into kk-miscstuff
2020-02-17 16:41:50 +01:00
Repede
130ef71bac
Merge branch 'master' into promwaterchemreagentreadd
2020-02-17 08:24:30 -05:00
Killian
dcd691245c
feex title
2020-02-17 10:35:55 +00:00
Rykka
ee7a2d8d89
EARLYPORT: Fix Air Pump loop sound stacking multiple times per pump.
...
Turns out that the # was so, so, so far off. It was acting as if it was 0.4 seconds per loop, for an 11 SECOND SOUND FILE.
My bad.
Earlyport of https://github.com/PolarisSS13/Polaris/pull/6700 and https://github.com/VOREStation/VOREStation/pull/6585
2020-02-17 03:00:02 -07:00
Rykka
39567d75e2
EARLYPORT: Fix Air Pump loop sound stacking multiple times per pump.
...
Turns out that the # was so, so, so far off. It was acting as if it was 0.4 seconds per loop, for an 11 SECOND SOUND FILE.
My bad.
Earlyport of https://github.com/PolarisSS13/Polaris/pull/6700
2020-02-17 02:59:13 -07:00
Novacat
33570d10e6
Update ore_box.dm
2020-02-17 01:33:15 -05:00
Novacat
332e3271d9
Update ore_box.dm
2020-02-17 01:31:48 -05:00
Novacat
e8526a420c
Update robot.dm
2020-02-17 01:30:10 -05:00
Novacat
5ea36b7a60
Update robot_movement.dm
2020-02-17 01:29:20 -05:00
Heroman3003
57b7302ea1
Fixes null empty supplypack appearing in last category ( #6698 )
2020-02-17 01:19:44 -05:00
Atermonera
c5b6dfa259
Fixes mining borg ore box movement astral sorcery
2020-02-17 01:18:31 -05:00
Unknown
a5f3776a91
adds _vr to trash pile
2020-02-17 00:01:50 -05:00
SplinterGP
aa4f6a2e94
Adds aroozee fluff item
2020-02-16 22:35:41 -03:00
Killian
d39ed8d0f2
glasses!
2020-02-17 00:29:44 +00:00
Killian
719e7f8b6c
2 new sdf events
2020-02-16 23:41:46 +00:00
SplinterGP
3cce28075b
Adds AMI helmet and suit sprite for vulps, and more
...
Adds ami helmet and suit sprite for vulps, also adds magboots and gloves sprite but these adds to all species
2020-02-16 17:30:06 -03:00
Unknown
b5f337a3b0
Replaces Tramadol maint pills with Paracetamol
2020-02-16 10:54:55 -05:00
Killian
efe1b16344
Update organizations.dm
2020-02-16 08:02:18 +00:00
Killian
77268ada27
Merge branch 'master' into kk-traffic
2020-02-16 07:00:56 +00:00
Killian
92e988d3c4
edit comments
2020-02-16 06:34:09 +00:00
Killian
21841cd6c0
small NT destinations update
2020-02-16 05:35:45 +00:00
