Commit Graph

1048 Commits

Author SHA1 Message Date
Atermonera
2444066b69 Merge pull request #7268 from VOREStation/Arokha/baylockers
Ports Bay's lockers/cabinets/crates/etc
2020-07-13 14:06:49 -04:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112
4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02:00
Darlantan
8de7cde4ad Removes tether_prelinked bluespace radio
Now it's just a normal bluespace radio.
2020-06-16 00:44:18 -04:00
Aronai Sieyes
e9c904b8e7 Merge pull request #8260 from lbnesquik/Kot-Explorer-Shield
Introduce a SINGLE themed, colored explorer shield.
2020-06-15 11:33:14 -04:00
Unknown
967f67bf37 Replaces exploration autoloks with emergency suit wall lockers 2020-06-14 14:18:23 -04:00
Unknown
19d7b71382 More miscellaneous changes 2020-06-14 13:46:16 -04:00
izac112
606b7ec8e5 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-12 21:34:20 +02:00
lbnesquik
856d48467a Introduce a SINGLE themed, colored explorer shield
It is a simple hunk of metal, painted to a moody green or dangerous voidsuits purple and blacks.
It has a lower block chance than the real deal, but it is still a strong help against melee foes and the occasional beam or two. Do mind that those seem to be a lot squishier since the AI update.
And just like any tacticool object, it has a big flashlight stuck at the front to help with visibility, it's not like you can actually see much out of that slit.
You can order two for 80 points at cargo.
It actually starts in the pathfinder locker, meaning they decide whether or not it will be used.
2020-06-11 04:14:54 +02:00
Aronai Sieyes
fbeda45d2c Restore large bin to glory 2020-06-10 10:24:03 -04:00
izac112
7ad2832f14 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-08 21:49:14 +02:00
izac112
6758bc8b8c Fixes our closets tho it may not look like it used to do 2020-06-07 18:34:28 +02:00
Heroman
f55b419803 Slight adjustments + name 2020-06-07 07:09:08 +10:00
Heroman
273f7540b6 Brings some variety and color to back to closets 2020-06-07 06:45:22 +10:00
izac112
6d1afd6f1e Fixes some closets 2020-06-03 19:08:28 +02:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
Aronai Sieyes
852cdbc347 VS: Add Autolok wall lockers and put some around various maps 2020-05-31 16:59:39 -04:00
Aronai Sieyes
d5de7fc136 Don't let people hide in tiny wall closets 2020-05-31 16:58:57 -04:00
Aronai Sieyes
b7a22c755f Add icon bases since these are invisible on map otherwise 2020-05-31 13:07:19 -04:00
Aronai Sieyes
7c4428d697 Prep for map updates 2020-05-31 12:39:39 -04:00
Aronai Sieyes
7d69c69f14 VS: Port Bay's lockers and stuff 2020-05-31 12:26:00 -04:00
Aronai Sieyes
719151a74a Port Bay's lockers, crates, largecrates, wall lockers 2020-05-31 12:26:00 -04:00
Atermonera
619e8b1b94 Ported /tg/ style screen alerts, replacing the hunger icon with them 2020-05-31 11:52:17 -04:00
izac112
0d1fe7d706 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-30 16:01:43 +02:00
Aronai Sieyes
12af6afc9b Alter playsound paradigm 2020-05-29 14:54:11 -04:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112
bbb084a354 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 09:06:27 +02:00
Unknown
ff5b1fbd82 Requested Changes 2020-05-14 20:44:27 -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
izac112
1e6cc7d5a8 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into izac-voreupdate 2020-05-11 20:07:45 +02:00
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07: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
Killian
1f3d901274 update misc. files 2020-05-06 13:22:00 +01:00
RadiantFlash7
0071485ca0 Interceptor adjustments 2020-05-05 21:29:31 -04:00
Killian
19c223c940 forgot a comma 2020-05-05 11:28:20 +01:00
Killian
6494e48c7a small update to secpilot locker contents 2020-05-05 11:24:07 +01:00
Killian
8240a97400 Merge branch 'master' into kk-miscstuff 2020-05-04 14:20:02 +01:00
Mechoid
7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
Unknown
55913ae701 Adds Exploration Department Relay 2020-04-30 15:25:55 -04:00
Novacat
c70af70266 Merge pull request #7463 from Novacat/nova-ert
Overhauls First Aid Kits
2020-04-29 18:44:43 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Novacat
98574bf939 Merge branch 'master' into nova-ert 2020-04-29 14:29:09 -04:00
Unknown
a9812e82aa Some tweaks! 2020-04-27 13:49:11 -04:00
Unknown
afe4c7498f Tweaks 2020-04-26 17:44:33 -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
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
b5a2bfee1f Moves the piano crate to largecrate_yw
modularity and all that
2020-04-24 22:45:54 -05:00
spaghettiweaver
aa87d150bd Merge branch 'master' into pianocargo 2020-04-23 00:42:09 -05:00