Zandario
8f86c8742c
No idea how much y'all use these but that's kinda a smol OOF
2020-10-01 21:00:47 -05:00
Novacat
06e9971d0b
Merge pull request #9141 from dwinters99/wolftaur
...
Fixes #9099
2020-09-30 16:05:36 -04:00
Riley
ec42a286d0
Clara's Vacuum Flask
...
Accepted Fluff Request: https://forum.vore-station.net/viewtopic.php?f=26&t=1831
Load out cost is one, the same as a standard vacuum flask, no freebies here!
Big thanks to everyone who put up with my confused screaming, especially Heroman :)
2020-09-29 18:01:07 -04:00
David Winters
93f9e1908d
fixes #9099
2020-09-29 04:28:40 -04:00
David Winters
42bb682240
Fixes #8592
2020-09-29 01:18:06 -04:00
Novacat
1e396dbf98
Merge pull request #9107 from KillianKirilenko/kk-grubs
...
Oregrubs
2020-09-28 03:30:44 -04:00
Novacat
f7872acb63
Merge pull request #9130 from Screemonster/treebreathers
...
Fix alraune suit detection
2020-09-27 20:01:50 -04:00
DESKTOP-4BUBN9N\Mike
9ff12d4e80
Fix alraune suit detection
2020-09-28 00:24:42 +01:00
ShadowLarkens
3d7b051f2b
Convert /material to /datum/material
2020-09-27 16:16:44 -07:00
Novacat
bd2b0cefbf
Merge pull request #8994 from KillianKirilenko/kk-adminships
...
ERT & Mercenary Ship Remodels
2020-09-27 17:21:14 -04:00
Novacat
386f23e8e7
Merge pull request #9126 from Heroman3003/delicious-hat
...
Adds Charles' Tophat
2020-09-27 17:04:38 -04:00
Novacat
e8f7b01ea4
Merge branch 'master' into kk-adminships
2020-09-27 17:02:08 -04:00
Novacat
7561a5cfd6
Merge pull request #8926 from KillianKirilenko/kk-ships
...
Additional Ships
2020-09-27 17:01:12 -04:00
Heroman
c9a019ee01
Adds Charles' Tophat
2020-09-28 04:54:23 +10:00
Novacat
65c677ba30
Merge pull request #9088 from ShadowLarkens/shadow_fluff
...
Add Shadow Larkens laptop fluff item
2020-09-26 21:16:21 -04:00
Novacat
a0d85d7f19
Merge pull request #9119 from VOREStation/upstream-merge-7690
...
[MIRROR] Berry
2020-09-26 17:15:05 -04:00
Novacat
f36a14c9cb
Merge pull request #9118 from VOREStation/upstream-merge-7685
...
[MIRROR] Teshari sprites and white eyepatch
2020-09-26 17:14:54 -04:00
Atermonera
7729934492
Merge pull request #7690 from Mechoid/Berry
...
Berry
2020-09-26 17:00:01 -04:00
Atermonera
123a0fd115
Merge pull request #7685 from Greenjoe12345/teshstuff-and-eyepatch
...
Teshari sprites and white eyepatch
2020-09-26 16:58:44 -04:00
Novacat
d9888de9f8
Merge pull request #9104 from ShadowLarkens/nifsoft_icon
...
Icons for NIFSoft Boxes
2020-09-26 16:58:42 -04:00
Novacat
10eb827a53
Merge pull request #9103 from ShadowLarkens/nanomaps_github_action
...
Nanomaps GitHub action & TGUI Improvements
2020-09-26 16:58:02 -04:00
Novacat
3d0ce2afd4
Merge branch 'master' into shadow_fluff
2020-09-26 16:49:30 -04:00
Atermonera
5fb16b70d6
Merge pull request #7686 from ShadowLarkens/mcomputer_overlay
...
Allow separate overlays file for modular computers
2020-09-26 16:31:20 -04:00
Killian
f87c5475c3
Update oregrub.dm
2020-09-25 17:55:04 +01:00
Killian
696e3e1d5e
Update oregrub.dm
2020-09-25 16:19:32 +01:00
Killian
be10b6940d
Update oregrub.dm
2020-09-25 16:18:45 +01:00
Killian
8c588d5eb6
lootgrubs
2020-09-25 16:02:56 +01:00
ShadowLarkens
1cd53493fd
Icons for NIFSoft Boxes
2020-09-25 04:40:32 -07:00
ShadowLarkens
92ff2bcbf4
Recompile nanomaps, and add nanomap improvements
2020-09-25 03:52:49 -07:00
ShadowLarkens
cf9b39b4a9
Set up GitHub action for nanomap generation
2020-09-25 03:25:07 -07:00
Runa Dacino
c64b0425a1
Adds spiderscience to research borg modules
2020-09-24 12:54:49 +02:00
Verkister
959cfbe591
Merge pull request #9074 from KasparoVy/darker_new_tesh_hair
...
Makes Darker icon_add Versions of ArkStation Tesh Hair
2020-09-24 11:18:00 +03:00
Verkister
958e0f28b3
Merge pull request #9060 from Verkister/bstripes
...
Adds bee stripes marking by radiantaurora
2020-09-24 11:17:16 +03:00
Novacat
44a1a3428c
Merge pull request #9094 from VOREStation/upstream-merge-7676
...
[MIRROR] Fixes runtime in add_reagent()
2020-09-24 02:10:07 -04:00
Atermonera
3204c9f9a5
Fixes runtime in add_reagent() ( #7676 )
...
Bad index: data["species"] when data is not a list
2020-09-22 23:40:38 -04:00
Atermonera
9c74c998c7
Fixes runtime in prison_break.dm ( #7677 )
...
Bad arg name: open_blast_doors
2020-09-22 23:40:26 -04:00
Novacat
41c8e4a671
Merge pull request #9032 from VOREStation/upstream-merge-7475
...
[MIRROR] Hydro upkeep
2020-09-21 19:42:43 -04:00
Atermonera
6d652a6a67
Merge pull request #7641 from ShadowLarkens/patch-1
...
Fix communicator video
2020-09-21 19:09:17 -04:00
Novacat
4b83c18fb7
Merge pull request #9071 from VOREStation/upstream-merge-7660
...
[MIRROR] Fix duplicate results from analyzing some objects
2020-09-21 16:54:29 -04:00
Novacat
d49640431d
Merge pull request #9062 from ShadowLarkens/tgui_finale
...
NanoUI Goes To Brazil
2020-09-21 14:13:16 -04:00
Novacat
0ed68c9d54
Merge pull request #9078 from VOREStation/upstream-merge-7669
...
[MIRROR] Fix Beaker Dipping
2020-09-21 14:06:28 -04:00
Novacat
fd563559ad
Merge pull request #9077 from VOREStation/upstream-merge-7668
...
[MIRROR] Actually commit the reagent cycler's entire gimmick.
2020-09-21 14:06:14 -04:00
Novacat
e72d810c31
Update _appliance.dm
2020-09-21 13:54:40 -04:00
Novacat
23d0b9a699
Update _appliance.dm
2020-09-21 13:54:02 -04:00
Novacat
6fad165033
Merge pull request #9067 from VOREStation/upstream-merge-7651
...
[MIRROR] Tweaks to pickup/equip sounds.
2020-09-21 13:51:44 -04:00
Novacat
9eff136dc9
Merge pull request #9063 from VOREStation/upstream-merge-7642
...
[MIRROR] Adds two new augments to Traitor uplink
2020-09-21 13:50:29 -04:00
Novacat
c41b172afb
Merge pull request #9064 from VOREStation/upstream-merge-7645
...
[MIRROR] Improve gun animations to be more modular.
2020-09-21 13:50:05 -04:00
Novacat
32fa026aa5
Merge pull request #9079 from VOREStation/upstream-merge-7672
...
[MIRROR] Fix fat tasting bitter
2020-09-21 13:43:02 -04:00
Novacat
1879ed2084
Merge pull request #9070 from VOREStation/upstream-merge-7659
...
[MIRROR] Fix trying to put people on themselves with the stripping menu
2020-09-21 13:39:49 -04:00
Novacat
3bce6d22e7
Merge pull request #9069 from VOREStation/upstream-merge-7658
...
[MIRROR] Fix stripping.dm cloning
2020-09-21 13:39:31 -04:00
