Commit Graph

2186 Commits

Author SHA1 Message Date
Repede
3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
2020-05-18 20:30:52 -04:00
Aronai Sieyes
e3b5d24c8b Obsolete the PROXMOVE flag and uses 2020-05-18 13:31:54 -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
b21d384a2e Further molest revdata 2020-05-16 18:36:06 -04:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
izac112
bbb084a354 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 09:06:27 +02:00
Aronai Sieyes
a23605c9fd Move cyberpunk detective gear to be suits, add long version 2020-05-15 14:17:34 -04:00
Aronai Sieyes
cc6592e35c Update revinfo proc 2020-05-15 11:21:30 -04:00
Aronai Sieyes
2c2e9c8e0d v e n d o t t 2020-05-14 22:29:16 -04:00
Unknown
ff5b1fbd82 Requested Changes 2020-05-14 20:44:27 -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
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
f2bd8f138b Make intercom power change stateful 2020-05-13 11:09:12 -04:00
izac112
6a7192c93f Update tools_1.dm 2020-05-13 10:23:37 +02:00
izac112
268443695b Revert "Probably a revert after this"
This reverts commit 1d5ba3f493.
2020-05-13 09:51:27 +02:00
izac112
1d5ba3f493 Probably a revert after this
Probably getting reverted but worth a shot.
2020-05-13 09:43:51 +02:00
Izac Joof Forsgren
19175c4c72 Merge branch 'master' into izac-voreupdate 2020-05-13 09:16:09 +02:00
SplinterGP
75c9b2fcd2 Removes few extra span that shoulnd't be there 2020-05-13 01:47:28 -03:00
SplinterGP
353576067a Typo 2020-05-13 01:29:44 -03:00
SplinterGP
e3f0f5eb3d More autolathe stuff 2020-05-12 23:39:23 -03:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Aronai Sieyes
6dc177ebc7 Fix very curious orbit offset issue (513?) 2020-05-07 22:23:28 -04:00
SplinterGP
c60d52d4ca saved 2020-05-07 23:01:47 -03: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
Rykka
9ceb5f768b Fix clamp case breaking BYOND versions below 513.1490
513.1490 added `clamp` as a native proc
2020-05-06 06:42:36 -04:00
SplinterGP
163c8665a0 gotta manually add starting recipes from other machines 2020-05-06 01:27:26 -03:00
SplinterGP
ae56354145 Autolathe fix for removing trouble on unit test, also does disks 2020-05-06 00:45:04 -03:00
Aronai Sieyes
c5e8685593 Port Paradise progress bars 2020-05-05 16:51:05 -04:00
Killian
24b507ad9c scatter speedloader & box printing 2020-05-05 16:17:28 +01:00
Aronai Sieyes
01a51e5acd Add prefs for Be Morph, Be Maintpred, Be Lost Drone
Allows the 'never for this round' button to work, and for them to be disabled entirely if you don't want to be asked again.
2020-05-04 20:04:43 -04:00
Killian
8240a97400 Merge branch 'master' into kk-miscstuff 2020-05-04 14:20:02 +01:00
Atermonera
77fef98789 Merge pull request #7010 from atlantiscze/2020_04_17_LoadBalancing
Ports over power-related enhancements and tweaks i coded for Bay a while back
2020-05-03 18:45:25 -04:00
SplinterGP
b0a76b628f Makes breacher chassis order the NT cheap knockoff instead 2020-05-03 18:02:49 -03:00
Aronai Sieyes
64b70bdd6d Merge pull request #7597 from VOREStation/aro-movetweak
Improve various smooth movement things
2020-05-03 12:10:59 -04:00
Unknown
43f4fb49ad Miscellaneous Changes
- Adds some more uplink stuff based on recent updates
- Purges Xenomorph hybrid whitelist (they are not whitelisted anymore)
- Adds some hybrid cells to the Dropship
2020-05-03 10:32:46 -04:00
Aronai Sieyes
0b18d17a07 Further tweak smooth movement 2020-05-02 19:20:54 -04:00
Mechoid
7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
SplinterGP
78f4a2fd3f Autolathe patch, fixes teleporter stuff making it buildable 2020-04-30 20:08:06 -03:00
Unknown
a78c597ed8 Fixes PF Loadout 2020-04-30 12:08:01 -04:00
Novacat
3eaa2ad9fa Lore Overhaul (#7493)
* Lore Overhaul

* Further Updates

* Changes the year

* Reverts unedited files adds Dragor's file

* Fixes compile error

* Spelling error

* Fixfix

* Comma fixes!

* Parenthesis fix

* Removes Virgov references

* Purges remnants of UC

* Recommended Change

* More consistent naming
2020-04-29 19:59:03 -04:00
Novacat
98574bf939 Merge branch 'master' into nova-ert 2020-04-29 14:29:09 -04:00
Aronai Sieyes
c5b0f74868 Merge pull request #7450 from Novacat/nova-pathfinder
Splits off Exploration and Science
2020-04-27 14:59:19 -04:00
Unknown
a9812e82aa Some tweaks! 2020-04-27 13:49:11 -04:00
Aronai Sieyes
d3da6ae4a5 Refactor move code 2020-04-26 16:42:50 -04:00
Unknown
a6deb3078d Overhauls First Aid Kits
- Refactors First aid kits to be mostly autoinjector and pill based. No syringes, just autoinjectors and pills. Health analyzers are also removed.
Regular First Aid Kit: 3x Gauze, 2x Ointment, 1x Paracetamol pill bottle, 1x Inaprovaline pill bottle
Toxin First Aid Kit: 1x Dylovene Pill Bottle, 6x Dylovene Autoinjectors
Burn First Aid Kit: 1x Kelotane pill bottle, 6x Dermaline autoinjectors.
Oxy First Aid Kit: 5x Dexalin Plus autoinjectors, 1x Iron pill bottle, 1x Dexalin Pill Bottle
Adv First Aid Kit: Replaces Autoinjector with Assorted Pill bottle (3 Inaprov, 3 Dylovene, 2 Iron, 2 Tramadol, 3 Hyronalin, 1 Spaceacillin pills)
- Buffs default pill bottle contents. This narrows the effectiveness between autogenerated pills and pill bottles, and those brewed up by players.
- Splits Miner autoinjector into four seperate autoinjectors, one for each damage type. Reduces the price in the mining/exploration vendors.
- Tweaks Pill contents for a bit better consistency. Biggest change is that dexalin pills are 7.5u each.
- Changes Vermicetol chemical color to something more reddish.
- Overhauls Internals closet, removed O2 kits from them, adds more emergency spacesuits.
- Removes Organ Kits, Combat First Aid Kits now have a pill bottle with assorted organ repair pills.
- Surgical kits now have a regular health analyzer, and can hold health analyzers.
2020-04-26 13:38:28 -04:00
SplinterGP
c64a8b5072 Merge branch 'master' into holdelta 2020-04-26 00:05:58 -03:00
Unknown
9dec57c97f Splits off Exploration and Science
- Removes all Science access from explorers
- Removes Gateway access from HoS and RD
- Removes Science comms from explorer headsets
- Adds Command comms to Pathfinder headset
- Refactors edited Southern Cross files into _vr files in the main code.
- Moves Exploration Equipment Vendor to the expedition shuttle.
- Moves the Chemical Analyzer in science to Exploration Prep
- Removes general science access from the Xenobiology office and equipment rooms
- Removes RD access to Explorer comms
- Adds Airlock and EVA access to explorers
- Increases number of pilot slots by 2

SOP notes:
- Pathfinder will be able to fire subordinates.
- Pathfinder will not be a full head.
- Field Medic will remain as a hybrid Medical/Explo role.
- Research Directors will no longer be exempted from the general rule that heads of staff should not attend expeditions.
- Exploration is still strongly encouraged to get volunteers from other departments, including Science.
2020-04-25 20:36:21 -04:00
spaghettiweaver
aa87d150bd Merge branch 'master' into pianocargo 2020-04-23 00:42:09 -05:00
spaghettiweaver
f87c9e7b7e Adds purchaseable Piano crates to cargo
Costs 150 cargo points, to deliver a largecrate infamous for their ability to make their contents lighter and ship better. When pried open the crate produces either a minimoog or space piano.
2020-04-23 00:28:03 -05:00
SplinterGP
a1d533eeca Merge branch 'master' into holdelta 2020-04-22 23:25:36 -03:00