cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 10:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,720 Commits 8 Branches 26 Tags
2ea192ab87fa393d51eb41775f7ea42fde077b96
Commit Graph

8313 Commits

Author SHA1 Message Date
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
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
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
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
07fb7950a6 Merge pull request #6974 from Shadow-Quill/patch-1 
Unfucks arrival shuttle latejoins when shuttle is docked
 2020-04-11 02:51:26 -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
Leshana
9a4b3f7c8b Merge pull request #7159 from VOREStation/aro-fixes 
2 fixes and Teshari maws
 2020-04-08 19:30:35 -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
Aronai Sieyes
d5befb78e1 Fix infinite server destroying loop in interval effects 2020-04-06 12:08:55 -04:00
Novacat
36aa8ef340 Update map_effects.dm 2020-04-05 22:19:39 -04:00
Aronai Sieyes
d948096587 Adjust two things that loop forever 2020-04-05 22:17:42 -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
Aronai Sieyes
94d6ccd763 Merge pull request #7117 from VOREStation/aro-lookingglass 
Add Looking glass holodeck
 2020-04-03 15:14:00 -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
Aronai Sieyes
df58a60554 Fix mines qdel 2020-04-02 20:28:40 -04:00