Commit Graph

1596 Commits

Author SHA1 Message Date
Atermonera
ba57d83191 Merge pull request #7584 from Rykka-Stormheart/shep-dev-borgo-fixes
Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
2020-08-27 18:45:20 -07:00
Atermonera
6d4d5d6efd Merge pull request #7571 from listerla/nomoresitemanager
Colony Director -> Site Manager
2020-08-27 17:41:52 -07:00
Rykka
f7fcdf2458 Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
ACTUALLY fixes problems with borgs permanently breaking their syringes and being able to put modules into potted plants, which causes unwanted fuckery.

Reverts #7560
2020-08-27 20:17:24 -04:00
Atermonera
4bf64e6b2a Merge pull request #7459 from Rykka-Stormheart/shep-dev-sound-overhaul
Massive Ambience and Sound Overhaul + Addition
2020-08-27 16:23:38 -07:00
listerla
d56974cb92 Colony Director -> Site Manager 2020-08-25 20:12:29 -04:00
Atermonera
a16e6ae0e8 Merge pull request #7456 from listerla/footwear
The great Aurora shoe heist
2020-08-25 16:14:48 -07:00
Rykka
0c7a7fd2b8 Massive Ambience and Sound Overhaul + Addition, Squashed Commit Edition 2020-08-21 06:53:05 -04:00
Atermonera
4a56ad2191 Merge pull request #7449 from Cerebulon/vendEnhance
Flavour Enhancement: Vending
2020-08-20 18:23:54 -07:00
listerla
89b880f0e1 Adds wearing cones and caution signs (#7466)
* Adds wearing cones and caution signs

* Fixes quarantine shuttle PoI

* Create Lorilili - janiwear.yml
2020-08-17 09:57:50 -07:00
listerla
c3f9b4061d The great Aurora shoe heist 2020-08-10 17:28:07 -04:00
Cerebulon
cbce774745 typos, lighters, trash 2020-08-10 01:27:30 +01:00
Cerebulon
0f146f3349 Flavour Enhancement: Vending 2020-08-09 05:05:43 +01:00
Rykka
28a7698b9e Port lots of things that had to wait on alerts
Adds a HUD for observers
Adds a HUD for rigs and mechs
Adds up/down buttons for AI hud
Add more tg style alerts
Fix some bugs with the tg alerts
Improve icon_states usage by caching it
Redo how respawning works, add a button to ghost hud for it
2020-07-30 16:23:32 -04:00
Atermonera
d0037676e1 Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
Aurora Cooking Port
2020-07-30 12:13:07 -07:00
Cerebulon
03b7a0ea0d Persistent Trash/Dirt/Graffiti/Notices (#7337)
* Port Trash/Writing Persistence from World

* stuff beyond straight portin

* Fixed admin menu

* Config, cigbutts, blood exceptions, offices....

* mapped butts
2020-07-24 02:23:34 -07:00
Rykka
6ff4642233 Merge branch 'master' into shep-dev-aurora-cooking 2020-07-22 23:09:42 -04:00
Cerebulon
d7f25c36cb Flavour Enhancement: Crates (#7342)
* crates

* map changes

* rotation and dragging
2020-07-21 19:18:38 -07:00
Rykka
aaf223b256 Aurora Commit 2 2020-07-16 20:52:28 -04:00
Cerebulon
4474f3f713 Flavour Enhancement: Guns (#7333)
* Flavour Lore: Guns

* New guns/sprites, crates, etc.

* couple o oversights fixed

* couple o oversights fixed

* final tweekz
2020-07-13 20:04:59 -07:00
Atermonera
8b3bdd0863 Merge pull request #7268 from VOREStation/Arokha/baylockers
Ports Bay's lockers/cabinets/crates/etc
2020-07-03 16:09:06 -07:00
Verkister
dd0ca1efd5 un-earrapifies instruments
The default falloff value for sounds is 0.5 (lower means quieter).
There was only 3 things ingame with a sound falloff of a whole whopping 5 (10x)
These things were explosions, telepads, and instruments.
One had a volume of 25%, another one had a volume based on distance threshold, and you can probably guess which one of the bunch had a hardcoded 100% volume.
2020-06-21 00:57:18 +03:00
Aronai Sieyes
34c85796c7 Restore large bin to glory 2020-06-10 10:25:52 -04:00
Aronai Sieyes
920fb6e17e Slight adjustments + name 2020-06-10 10:04:18 -04:00
Aronai Sieyes
7ebe0b516c Brings some variety and color to back to closets 2020-06-10 10:04:04 -04:00
Aronai Sieyes
48bf3ac804 Add icon bases since these are invisible on map otherwise 2020-06-01 12:44:09 -04:00
Aronai Sieyes
d1a80ebbcb Prep for map updates 2020-06-01 12:38:24 -04:00
Aronai Sieyes
5cc996d82d Port Bay's lockers, crates, largecrates, wall lockers 2020-06-01 12:38:07 -04:00
Atermonera
e53dc1539b Merge pull request #7247 from VOREStation/Arokha/erisfloors
Port various auto-decorating floors from Eris
2020-05-31 15:37:51 -07:00
Atermonera
79e7c12e98 Merge pull request #7219 from VOREStation/Arokha/sinks
Fix sinks washing things at a distance
2020-05-30 21:19:19 -07:00
Atermonera
55e12aad7b Merge pull request #7210 from VOREStation/vplk-static-power
[PORT] Static Machinery Power
2020-05-30 21:18:27 -07:00
Rykka Stormheart
9917f31031 Merge branch 'master' into shep-dev-upstream-screenport 2020-05-30 06:54:08 -04:00
Aronai Sieyes
58421727da Port Eris' extensive floor blending system 2020-05-29 14:01:40 -04:00
Atermonera
6ab622a2b5 Merge pull request #7205 from VOREStation/Arokha/playsound
Alter playsound paradigm
2020-05-28 16:05:59 -07:00
Rykka
fc1d6e741c 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. 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 all into one proc, called container_resist().

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.

Alerts, pictured in the top right.
![https://i.imgur.com/H7Bipci.png](https://i.imgur.com/H7Bipci.png)
2020-05-23 04:48:47 -04:00
Atermonera
656cbe79ea Merge pull request #7190 from VOREStation/Arokha/janicart
New janicart sprites/features
2020-05-22 17:37:28 -07:00
Aronai Sieyes
935eddca36 Add description_info for new janicart features 2020-05-22 10:04:50 -04:00
Aronai Sieyes
50a5e79d47 Fix sinks washing things at a distance 2020-05-21 15:33:41 -04:00
Atermonera
993faddd42 Merge pull request #7187 from VOREStation/Arokha/greyrail
Add grey railing
2020-05-21 11:43:42 -07:00
Atermonera
ef50018843 Merge pull request #7183 from Mechoid/SwarmPylonUpkeep
Swarm Balancing Upkeep
2020-05-21 11:40:33 -07:00
Leshana
ccef6cc908 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-05-19 20:17:48 -04:00
Aronai Sieyes
ad75bb86bd Alter playsound paradigm 2020-05-19 11:06:28 -04:00
Aronai Sieyes
c62de5048f Port Bay's Catwalks (#7083)
* Port Bay's Catwalks

Allows for various new funtimes.

* Always initialize plated catwalks for you

* Allow climbing up and falling through opened plated catwalks

* 2 catwalk fixes, climbing and decon

* Use turf test helpers

* Update structure loops
2020-05-17 20:56:30 -07:00
Aronai Sieyes
7a8126396e New janicart sprites/features 2020-05-17 19:07:28 -04:00
Aronai Sieyes
6df4f65f44 Add grey railing 2020-05-17 19:03:52 -04:00
Atermonera
a36f34c141 Merge pull request #7156 from VOREStation/pol-sfalay
Fix sofa icon layering
2020-05-16 19:22:51 -07:00
Mechoid
7be0abb85c Swarm defender pylons are weaker against melee. Swap the multipliers out for flat damage checks because what the fuck was I smoking? 2020-05-16 18:03:05 -07:00
Aronai Sieyes
a8f3a0a7a0 Refactor move/click code 2020-05-15 10:49:27 -04:00
Aronai Sieyes
1ee9e68425 Fix sofa icon layering 2020-05-13 15:54:36 -04:00
Aronai Sieyes
eff72a9850 Merge branch 'master' into pol-moved 2020-05-12 11:22:43 -04:00
Leshana
e74ebd9805 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-05-04 13:47:52 -04:00