Commit Graph

823 Commits

Author SHA1 Message Date
r4d6 d628ce8ff4 Move the cigar cases to a new _ch file 2020-11-10 00:04:17 -05:00
r4d6 d0cbf7f856 Add cigar cases to the loadout. 2020-11-09 19:23:00 -05:00
Cadyn 947fe850ff Yummy bugfixes 2020-10-27 19:58:49 -07:00
Verkister 9848c0e719 Merge pull request #9225 from VOREStation/upstream-merge-7708
[MIRROR] Makes wall-mounted machines layer above windows
2020-10-27 08:16:29 +00:00
Cadyn 07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz 54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07: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
Cerebulon 95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
SubberTheFabulous 378ba4f4c0 Adds two new augments to Traitor uplink 2020-09-20 06:49:58 -04:00
izac112 5fbb0b16b9 Voreupdate 2020-09-13 15:06:19 +02:00
izac112 4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
ShadowLarkens c32f05e1f7 TGUI Civilian
UI's Converted:
 - Aurora Cooking
 - Chaplain Book Selection
 - ColorMate
 - Cryo Storage
 - Holodeck
 - Jukebox
 - Looking Glass
 - Microwave
 - Newscasters
 - Timeclock
 - Vending Machine Improvements
2020-09-02 13:32:42 -07:00
Cerebulon 7c57c7c0bd Vendor enhancement fixes (#7577)
* Vendor enhancement fixes

* skrellsnax trash, tuna name
2020-08-30 02:49:00 -04:00
Novacat 28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571
[MIRROR] Colony Director -> Site Manager
2020-08-28 13:17:58 -04:00
Atermonera 21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Novacat a69e94f948 Merge pull request #8519 from KillianKirilenko/kk-misc2
Explorer/Pathfinder Belts
2020-08-25 17:15:14 -04:00
izac112 48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Atermonera 1e9e8c2c60 Flavour Enhancement: Vending 2020-08-20 21:25:31 -04:00
izac112 81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Razgriz f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
Mechoid c20bab52d4 Exosuit Modular Internals, The Squeakening 2020-08-05 19:22:23 -04:00
izac112 c85bf8104c Voreupdate (Small) 2020-08-05 17:45:22 +02:00
lbnesquik fbacbad91d Tweaks to taur clothes, particularly saddles as well as tail tags.
- Remove capitalisation from back_vr.dmi
- Add a tag to most tails. This can be used for many things, but mostly to have an simpler check of the tail type. See backpack_vr.dm.
- Switch the backpack sprite selection to a switch()
2020-08-02 22:22:27 +02:00
Killian c98499403b Update belt_vr.dm 2020-07-30 02:51:21 +01:00
Killian 71d332a636 Update belt_vr.dm 2020-07-29 05:44:59 +01:00
Killian f6df2b83a8 explorer belts 2020-07-29 05:25:18 +01:00
izac112 601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Cerebulon 8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
izac112 1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
Razgriz 02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
Schnayy 99a977ee3d Merge pull request #6799 from Cerebulon/booksprites
New book sprites + inhands
2020-07-09 17:33:58 -04:00
izac112 3113cc8605 adds health analyzer back to regular medkits 2020-07-08 14:52:26 +02:00
izac112 4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02:00
Unknown 0412103fc2 Vox Phoron and Adminbus Backpacks
- Fixes broken object sprites for adminbus backpacks
- Increases default air contents of Vox Phoron tank to 10 atmos (up from 6 atmos)
2020-06-14 12:15:58 -04:00
izac112 e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Razgriz 3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes 09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112 c14d144d45 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-18 16:05:36 +02:00
Aronai Sieyes 03c805a34a New janicart sprites/features 2020-05-17 16:49:03 -04:00
izac112 a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
Atermonera 5e6cbc0315 Fixes Runtime in ,: bad arg name 'disable_warning' 2020-05-15 16:39:04 -04:00
izac112 bba0a05f5f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-13 10:21:49 +02:00
Aronai Sieyes f380f13c10 Fix whitespace merge 2020-05-11 21:51:21 -04:00
Atermonera b9c03fe3f1 Port Hover Inventory and Body Indicators 2020-05-11 20:05:03 -04:00
izac112 2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Rykka 5c5ac378a4 Port of Hover Inventory and Body Zone Hover Indicators.
The body zone selector now indicates which body part you are about to select when hovered over, and the hover inventory indicator basically shows where you are trying to put an item, and then shows an item ghost in red or green, giving visual feedback as to if that item will go in the slot or not.

Gifs of this in action:
![https://i.imgur.com/MTi7Kpn.gif](https://i.imgur.com/MTi7Kpn.gif) 
Body Selection parts.

![https://i.imgur.com/KbLqWKy.gif](https://i.imgur.com/KbLqWKy.gif) 
Inventory Icon Overlays!

Credit goes to @ShadowLarkens for original port to Paradise and assistance with port to Virgo. Downstream port of https://github.com/VOREStation/VOREStation/pull/7748

- A note on `code/game/objects/items/weapons/storage/internal.dm`, VSCode automatically corrected the line endings, hence the massive filediff. The only practical changes are the addition of `disable_warning = 0`
2020-05-10 08:24:40 -04:00
Rykka dd187c900d Port over Hover Inventory and Body Zone Hover Indicator
The body zone selector now indicates which body part you are about to select when hovered over, and the hover inventory indicator basically shows where you are trying to put an item, and then shows an item ghost in red or green, giving visual feedback as to if that item will go in the slot or not.

Gifs of this in action:
![https://i.imgur.com/MTi7Kpn.gif](https://i.imgur.com/MTi7Kpn.gif) Body Selection parts.

![https://i.imgur.com/KbLqWKy.gifv](https://i.imgur.com/KbLqWKy.gifv) 
Inventory Icon Overlays!

Credit goes to @ShadowLarkens for original port to Paradise and assistance with port to Virgo. Sending to Polaris ASAP.

- A note on `code/game/objects/items/weapons/storage/internal.dm`, VSCode automatically corrected the line endings, hence the massive filediff. The only practical changes are the addition of `disable_warning = 0`
2020-05-10 07:29:53 -04:00
Aronai Sieyes d172e2dd04 Cached version of icon_states() proc 2020-05-06 16:06:44 -04:00
izac112 e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
2020-05-06 21:53:03 +02:00