VirgoBot
9c3bd0bb16
Fixes killer tomato mutation
2020-02-01 18:08:47 -05:00
Atermonera
66b7793d25
Merge pull request #6661 from LeighKnapenberger/patch-1
...
Fixes killer tomato mutation
2020-02-01 18:08:47 -05:00
VirgoBot
5e4759fe86
Prettifies closet contents list with (newly added) countable variant of english_list
2020-02-01 18:01:23 -05:00
Atermonera
80ec8ac200
Merge pull request #6656 from Amunak/countable-lists
...
Prettifies closet contents list with (newly added) countable variant of english_list
2020-02-01 18:01:23 -05:00
VirgoBot
19bb9be006
Teshari Poncho Fix
2020-02-01 18:01:13 -05:00
Atermonera
00f301d802
Merge pull request #6658 from Darlantanis/TeshariPonchoFix
...
Teshari Poncho Fix
2020-02-01 18:01:12 -05:00
Novacat
c6230e921d
Merge pull request #6526 from KillianKirilenko/kk-fixes
...
[DOWNSTREAM PORT] Hardsuit Helmet Fixes & Updates
2020-02-01 11:05:21 -05:00
Killian
e0121d14f8
sci/ami helmet
2020-02-01 14:34:55 +00:00
Killian
052380be50
updates & fixes
2020-02-01 13:55:40 +00:00
Novacat
2c036ccb49
Merge pull request #6525 from VOREStation/upstream-merge-6654
...
[MIRROR] Fixes antibiotic resistance
2020-02-01 00:07:22 -05:00
VirgoBot
b2f5e20d46
Fixes antibiotic resistance
2020-01-31 23:46:54 -05:00
Cerebulon
e0258e1449
Fixes antibiotic resistance being reset when copied to new datum instance ( #6654 )
2020-01-31 23:46:54 -05:00
Heroman
778544fe67
Makes syndie beacon found in xenoarch use virgo-specific subtype
2020-02-01 09:55:47 +10:00
Heroman
4fc576a19d
Adds a single empty jetpack to belt mining office
2020-02-01 09:25:31 +10:00
Heroman
32a30fa527
Moves jetpack into its own expensive crate
2020-02-01 09:21:30 +10:00
Arokha Sieyes
2b01382eed
Needs to return true
2020-01-31 15:11:33 -05:00
Arokha Sieyes
aa528264dd
Add some vorestation-specific IPR things
2020-01-31 14:53:52 -05:00
Heroman
f2981ad53c
Adds oxygen canister and a rack to belt mining office
2020-01-31 15:39:30 +10:00
Heroman
2144e95ca7
Increases amount of supplies in belt mining crate
2020-01-31 15:32:50 +10:00
Novacat
d336d3e558
Merge pull request #6517 from VOREStation/upstream-merge-6652
...
[MIRROR] Hacky Fix for Athletic Shorts showing Missing Icon
2020-01-30 20:34:03 -05:00
VirgoBot
d1d8d3e8b3
Hacky Fix for Athletic Shorts showing Missing Icon
2020-01-30 19:24:59 -05:00
Atermonera
1bc3ccf858
Merge pull request #6652 from Rykka-Stormheart/shep-dev-missing-no
...
Hacky Fix for Athletic Shorts showing Missing Icon
2020-01-30 19:24:59 -05:00
Novacat
7a9f31a26a
Merge pull request #6515 from TheFurryFeline/patch-18
...
Redundant Warning Removed
2020-01-30 02:09:59 -05:00
Novacat
923855a5d1
Update update_icons.dm
2020-01-30 02:03:56 -05:00
Novacat
69b1cbf995
Update update_icons.dm
2020-01-30 02:00:31 -05:00
Novacat
eb467280e8
Update update_icons.dm
2020-01-30 01:58:34 -05:00
Novacat
b8a6c15a86
Merge pull request #6516 from Heroman3003/poifix
...
Fixes wolfden and derilict errors
2020-01-30 01:51:42 -05:00
Novacat
12619433bc
Merge pull request #6513 from VOREStation/upstream-merge-6650
...
[MIRROR] Fixes constant stacking machine runtimes
2020-01-30 01:51:26 -05:00
Heroman
ce85d96088
Fixes wolfden and derilict errors
2020-01-30 09:59:25 +10:00
TheFurryFeline
301cae5994
Redundant Warning Removed
...
Changelog Notes:
- Removes the big, honking red text about archive being slated for removal. We're not removing entries from the database.
2020-01-29 12:28:28 -05:00
Atermonera
130d942a2d
Ports Clothing Expansion Code from World Server
2020-01-28 14:16:24 -05:00
VirgoBot
b7039f95b7
Fixes constant stacking machine runtimes
2020-01-28 14:14:06 -05:00
Atermonera
16989eaa84
Merge pull request #6650 from Shadow-Quill/Stacker-Runtime-Fix
...
Fixes constant stacking machine runtimes
2020-01-28 14:14:06 -05:00
Heroman
0915cfd9e5
Resolves conflicts, updates description
2020-01-28 13:05:55 +10:00
Heroman
a733980a6e
Merge branch 'master' of https://github.com/VOREStation/VOREStation into morphevent
2020-01-28 12:43:47 +10:00
Heroman
308ee2dc6a
Limites the locations at which drone pod can drop
2020-01-28 10:20:59 +10:00
Novacat
87d4a21676
Merge pull request #6510 from TheFurryFeline/TFF-Reading_Room_Rooms_Fixy
...
[Map] Bolt Dat Door Down
2020-01-27 15:34:16 -05:00
TheFurryFeline
c79c75e4c6
Bolt Dat Door Down
...
So apparently I made an oversight with the bolt hatch controls..... Fixed now.
Changelog Notes:
- Changes buttons in the Reading Room cubicles to bolt their respective doors down, not open them.
2020-01-27 12:38:24 -05:00
Novacat
75b8b621f9
Merge pull request #6490 from Rykka-Stormheart/shep-dev-borghound-buffs
...
Add additional tools for Research Hound and Pupdozer - Upstream Port
2020-01-26 16:38:37 -05:00
Novacat
f522a88378
Merge pull request #6489 from Rykka-Stormheart/shep-dev-pupdozer-model
...
Add Citadel RP Alternative Pupdozer + Additional Tools - Upstream Port
2020-01-26 16:38:25 -05:00
Verkister
1392f268ec
A ban-flinging QoL update
...
Sabotages the exploitable ban-dodging mob-lock "feature" of the ban system. Like dude we're banning a client, not a mob so shut up and let us work.
2020-01-26 13:06:26 +02:00
Novacat
4505684fbd
Merge pull request #6507 from VOREStation/upstream-merge-6603
...
[MIRROR] Add an audible alarm sound to SM Delamination
2020-01-25 23:04:14 -05:00
Novacat
c44268a96d
Merge pull request #6506 from VOREStation/upstream-merge-6649
...
[MIRROR] Fixes Bagel Poppy Recipe
2020-01-25 22:56:34 -05:00
Novacat
2366e865f3
Update supermatter.dm
2020-01-25 22:56:18 -05:00
Novacat
3f9521641b
Merge pull request #6505 from VOREStation/upstream-merge-6637
...
[MIRROR] Augments Respect Beds, Robotic
2020-01-25 22:55:15 -05:00
Atermonera
d5869f2c3f
Add an audible alarm sound to SM Delamination
2020-01-25 22:25:49 -05:00
VirgoBot
6ebc8e5aed
Fixes Bagel Poppy Recipe
2020-01-25 22:16:18 -05:00
Atermonera
4e523c9b5e
Merge pull request #6649 from Trexdude/patch-1
...
Fixes Bagel Poppy Recipe
2020-01-25 22:16:18 -05:00
VirgoBot
479bfcb38e
Augments Respect Beds, Robotic
2020-01-25 22:14:02 -05:00
Atermonera
560a24ee83
Merge pull request #6637 from Mechoid/AugmentsRespectBeds
...
Augments Respect Beds, Robotic
2020-01-25 22:14:02 -05:00