cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 04:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,025 Commits 8 Branches 26 Tags
8ccb084d5462a771caacfdd02be79aa044f2b2b8
Commit Graph

5261 Commits

Author SHA1 Message Date
Aronai Sieyes
6809133d75 Port Eris' extensive floor blending system 2020-05-29 14:00:43 -04:00
Aronai Sieyes
954412a26a Merge pull request #8092 from VOREStation/Arokha/bloodspray 
Give medihounds a new toy
 2020-05-28 16:59:12 -04:00
Arokha Sieyes
83a9765691 Add sleevemate feature 2020-05-27 21:55:35 -04:00
Aronai Sieyes
ea8c29acc8 VS: Dogborg clotter 2020-05-27 16:44:37 -04:00
Aronai Sieyes
d58087c18c Fix medical stack exploit 2020-05-27 16:44:19 -04:00
Cyantime
9b6c2c07a4 Show sent PDA messages to sender 2020-05-25 20:05:25 -04:00
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
6483a18b6a Merge pull request #8007 from VOREStation/upstream-merge-7172 
[MIRROR] Hybrid tools buffs.
 2020-05-21 16:05:32 -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
b82b05409f Merge pull request #7172 from lolman360/hyBRO-tools 
Hybrid tools buffs.
 2020-05-21 14:32:45 -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
e3b5d24c8b Obsolete the PROXMOVE flag and uses 2020-05-18 13:31:54 -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
26efe55d0f Merge pull request #7937 from VOREStation/Arokha/janicart 
New janicart sprites/features
 2020-05-17 22:39:53 -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
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
Atermonera
8b0a581e5d Merge pull request #7139 from KillianKirilenko/kk-gps 
Even More GPS Variety
 2020-05-15 21:07:00 -04:00
Atermonera
5e6cbc0315 Fixes Runtime in ,: bad arg name 'disable_warning' 2020-05-15 16:39:04 -04:00
Aronai Sieyes
e4ec1580cc Adds ottah plush 2020-05-14 22:11:01 -04:00
Aronai Sieyes
80090ab5ef Merge pull request #7845 from VOREStation/upstream-merge-7080 
[MIRROR] Add UAVs
 2020-05-14 10:08:49 -04:00
Aronai Sieyes
3bbec85296 Merge pull request #7843 from ShadowLarkens/screenalerts 
Ported /tg/ style screen alerts, replacing the hunger icon with them
 2020-05-14 09:52:06 -04:00
Arokha Sieyes
a77da3b5df Clean up merge conflicts 2020-05-14 09:44:52 -04:00
Atermonera
21620a1814 Add UAVs 2020-05-14 00:34:29 -04:00
ShadowLarkens
f905cfc020 Ported /tg/ style screen alerts, replacing the hunger icon with them 
This adds throw_alert() and /obj/screen/alert, a system that allows you
to do custom hud alerts for any variety of things from "You're too
cold!" to mecha status indicators for the pilot.

There's quite a few things that actually got replaced; the
fire/oxy/tox/co2 alerts are all now just alerts, as is nutrition. The
xenochimera feral indicator would probably be a good candidate for
conversion, but I didn't touch it in this PR. There's also a number of
new alerts, such as blindness, highness, legcuffed, buckled, handcuffed,
and probably some more I missed; read code/_onclick/hud/alert.dm and see
for yourself!

Additionally, a number of tweaks have been done to resisting code, to
make it so that there's an indicator when you're buckled or handcuffed,
and can just click the alert to start resisting. This includes a
refactor that combines the logic for lockers, holders, micros
escaping from shoes, and struggling in a gut all into one proc, called
container_resist(). This means that vore bellies actually no longer need
the resist override, but it's been left in place just in case someone
finds something else they want to use it for.

Also, the health and internals indicator got moved down one tile each.
Needed room for the alerts. If we add the oxygen tank action buttons
from /tg/ and remove the internals indicator, the health indicator can
go back where it was originally.
 2020-05-13 19:36:01 -07:00
Aronai Sieyes
d47291ca69 New stack icons for stack items 2020-05-13 17:43:57 -04:00
Aronai Sieyes
7c2698cc7d Fix mounted RCD with radial menu 2020-05-13 16:56:17 -04:00
Aronai Sieyes
e949f3d7de Merge pull request #7833 from VOREStation/aro-geiger 
Optimize geiger counter processing
 2020-05-13 13:02:12 -04:00
Aronai Sieyes
c47b6c2a19 Merge pull request #7830 from VOREStation/aro-suitcooler 
Optimize suit cooler processing
 2020-05-13 13:02:01 -04:00
Aronai Sieyes
2294d6f2ca Merge pull request #7829 from VOREStation/aro-flashlight 
Optimize flashlight processing
 2020-05-13 13:01:55 -04:00
Aronai Sieyes
48e3bb126a Merge pull request #7828 from VOREStation/aro-o2processing 
Clean up air tank processing and initialize
 2020-05-13 13:01:46 -04:00
Aronai Sieyes
a5f358b272 Optimize geiger counter processing 2020-05-13 12:12:06 -04:00
Aronai Sieyes
e275031fd1 Optimize suit cooler processing 2020-05-13 11:45:59 -04:00
Aronai Sieyes
94e085740e Optimize flashlight processing 2020-05-13 11:44:56 -04:00
Aronai Sieyes
696bdeec8f Clean up air tank processing and initialize 2020-05-13 11:28:22 -04:00
Aronai Sieyes
f2bd8f138b Make intercom power change stateful 2020-05-13 11:09:12 -04:00
Aronai Sieyes
f380f13c10 Fix whitespace merge 2020-05-11 21:51:21 -04:00