Commit Graph

30594 Commits

Author SHA1 Message Date
Atermonera
a6d69feaf6 Merge pull request #7149 from VOREStation/pol-fix1
Fix an exploit
2020-05-12 11:33:40 -07:00
Aronai Sieyes
7ba229e5cc Fix an exploit 2020-05-12 14:23:56 -04:00
Atermonera
eb8ad57917 Merge pull request #7135 from Rykka-Stormheart/shep-dev-hover-overlays
Port Hover Inventory and Body Indicators
2020-05-11 16:51:12 -07:00
Atermonera
81faf815df Merge pull request #7130 from VOREStation/pol-bsflare
Add bluespace flare to research designs
2020-05-11 16:36:31 -07:00
Atermonera
56271d5bf4 Merge pull request #7129 from VOREStation/pol-langfix
Fix weird stray commas
2020-05-11 16:35:00 -07:00
Atermonera
1a871ebe2c Merge pull request #7128 from KillianKirilenko/kk-fashion2
[PORT] Military Jackets
2020-05-11 16:34:27 -07:00
Atermonera
578ba46d24 Merge pull request #7125 from Cerebulon/tcommsprites
Ports Vore Telecomms Sprites
2020-05-11 16:32:18 -07:00
Atermonera
feb964df52 Merge pull request #7123 from Cerebulon/medlaptops
Ports Aurora record laptop sprites
2020-05-11 16:15:40 -07:00
Atermonera
10aecf3b00 Merge pull request #7118 from VOREStation/pol-machinepow
Check power on machine build
2020-05-11 16:09:17 -07:00
Aronai Sieyes
132d0e9844 Merge branch 'master' into pol-rndconsole 2020-05-11 14:30:44 -04:00
Atermonera
4abb4de901 Merge pull request #7109 from VOREStation/pol-orbit
Fix very curious orbit offset issue (513?)
2020-05-10 15:41:09 -07:00
Atermonera
5289a123f0 Merge pull request #7107 from VOREStation/pol-holohear
Prevent holopad chat from going to lobby
2020-05-10 15:40:09 -07:00
Atermonera
ab78f76936 Merge pull request #7106 from VOREStation/pol-mkwarn
Make multikey warning less rude
2020-05-10 15:39:52 -07:00
Atermonera
c2b0769143 Merge pull request #7105 from VOREStation/pol-telenano
Redo teleporter control in nanoui
2020-05-10 15:39:29 -07:00
Atermonera
54577cc012 Merge pull request #7104 from VOREStation/pol-aiborgrefac
Refactor some job joining things related to robofriends
2020-05-10 15:29:14 -07:00
Atermonera
08a716ea24 Merge pull request #7103 from Rykka-Stormheart/shep-dev-fix-reset-slot
Fix for Resetting a Character Slot
2020-05-10 15:16:39 -07:00
Atermonera
d3b7d8e743 Merge pull request #7087 from VOREStation/pol-nightshift
Port SSnightshift from Paradise
2020-05-10 15:16:14 -07:00
Novacat
664bf7c7c7 Update misc.dm 2020-05-10 09:04:11 -04:00
Rykka
61ff2cbbce Earlyport Hover Inventory and Body 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.
2020-05-10 08:09:24 -04:00
Atermonera
ad88267adc Merge pull request #7085 from VOREStation/pol-commfix
Quick fix for communicators
2020-05-09 16:06:08 -07:00
Atermonera
6ea50f367d Merge pull request #7061 from Mechoid/FixFloorDamage
FloorTiles now properly show damage.
2020-05-09 16:05:26 -07:00
Mechoid
abd01dcd32 Prevents simplemob spawning on random turfs, pending a better system. 2020-05-09 15:42:38 -07:00
Aronai Sieyes
ee491ae15f Add bluespace flare to research designs 2020-05-09 18:10:09 -04:00
Aronai Sieyes
85148d5d41 Fix weird stray commas 2020-05-09 17:28:25 -04:00
Killian
b2923b3d38 miljackets 2020-05-09 21:20:43 +01:00
Little-119
14e3c8a830 Fix cooldown math while I'm here 2020-05-09 15:48:28 -04:00
Little-119
09d0fc9f1f Add nightshift setting 2020-05-09 15:48:20 -04:00
Aronai Sieyes
71c4e2b1d8 Allow locked APCs to still toggle night lighting 2020-05-09 15:48:09 -04:00
Aronai Sieyes
cb655a9997 Quick fix for communicators 2020-05-09 15:44:27 -04:00
Atermonera
0b8aeb5b94 mechs trigger mines. They're not very effective... (#7113) 2020-05-09 01:26:31 -07:00
Atermonera
68d84ed369 Fixes #7017 (#7111) 2020-05-09 01:25:35 -07:00
Mechoid
afc0c7cd31 Update floor_icon.dm 2020-05-09 01:23:50 -07:00
Atermonera
2812b663e3 adds logging variable to enable shuttle log spam (#7110) 2020-05-09 01:22:44 -07:00
Cerebulon
11e0e142c2 Ports Aurora Telecomms Sprites 2020-05-09 07:12:37 +01:00
Cerebulon
217556efe2 Ports Aurora record laptop sprites 2020-05-09 05:43:41 +01:00
Atermonera
62c6693913 Merge pull request #7099 from VOREStation/aro-airlockelec
Rewrite airlock electronics
2020-05-08 12:19:50 -07:00
Atermonera
c8ab0a41ac Merge pull request #7059 from atlantiscze/2020_04_28_DelamChange
Supermatter delamination tweaks
2020-05-08 12:17:11 -07:00
Aronai Sieyes
26bd7034c5 Check power on machine build 2020-05-08 13:01:24 -04:00
Arokha Sieyes
cbf506dfd7 Further time fixes 2020-05-08 10:10:23 -04:00
Arokha Sieyes
07e2efb9b8 Fix/rename some timing stuff 2020-05-08 01:51:24 -04:00
Arokha Sieyes
9084818269 Fix preexisting airlock electronics bug 2020-05-08 00:55:07 -04:00
Atermonera
021f874b12 Adds preference to control multilingual behaviour (#7064)
* Adds preference to control multilingual behaviour
Examine mode preference should persist across reconnections to a single round
Still looking into how to properly get these to go into the savefile

* typos
2020-05-07 20:41:19 -07:00
Aronai Sieyes
56ed5570bd Fix very curious orbit offset issue (513?) 2020-05-07 22:24:36 -04:00
Atermonera
7af7374d37 Merge pull request #7101 from MisterLayne/prommie-lang-fix
Fixes Promethean Language
2020-05-07 18:37:16 -07:00
Atermonera
0ab643585c Merge pull request #7100 from VOREStation/pol-borglarm
Don't show borgs alarms not local to them
2020-05-07 18:36:33 -07:00
Aronai Sieyes
ff5e75babe Prevent holopad chat from going to lobby 2020-05-07 21:34:56 -04:00
Aronai Sieyes
10a1833bf8 Make multikey warning less rude 2020-05-07 21:29:51 -04:00
Aronai Sieyes
ffe54ca240 Redo teleporter control in nanoui 2020-05-07 21:13:27 -04:00
Aronai Sieyes
01c98b93e4 Some refactors of noncarbon joins 2020-05-07 19:51:02 -04:00
Rykka
34a51e5ce2 Fix for Resetting a Character Slot
Earlyport of https://github.com/VOREStation/VOREStation/pull/7694

Fixes Resetting a slot to default, credit goes to @ShadowLarkens
2020-05-07 09:01:52 -04:00