Commit Graph

24315 Commits

Author SHA1 Message Date
Atermonera
a85b953ef4 Adds preference to output description_info with examine text (#6969)
* Adds preference to output description_info with examine text

* includes the defines file
2020-04-10 01:21:21 -04:00
Unknown
c1e3ad59b1 removing these would work better prolly 2020-04-09 12:02:08 -04:00
Unknown
ad082f1755 Fixes boot visibility with techpriest robes 2020-04-09 11:45:59 -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
Leshana
81dfe61c7b Merge pull request #7145 from VOREStation/aro-randomfixes
Fix 2 minor issues
2020-04-08 19:26:14 -04:00
Novacat
f3023f1dcf Merge pull request #7160 from KasparoVy/in_its_rawest_form
Increases the Potential of Ore Eater & Adds Adminbus
2020-04-08 15:24:22 -04:00
Novacat
1d39b45870 Merge pull request #7116 from Heroman3003/slimedjust
Re-enables Slime Vore reaction, adjusts blocked lists for slimespawn reactions
2020-04-08 15:16:04 -04:00
Novacat
dc8d890009 Merge pull request #7167 from Verkister/mousesketty
Fixes mob update_transform proc and mouse sizing
2020-04-08 15:15:19 -04:00
Unknown
9320b2c641 Fixes two bugs
- Voidsuits now properly have their species restrictions initially set.
- You can no longer get perma invisibility from deadringer.
2020-04-08 15:05:10 -04:00
MrSign
03005ad3d8 Update loadout_fluffitems_vr.dm 2020-04-08 14:33:30 +10: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
MrSign
2ab6a85f22 Update loadout_fluffitems_vr.dm 2020-04-08 12:21:32 +10:00
Novacat
df56730bf7 Merge pull request #7140 from Novacat/nova-heterochromia
Adds Vespa Medals
2020-04-07 22:00:42 -04:00
Verkister
a95e1a61ef Fixes mob update_transform proc and mouse sizing
-Fixes update_transform proc for mobs. Meaning that the proc now actually does something and that mobs with pre-set size multipliers now spawn in the correct size.
-Removes some textbook spaghetti code that was making mice spawn in double (triple?) feigned size multipliers in order to be scoopable. Instead makes miniscule (mob_size var) mobs (such as mice) scoopable by default.
-This also fixes morphs in mouse form becoming tiny.
2020-04-07 19:41:44 +03:00
Leshana
aaa0fa5539 Cleanup code and comments.
- Refactor ion_storm to actually operate using start()/end()/announce()
- Remove unused variable and enhance comments.
2020-04-07 03:37:10 -04:00
Novacat
9b73b67ddc Merge branch 'master' into upstream-merge-6923 2020-04-07 00:59:54 -04:00
Neerti
e89fef965e QoL: Stasis and Defibs 2020-04-07 00:39:35 -04:00
KasparoVy
b4d290b7c2 Increases the Potential of Ore Eater & Adds Adminbus
It can now be effectively granted to non-humans, who can now eat ore if they click it while NOT on help intent.
Additionally, you can now feed ore to mobs that can eat it.
2020-04-06 22:18:00 -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
Leshana
08c2d2db6e Remove non-global references to SSgameMaster and SSevent_ticker
- Best practice to avoid holding onto references to the subsystem instances aside from the global variables. (In case of restart/recover etc).
- The reference to GM was entirely unused by any event or meta-event.  /datum/game_master would work fine using the global refs.
2020-04-06 17:28:11 -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
2ae64859cc VS: Add a couple more views to the emagged looking glass console 2020-04-06 12:11:03 -04:00
Unknown
9f9e0b329d Reverts old vorestation edits 2020-04-05 22:26:34 -04:00
listerla
335442fd09 BUREAUCRACY TIME (#6851)
* BUREAUCRACY TIME

* Missing white folder

* Sounds are already in. Oops.

* Removes clone of paper_taped

* branch update, hopefully

* pen-x states

* Restores paper bins

* Revert "Restores paper bins"

This reverts commit 2dd29478a4a069e8866f467a0a6359e468b50434.

* Reverts bins for real?
2020-04-05 22:16:28 -04:00
Aronai Sieyes
b1f0970697 Fix runtime in vore_remains if they are mapped in
Also make it more robust to preds not having ckeys or names
2020-04-05 11:37:57 -04:00
Atermonera
ba2f4c76dc QoL: Small Medical Things 2020-04-05 03:03:06 -04:00
Unknown
0a58e60c87 Adds Everyone Else 2020-04-05 00:53:10 -04:00
Unknown
6c01ab5b8f Adds Ascian's Medals
- Adds a Medal of Unity with two bronze stars for Ascian. Has its own sprite.
- Adds Ascian's Medal of Valor to loadout
- Refactors collars to be part of tie_vr in expected places.
2020-04-05 00:41:05 -04:00
Novacat
84e138f13e Merge pull request #7134 from Novacat/nova-pathfinder
Removes Xenoarch access on Mining Shuttle
2020-04-05 00:09:23 -04:00
Novacat
9514a8ca01 Merge pull request #7138 from VOREStation/upstream-merge-6947
[MIRROR] Fixes supply shuttle display timer
2020-04-04 22:52:08 -04:00
Atermonera
6ad92358b6 Fixes supply shuttle display timer (#6947)
* Fixes supply shuttle display timer

* Update shuttle_supply.dm

* Radio_frequency dark magicks
2020-04-04 22:36:30 -04:00
Atermonera
b6eff8d0cf cataloguers fit in belt slot (#6946) 2020-04-04 22:33:13 -04:00
Unknown
1755760a2d Removes Xenoarch access on Mining Shuttle
On request from Admins
2020-04-04 21:55:18 -04:00
KasparoVy
04378e159e Abstract Eating of Ore to Fix Unintentional Prompt
Using the verb with nothing in your hand brings up a prompt to select an object due to the argument in the verb.

This resolves the issue, instead just showing the "nothing in your hand" message as intended.
2020-04-03 23:14:42 -04:00
Aronai Sieyes
e271d4a54d Adds cheater coefficient and pre-charged/upgraded gens 2020-04-03 18:03:51 -04:00
Atermonera
f8b7a706e1 Merge pull request #6917 from VOREStation/pol-telecube
Telecube tweaks
2020-04-03 16:24:50 -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
Aronai Sieyes
97986327bd Merge pull request #7119 from VOREStation/upstream-merge-6904
[MIRROR] Clean up various things
2020-04-03 13:15:16 -04:00
Aronai Sieyes
b82c48ee2c Merge pull request #7112 from Novacat/nova-shuttle
Adds Mechanicus Techpriest Robes
2020-04-03 13:11:33 -04:00
Aronai Sieyes
67dd92e196 Merge pull request #7111 from Heroman3003/slottening
Gives slots to most fluff items
2020-04-03 12:35:12 -04:00
Aronai Sieyes
496a34ab2b Update grown.dm 2020-04-03 12:24:58 -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
307bea35d9 Fix console html tag 2020-04-03 00:17:39 -04:00
Heroman
2a2c31e54c Applies suggested changes 2020-04-03 14:10:19 +10:00
Aronai Sieyes
e39494a87f VS: Vorey holodeck things 2020-04-02 23:43:13 -04:00
Aronai Sieyes
74134e4ac9 Looking Glass Holodecks 2020-04-02 23:42:47 -04:00
Heroman
f3466490d9 Re-enables Slime Vore reaction, adjusts blocked lists for Slime Vore and Slime Resources 2020-04-03 12:10:47 +10:00
Heroman
1ae1900cd3 Fixes a random v 2020-04-03 10:13:23 +10:00
Heroman
7e3019971d Fixes identetions 2020-04-03 10:08:49 +10:00