Commit Graph

8333 Commits

Author SHA1 Message Date
Aronai Sieyes 83a62b268a Merge pull request #7442 from VOREStation/upstream-merge-7036
[MIRROR] Fixes Intellicore grabbing AI multiple times
2020-04-26 11:31:55 -04:00
Aronai Sieyes 90fca7774d Merge pull request #7446 from VOREStation/aro-bsbp
Tweak bluespace backpack radio
2020-04-26 11:30:34 -04:00
Arokha Sieyes 5192204285 Fix bad copypaste that broke sleevemates 2020-04-26 10:37:27 -04:00
Aronai Sieyes 7a3b4fe041 Tweak bluespace backpack radio 2020-04-25 18:40:32 -04:00
Atermonera 631a544ddb Merge pull request #7036 from atlantiscze/2020_04_24_IntellicoreFix
Fixes Intellicore grabbing AI multiple times
2020-04-25 16:23:12 -04:00
Aronai Sieyes 8a7d4f08cb Prevent accidental whaps with inducers 2020-04-25 11:20:12 -04:00
Aronai Sieyes f2314c32bb Merge pull request #7405 from VOREStation/vplk-static-machinery-power
Static Machinery Power
2020-04-24 21:06:52 -04:00
Aronai Sieyes b3d1a103ac Fix human charging 2020-04-24 12:38:45 -04:00
Novacat de5b875043 Merge pull request #7351 from VOREStation/upstream-merge-6956
[MIRROR] Saycode Overhaul -- Multilingualism
2020-04-23 22:48:51 -04:00
ShadowLarkens 1d655268a4 Fixed merge conflicts and errors, everything seems to work 2020-04-23 18:25:25 -07: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
Aronai Sieyes a62a2e4072 WAH 2020-04-23 18:15:55 -04:00
Aronai Sieyes 897120f895 Merge pull request #7402 from VOREStation/aro-radialtrans
Add radial menu to translocator
2020-04-23 17:47:34 -04:00
Aronai Sieyes 290cc1fdf3 Merge pull request #7401 from VOREStation/aro-rcdind
Port /tg/ RCDs, Inducers
2020-04-23 17:47:29 -04:00
Aronai Sieyes df0dc34311 Merge pull request #7396 from Holdelta/Dogborg-animations-+-Service-Hounds-ported-from-CitadelRP
Porting over Service Hounds and k92 animations and other missing details.
2020-04-23 17:47:13 -04:00
Aronai Sieyes fcfd4bf889 Add radial menu to translocator 2020-04-23 17:32:12 -04:00
Aronai Sieyes 45fd68ca88 Tweak fakecell qdel time to be higher just in case 2020-04-23 16:03:28 -04:00
Aronai Sieyes 2ea192ab87 Port/improve /tg/ Inducer 2020-04-23 15:57:17 -04:00
Aronai Sieyes 55e177a076 Port/improve /tg/ RCD 2020-04-23 15:34:32 -04:00
Holdelta a60e3917ba Porting over Service Hounds and k92 animations 2020-04-22 17:51:40 -07:00
Leshana 9bd2347966 Fix remaining code that directly modified use_power to call update_use_power. 2020-04-22 20:47:15 -04:00
Unknown d6ecbda3d4 One too many vars 2020-04-22 18:08:05 -04:00
Unknown 9ab813c8e3 Adds a bunch of adminbus backpacks 2020-04-22 17:53:19 -04:00
Novacat a7190b867a Merge pull request #7371 from VOREStation/aro-minesafety
Fix seismic charges and razor drone deployers
2020-04-21 22:23:02 -04:00
Arokha Sieyes f396bb78ad Fix seismic charges and razor drone deployers 2020-04-21 22:03:44 -04:00
Novacat 504fc8a049 Merge pull request #7365 from AmayaWah/secretship
adds lore stuff.
2020-04-21 14:35:50 -04:00
Amaya e9eb2a9684 adds lore stuff. 2020-04-21 14:13:17 +02:00
Aronai Sieyes a2e6467936 FOAAAAAAAM 2020-04-20 17:16:25 -04:00
Aronai Sieyes 88154f0374 Adds rutile (titanium ore) and other materials 2020-04-20 12:07:45 -04:00
ShadowLarkens 139d5cd3c3 Saycode Overhaul -- Multilingualism 2020-04-20 04:12:53 -04:00
Atermonera 0d80f24a5f Replaces toy waterflower with spraybottle waterflower (#6997) 2020-04-20 03:25:38 -04:00
Aronai Sieyes 5f208249cb Replace old binocular sprite (#7329)
* Replace old binocular sprite

* Missing VS edit tag
2020-04-19 23:46:35 -04:00
Novacat 840215cf59 Merge pull request #7344 from VOREStation/aro-plush
Ports some plushies from Cit
2020-04-19 23:44:56 -04:00
Aronai Sieyes d13d3d92fe Ports some plushies from Cit 2020-04-19 23:32:20 -04:00
Aronai Sieyes bdc75e654f Adds 2 new bedsheets 2020-04-18 23:16:00 -04:00
Aronai Sieyes bb59718238 Mark some vorestation edits 2020-04-17 11:24:59 -04:00
Sheep 309c39d731 Adds the "Baa" Poster 2020-04-16 16:58:51 +01:00
Aronai Sieyes 0bc5a35309 Fix atmos alarm console and PDA power console zlevel confinement 2020-04-15 22:03:39 -04:00
Aronai Sieyes a65715eb86 Add vorestation posters 2020-04-15 12:02:19 -04:00
Aronai Sieyes 20ed63594d Update point defense sprites and power usage 2020-04-14 13:19:21 -04:00
Aronai Sieyes b1bf1a7e93 Merge pull request #7211 from VOREStation/vplk-shuttle-construction
Ship/Shuttle Console Construction
2020-04-13 10:01:56 -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
Aronai Sieyes d9b3739669 Merge branch 'master' into vplk-shuttle-construction 2020-04-13 09:30:05 -04:00
Aronai Sieyes a7590e81a9 Merge pull request #7210 from VOREStation/aro-shuttleiocn
Changes shuttle landing soon warning
2020-04-13 09:28:53 -04:00
Aronai Sieyes 0d39c5535e Merge pull request #7200 from VOREStation/aro-offmap-rebase2
ITV Talon offmap spawn jobs
2020-04-13 09:28:19 -04:00
Atermonera 2374a40908 A Tale of Blobs and Man 2020-04-13 01:35:01 -04:00
Leshana 4d9cc39664 Make shuttle control consoles constructable.
- Adds circuit boards for shuttle consoles. (Ferry, Multi, and Overmap).
- Deconstructing a console saves the linked shuttle tag in the board for when it is re-constructed.  New boards start blank but will auto-link if you build the console on a shuttle.
- Boards know what type of shuttle they can control and will only auto-link with a shuttle if it is the appropriate type.

Note: By default the only mapped-in shuttle consoles that are deconstrutable are overmap and multi shuttle consoles.   For any others, consoles built mid-game will be deconstrutable but the mapped-in ones will not.  That way the arrival, escape, supply ferry shuttles etc won't be messed with unless the mapper specifically chooses to override and make them that way.
2020-04-11 19:54:03 -04:00
Aronai Sieyes 6ec7ad58d0 Changes shuttle landing soon warning 2020-04-11 18:18:27 -04:00
Leshana bd2a734bc3 Add circuitboards to make overmap ship computers constructable. 2020-04-11 18:13:18 -04:00
Aronai Sieyes 4cfd14849d VS: Replace 'subspace backpack' with bluespace radio 2020-04-11 12:03:10 -04:00