Commit Graph

1832 Commits

Author SHA1 Message Date
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
bce613704c Fix sofa icon layering 2020-05-13 14:51:53 -04:00
Aronai Sieyes
bd298810f2 Redo examining in general and tweak getFlatIcon 2020-05-06 18:37:46 -04:00
Aronai Sieyes
d172e2dd04 Cached version of icon_states() proc 2020-05-06 16:06:44 -04:00
atlantiscze
b0fad7b55e Allows robots to search loot piles (#7057)
* Allows robots to search loot piles

* Implements feedback
2020-05-03 21:27:29 -04: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
Aronai Sieyes
64b70bdd6d Merge pull request #7597 from VOREStation/aro-movetweak
Improve various smooth movement things
2020-05-03 12:10:59 -04:00
Leshana
e1120409ac Respect buckle_movable
- Only allow moving what you're buckled to of buckle_movable
- Fix buckle_movable values on some items.
2020-05-03 09:49:25 -04:00
Unknown
2bce699cb2 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-6960 2020-05-03 09:47:45 -04:00
Aronai Sieyes
0b18d17a07 Further tweak smooth movement 2020-05-02 19:20:54 -04:00
Aronai Sieyes
1c76891063 Objects fall through when catwalk opened 2020-05-01 14:37:31 -04:00
Unknown
6a296e932e Conflict Resolution 2020-05-01 14:34:33 -04:00
Mechoid
7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
Aronai Sieyes
6cc54f6edd Always initialize plated catwalks for you 2020-05-01 14:12:25 -04:00
Aronai Sieyes
d650dbe87a Port Bay's Catwalks
Allows for various new funtimes.
2020-05-01 13:00:39 -04:00
Aronai Sieyes
e8fa5768c3 Merge pull request #7536 from VOREStation/vplk-proper-atmos-canpass
Use can_atmos_pass to reduce proc-calls in c_airblock()
2020-04-30 17:22:06 -04:00
Unknown
55913ae701 Adds Exploration Department Relay 2020-04-30 15:25:55 -04:00
Leshana
10b0323d6f Use can_atmos_pass to reduce proc-calls in c_airblock()
- Add additional can_atmos_pass value ATMOS_PASS_PROC which indicates custom behavior requiring calling the CanZASPass proc.
  - The benefit being for the other three values we DON'T need to call CanZASPass at all!  We already know the behavior without the overhead of a proc call.
  - Obviously any atom with can_atmos_pass = ATMOS_PASS_PROC cannot now call ..() in CanZASPass() since the default behavior would be to (recursively) call CanZASPass()
  - This required re-numbering the constants, so I also fixed all code that assumed particular values for the constants.
- Switched all types which overrode CanZASPass with custom logic to be can_atmos_pass = ATMOS_PASS_PROC
- Changed /turf/c_airblock() to skip calling /atom/movable/c_airblock() for the three can_atmos_pass values that don't require calling the proc.
2020-04-30 14:50:57 -04:00
Leshana
4a2e8bb0c4 Fix return values of CanZASPass
- CanZASPass is supposed to return boolean.  Nobody noticed this bug because ATMOS_PASS_YES and ATMOS_PASS_NO happen to be defined as 1 and 0.  But thats not a good assumption to make, so lets fix it!
2020-04-30 14:50:57 -04:00
Aronai Sieyes
b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045
[MIRROR] Removes limits on eating, centralizes nutrition changing.
2020-04-29 19:23: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
893130bdff Merge nutrition refactor for vorestation 2020-04-29 18:34:22 -04:00
Aronai Sieyes
874baa1d2d Merge examine refactor for vorestation 2020-04-29 17:49:54 -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
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
Unknown
afe4c7498f Tweaks 2020-04-26 17:44:33 -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
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
Leshana
763753648b Implements "static" area machinery power usage
- Instead of using auto_use_power to re-tally up machinery's power usage every cycle, track the steady "static" load separately from the transient "oneoff" usage.  Machines then only need to inform the area when they use oneoff power or *change* their steady usage.
- Remove auto_use_power and stop SSmachines from calling it.
- Add vars to track "static" usage for each of the three power channels to /area
- Rename the existing three vars to "oneoff" so its clear what they mean (and to catch people accidentally updating them directly)
- Update area power procs and APCs to use the new variables.
- Rename /area/proc/use_power() to use_power_oneoff() to make it clear what it is doing.
- Deprecate /obj/machinery/use_power() in favor of use_power_oneoff() but don't delete yet.  Can transition gradually.
- Add logic to the update_power procs on machines to calculate the deltas and update static area power whenever their usage changes.
- Add logic to machines to update area power when they are created, destroyed, or move.
- Moved /obj/machinery procs related to area power usage into machinery_power.dm to make them easier to find.
- Added or updated comments in several places to explain what is going on and how to use it.
2020-04-23 19:04:34 -04:00
Leshana
9bd2347966 Fix remaining code that directly modified use_power to call update_use_power. 2020-04-22 20:47:15 -04:00
Aronai Sieyes
88154f0374 Adds rutile (titanium ore) and other materials 2020-04-20 12:07:45 -04:00
Aronai Sieyes
bdc75e654f Adds 2 new bedsheets 2020-04-18 23:16:00 -04:00
H0lySquirr3l
5bc18c4c96 Replace ring in holo boxing ring with actual ring. (#7209)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Delete fitness_vr.dmi

* Add files via upload
2020-04-13 09:33:22 -04:00
Atermonera
5c03273ce8 Merge pull request #6884 from Neerti/event_system_fix
Rewrites the Rewritten Event System
2020-04-06 16:23:39 -04:00
Atermonera
d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Unknown
be8c05f2c7 Removes redundancy 2020-03-10 10:10:33 -04:00
Atermonera
51d74bc25b Merge pull request #6793 from Cerebulon/emlocksprite
Fixes shuttle emergency locker sprites
2020-03-08 16:22:34 -04:00
Aronai Sieyes
632d3a8dc5 Merge pull request #6773 from VOREStation/aro-blufo
Random stuff for map use/events
2020-03-06 13:14:37 -05:00
Arokha Sieyes
3f782d1ea2 Sprites 'n stuff 2020-03-06 13:03:53 -05:00
Aronai Sieyes
7e848e90fc Merge pull request #6772 from VOREStation/aro-blufo
Various minor things
2020-03-06 09:58:00 -05:00
Aronai Sieyes
1255e1be77 Hybrid shuttle 2020-03-05 23:30:07 -05:00
Aronai Sieyes
c9f7465ee2 Touch up bed/chair/stool icon updating 2020-03-05 23:30:07 -05:00
Novacat
6e23c5f45a Merge pull request #6709 from VOREStation/aro-mistake
Fix way too many vorestation edits
2020-03-05 19:03:58 -05:00