Commit Graph

5160 Commits

Author SHA1 Message Date
Aronai Sieyes
5170412683 Inducer can charge vehicles (space bike, cargo tug, etc) 2020-04-26 11:47:16 -04:00
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
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
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
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
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
Aronai Sieyes
d13d3d92fe Ports some plushies from Cit 2020-04-19 23:32:20 -04:00
Aronai Sieyes
0bc5a35309 Fix atmos alarm console and PDA power console zlevel confinement 2020-04-15 22:03:39 -04:00
Aronai Sieyes
20ed63594d Update point defense sprites and power usage 2020-04-14 13:19:21 -04:00
Aronai Sieyes
d9b3739669 Merge branch 'master' into vplk-shuttle-construction 2020-04-13 09:30:05 -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
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
Aronai Sieyes
e2d2964546 Refactor telecomms to send messages to logically adjacent zlevels 2020-04-11 12:03:10 -04:00
Aronai Sieyes
05f1aa7356 Convert some telecomms constants into defines 2020-04-11 12:03:10 -04:00
Atermonera
856cd8072a Merge pull request #6959 from ShadowLarkens/uplink_redesign
Syndicate Uplink redesign (Inspired by ParadiseSS13/Paradise#1844)
2020-04-09 02:59:16 -04:00
Aronai Sieyes
ce8bda7cd7 Merge pull request #7118 from VOREStation/vplk-shields
Ports Baystation Advanced Shield Generators
2020-04-07 23:53:12 -04:00
Novacat
9b73b67ddc Merge branch 'master' into upstream-merge-6923 2020-04-07 00:59:54 -04:00
Novacat
8948f1a7a6 Update defib.dm 2020-04-07 00:57:50 -04:00
Neerti
e89fef965e QoL: Stasis and Defibs 2020-04-07 00:39:35 -04:00
Leshana
d66f508541 Fixes for vorestation merge of "Rewrites the Rewritten Event System"
- Remove duplicate pick_random_edge_turf resulting from our simultaneous addition of it (in overmaps PR)
- Disable SSgame_master and SSevent_ticker subystems, we are still using the original events subsystem.
- Disable the game_master implementations as we are not using them.
- Comment out references to SSgame_master since we are not using it (yet?)
2020-04-06 17:31:26 -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
ba2f4c76dc QoL: Small Medical Things 2020-04-05 03:03:06 -04:00
Atermonera
0d9a420df4 fixes telebaton hand sprite (#6944) 2020-04-04 22:29:54 -04:00
Atermonera
d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
Leshana
e2bd546f61 Ports advanced shield generators from Baystation
- Creates new advanced shield generators, designed to replace old hull and bubble shield generators.
- Upgrades the floor mounted and handheld shield diffusers.
- Makes underfloor shield diffusers actually constructable.
- Handheld diffusers orderable via uplink.
- Removes supply packs and research datums  for the old generators, but leaves their code in place for maps that still use them.
- Integrates with the meteor and electrical storm events.
- Integrates with mob AI (they know how to attack it)
2020-04-03 00:56:15 -04:00
Leshana
f022647037 Adds point defense batteries to defend against meteors
- Creates a global meteors list to make it easier to find them.
- Adds point defense mainframe, batteries, projectiles, circuitboards, and R&D designs.
- Adds sound effects and icons for the new machines.
- Original code and sprites ported from Baystation.  Adtapted to our code, added icon states and QoL elements.
2020-04-01 21:30:30 -04:00
Ketrai
51486fc10c waghh 2020-04-01 12:32:30 +02:00