Commit Graph

8481 Commits

Author SHA1 Message Date
Aronai Sieyes c731db728e Merge pull request #8036 from VOREStation/Arokha/issue8035
Add safety to GPSes to avoid runtimes
2020-05-22 16:29:15 -04:00
Aronai Sieyes b9bdd25a3a Add safety to GPSes to avoid runtimes 2020-05-22 11:29:11 -04:00
KasparoVy 1a5bdf4e98 Refactors Ore Eating to Allow the Consumption of Material Sheets
Refactors ore eating to facilitate the ethical consumption of refined materials, easily obtainable on station. Suggested by the kobolds.

Also fixes the material name of Plastitanium glass throughout the codebase.
2020-05-22 03:55:04 -04:00
Aronai Sieyes 9af470047e Merge pull request #8013 from VOREStation/upstream-merge-7183
[MIRROR] Swarm Balancing Upkeep
2020-05-21 16:07:29 -04:00
Aronai Sieyes b73b898e26 Merge pull request #8010 from VOREStation/upstream-merge-7180
[MIRROR] Fix weeds
2020-05-21 16:06:26 -04:00
Aronai Sieyes 6483a18b6a Merge pull request #8007 from VOREStation/upstream-merge-7172
[MIRROR] Hybrid tools buffs.
2020-05-21 16:05:32 -04:00
Aronai Sieyes 35c0fa2103 Merge pull request #8000 from VOREStation/Arokha/issue7803
Fix rollerbed movement with buckled mobs
2020-05-21 15:40:27 -04:00
Aronai Sieyes 58d9b0a6fb Merge pull request #7999 from VOREStation/Arokha/issue7657
Fix sinks washing things at a distance
2020-05-21 15:40:03 -04:00
Aronai Sieyes af2a4cb216 Merge pull request #7998 from VOREStation/Arokha/issue7927
Tweak beartraps, alerts
2020-05-21 15:39:47 -04:00
Atermonera 2b702e3a26 Merge pull request #7183 from Mechoid/SwarmPylonUpkeep
Swarm Balancing Upkeep
2020-05-21 14:41:18 -04:00
Atermonera 69fc5d6a3b Merge pull request #7180 from Mechoid/FixWeeds
Fix weeds
2020-05-21 14:37:34 -04:00
Atermonera b82b05409f Merge pull request #7172 from lolman360/hyBRO-tools
Hybrid tools buffs.
2020-05-21 14:32:45 -04:00
Aronai Sieyes a8ac98b623 Fix rollerbed movement with buckled mobs 2020-05-21 14:06:59 -04:00
Aronai Sieyes c6b4eddefb Fix sinks washing things at a distance 2020-05-21 13:08:11 -04:00
Aronai Sieyes bf3bdbf0e1 Traps don't get weird with removed limbs 2020-05-21 12:38:10 -04:00
Aronai Sieyes 264a8340c1 Can map in cell'd mining drills using the /loaded subtype 2020-05-21 11:31:00 -04:00
Aronai Sieyes fc849d9e36 Merge pull request #7962 from VOREStation/Arokha/playsound
Alter playsound paradigm
2020-05-19 11:20:52 -04:00
Aronai Sieyes 09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai Sieyes a03a3c0960 Change stack autocombine
Only happens when dropped or pulled by a mob, to avoid problems with stack-using machines and conveyors in mining
2020-05-18 22:35:13 -04:00
Aronai Sieyes fe9683b53b Merge pull request #7950 from VOREStation/Arokha/fixmysteryleather
Fix mystery steel-leather
2020-05-18 13:59:42 -04:00
Aronai Sieyes 48563200ce VS: Tweak some icon blending 2020-05-18 13:42:42 -04:00
Aronai Sieyes e3b5d24c8b Obsolete the PROXMOVE flag and uses 2020-05-18 13:31:54 -04:00
Aronai Sieyes 2fca303998 Convert unzooming into listener 2020-05-18 10:47:13 -04:00
Aronai Sieyes 0b858a36c8 These can't be material stacks if they don't have a material 2020-05-18 10:28:18 -04:00
Aronai Sieyes 7612c7a149 Merge upstream PR 2020-05-18 09:31:51 -04:00
Aronai Sieyes 6bf0112339 Port Bay's Catwalks 2020-05-17 23:57:21 -04:00
Aronai Sieyes 26efe55d0f Merge pull request #7937 from VOREStation/Arokha/janicart
New janicart sprites/features
2020-05-17 22:39:53 -04:00
Aronai Sieyes 5b423cab8b Merge pull request #7933 from VOREStation/Arokha/greyrail
Add grey railing
2020-05-17 22:39:01 -04:00
Aronai Sieyes d69777cb7d Merge pull request #7926 from VOREStation/Arokha/jetpack
New jetpack sprite from Eris
2020-05-17 22:38:36 -04:00
Atermonera 5830a7952c Custom RIGs function properly. 2020-05-17 19:15:23 -04:00
Aronai Sieyes 03c805a34a New janicart sprites/features 2020-05-17 16:49:03 -04:00
Aronai Sieyes f510ad68b1 Add grey railing 2020-05-17 15:49:21 -04:00
Aronai Sieyes e5177a2a63 New jetpack sprite from Eris 2020-05-17 14:21:06 -04:00
Aronai Sieyes 94c02f85c1 Merge pull request #7917 from VOREStation/Arokha/squeez
Attempt some performance improvements
2020-05-17 10:17:24 -04:00
Aronai Sieyes 0f1d00d13b Make the global announcer really global 2020-05-17 10:00:45 -04:00
Aronai Sieyes 1063ded44f Merge pull request #7919 from VOREStation/Arokha/pedantry
Just moves this code block
2020-05-17 09:26:00 -04:00
Arokha Sieyes 3911e14936 tg(?) style stack autocombining 2020-05-17 00:47:42 -04:00
Arokha Sieyes 5e3e7e4bab Just moves this code block 2020-05-17 00:38:07 -04:00
Aronai Sieyes b6a0e8b2aa Make blood generation less garbage 2020-05-16 16:22:08 -04:00
Atermonera 8b0a581e5d Merge pull request #7139 from KillianKirilenko/kk-gps
Even More GPS Variety
2020-05-15 21:07:00 -04:00
Aronai Sieyes 7757e4e7dd Merge pull request #7875 from VOREStation/upstream-merge-7082
[MIRROR] Refactor move/click code and cooldowns
2020-05-15 20:57:31 -04:00
Aronai Sieyes 36aa031b1e Merge pull request #7882 from VOREStation/upstream-merge-7162
[MIRROR] Fixes Runtime in ,: bad arg name 'disable_warning'
2020-05-15 20:54:46 -04:00
Aronai Sieyes b3b22daa1d Merge upstream PR 2020-05-15 20:46:03 -04:00
Atermonera 5e6cbc0315 Fixes Runtime in ,: bad arg name 'disable_warning' 2020-05-15 16:39:04 -04:00
Atermonera c8e5abc937 Random item spawners qdel properly on init without using sleep (#7134) 2020-05-15 16:36:09 -04:00
Atermonera 02f82fc1f0 Refactor move/click code and cooldowns 2020-05-15 14:03:15 -04:00
Aronai Sieyes 48571fa882 2 catwalk fixes, climbing and decon 2020-05-15 09:06:20 -04:00
Aronai Sieyes 2c2e9c8e0d v e n d o t t 2020-05-14 22:29:16 -04:00
Aronai Sieyes e4ec1580cc Adds ottah plush 2020-05-14 22:11:01 -04:00
Aronai Sieyes e1db9271e1 Merge pull request #7858 from VOREStation/aro-secsprite
New HOS coat, warden jacket sprites
2020-05-14 20:54:13 -04:00