Commit Graph

30577 Commits

Author SHA1 Message Date
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
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
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
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
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
Atermonera
95fc2fa0ec Merge pull request #7097 from VOREStation/pol-hydroplay
Prevent ghosts/others from messing with hydrotrays
2020-05-06 23:09:42 -07:00
Atermonera
ce3ad4108c Merge pull request #7096 from VOREStation/pol-fiftyspawn
Fiftyspawners try to place themselves in crates if possible
2020-05-06 23:09:14 -07:00
Atermonera
270ad65e33 Merge pull request #7094 from VOREStation/pol-shakername
Fix protein shaker name
2020-05-06 23:05:57 -07:00
Atermonera
9c40e88aae Merge pull request #7093 from VOREStation/pol-cond
Fix condiment container infinite range
2020-05-06 23:04:11 -07:00
Atermonera
c1a6ac8c3b Merge pull request #7092 from VOREStation/pol-roleprefs
Fix out-of-order role candidate options
2020-05-06 23:03:48 -07:00
Atermonera
6ecfe951ed Merge pull request #7091 from VOREStation/vplk-proper-atmos-canpass
[PORT] Use can_atmos_pass to reduce proc-calls in c_airblock()
2020-05-06 23:02:51 -07:00
Atermonera
2d2b8cce76 Merge pull request #7089 from VOREStation/vplk-smes-overcharge-fix
Fix an overcharged smes from breaking charging on other smes.
2020-05-06 23:00:00 -07:00
Atermonera
756fa5d6fa Merge pull request #7088 from VOREStation/pol-smesexamine
Fix SMES and debug power item examine messages
2020-05-06 22:59:29 -07:00
Atermonera
6870e1d7ba Merge pull request #7086 from VOREStation/pol-bsbpr
Tweak bluespace backpack radio
2020-05-06 22:49:02 -07:00
MisterLayne
c78de0e619 Fix that hecking language. 2020-05-06 17:59:28 -04:00
Aronai Sieyes
b7aae34335 Merge branch 'master' into pol-defaultparts 2020-05-05 22:51:02 -04:00
Atermonera
f6a19efef0 Merge pull request #7081 from VOREStation/pol-mechradials
Add radial menus for mech occupants
2020-05-05 14:20:51 -07:00
Atermonera
86d9c3ae0d Merge pull request #7077 from Mechoid/KururakTweaks
Kururaks now (theoretically) are not as agonizing to fight.
2020-05-05 14:17:44 -07:00
Atermonera
15bbf4a5ed Merge pull request #7076 from Novacat/nova-accessory
Fixes some Xenobio bugs
2020-05-05 14:16:19 -07:00
Atermonera
0d76423de4 Merge pull request #7075 from Novacat/nova-holowarrant
Fixes weed related runtimes
2020-05-05 14:15:52 -07:00
Atermonera
3b4c518f4c Merge pull request #7072 from Mechoid/BrokenGunExamine
Fix Broken Gun Examining
2020-05-05 14:09:33 -07:00
Atermonera
7e46e56c33 Merge pull request #7065 from Novacat/nova-alerts
Speech Bubble Adjustments
2020-05-05 14:08:44 -07:00