Commit Graph

27761 Commits

Author SHA1 Message Date
Mechoid
57ab0e715b Constructs 2.0 - Living Stone (#5040)
* Construct Overhaul + Related Fixes/Tweaks
2018-04-04 23:45:00 -07:00
Atermonera
d5c5249327 Merge pull request #5147 from VOREStation/vplk-atmos-layers
Switch cables and pipes to use define constants instead of literals for layers.
2018-04-04 17:42:36 -07:00
Atermonera
a6ebe9b44a Merge pull request #5145 from VOREStation/vs-port-3058
[PORT] Halve character-join lag
2018-04-04 17:38:31 -07:00
Atermonera
b63acc083d Merge pull request #5143 from VOREStation/fix-usr
Reverted use of 'usr' back to 'user' from commit 05fd53e
2018-04-04 17:35:33 -07:00
Leshana
8c3e41a705 Small fixes and ports discovered during merge. (#5138)
* POLARIS: No string compare for assistants

* POLARIS: Move these planes to more useful places

* POLARIS: Only spam ghosts with chat messages from things with real clients

* Fix small forgotten lines of text accidentally left out of VS syncs.

* Fix typo'd plane in lighting.dm and remove redundant definitions.
2018-04-04 17:35:15 -07:00
Atermonera
cdf794950e Merge pull request #5135 from Woodratt/03302018_bugfixesandadjustments
Map fixes and tweaks
2018-04-02 23:52:20 -07:00
Atermonera
a059ed0de3 Merge pull request #5133 from Cameron653/patch-1
Syndicate Dufflebag Tweak
2018-04-02 23:51:21 -07:00
Leshana
7da46a6dcc Switch cables and pipes to use define constants instead of literals for layers.
Also fix a few things to be on the correct plane.  Basically the under-floor stuff is supposed to be on PLATING_PLANE.
Portable atmospherics go on object layer so they are above stationary machinery, given that they move around.
Fixed wires to be on top of pipes like they used to be, otherwise they'd be obscured too often.
2018-04-02 21:50:03 -04:00
Arokha Sieyes
0e2f41ea86 More optimizations for character joins 2018-04-02 16:49:44 -04:00
Arokha Sieyes
a6cfbc4f42 Initial cleanup/changes 2018-04-02 16:36:04 -04:00
MarinaGryphon
6cb7d9a10c Fixes wallet-HUD interaction issues. (#5130)
* Fixes wallet-HUD interaction issues.

* Fixes HUDs, too. Forgot to commit this the first time. Also hopefully didn't change the map to examplemap.

* Fixes an indentation error.
2018-04-01 22:46:13 -05:00
Anewbe
86285d305a Merge pull request #5131 from Neerti/3/30/2018_poi_grouping
Adds Map Template Groups
2018-04-01 22:45:18 -05:00
Leshana
1f4bdc4389 Reverted use of 'usr' back to 'user' from commit 05fd53ebcc 2018-04-01 22:03:10 -04:00
Mechoid
185201c112 Merge pull request #5125 from Anewbe/bandaids
Normal brute kits disinfect wounds
2018-04-01 15:06:19 -07:00
Mechoid
739bbd6e2b Merge pull request #5073 from mistyLuminescence/wallets
Wallet Expansion!
2018-04-01 15:01:05 -07:00
Woodratt
266b25232d Map fixes and tweaks
- Flashers in brig cells now should work, extra floor flash in communal brig to deal with crims.
- Inproper access, SMES rooms.
- Trader start point being dark now fixed.
- Medical Vendor Plus has more advanced burn and trauma kits. Also splints.
- Cell 1 and 2 in the brig can now be accessed by detectives.
- Additional r-walls next to the engine room to help with rads.
- Floor decals in a couple areas.
- RD office now has its telescreen back.
2018-03-31 22:33:11 -07:00
Neerti
183a567db0 Merge pull request #5059 from Heroman3003/slime-behavior-fixes
Fixes and tweaks for slime behavior.
2018-03-31 23:35:24 -04:00
Atermonera
d49ac27d7f Merge pull request #5102 from Verkister/orgons
Fixes inconsistencies in organ system
2018-03-31 12:15:51 -07:00
Atermonera
8b7fe2129a Merge pull request #5100 from Verkister/patch-10
Re-establishes existing foundations for human icon construction
2018-03-31 12:14:23 -07:00
Cameron653
4a1ef0dbd6 Makes syndie dufflebags hint that they let you move faster 2018-03-31 11:02:01 -04:00
MarinaGryphon
545cc15849 Adds a message on emag to the battle arcade machine. (#5129)
* Updates one arcade machine emag message to to_chat, adds another.

* Returns 1 in emag_act for orion trail.

* Converts a bunch of stuff to macros. Should probably not break anything.

* Fixes an improper macro usage.

* Attempts to fix all 20 errors.
2018-03-30 19:36:45 -05:00
Anewbe
da78c67eb1 Merge pull request #5101 from Verkister/patch-11
Fixes custom accessories not showing up on things
2018-03-30 19:34:18 -05:00
Anewbe
6caa8e08cf Merge pull request #5113 from Woodratt/03262018_44revolver
44 revolvers
2018-03-30 17:46:37 -05:00
Neerti
f26dd30aa5 Merge pull request #5114 from VOREStation/vplk-debug-admin
Grant remote profile access to R_DEBUG holders
2018-03-30 18:45:26 -04:00
Neerti
f429a176e4 Adds Map Template Groups
Adds ability to have many different 'versions' of a PoI, yet only having one show up per round.
An example on how to do this is provided with Radio Free Sif (aka DJOutpost).
Just make sure all the different versions have the same 'template_group' value.
2018-03-30 05:34:11 -04:00
Neerti
9ff18723f4 Merge pull request #5128 from Atermonera/pai_mani
Fixes #4951
2018-03-29 23:21:15 -04:00
Neerti
f5c331b142 Merge pull request #5127 from VOREStation/vplk-table-layer-fixes
Table Layering and Runtime Fixes
2018-03-29 23:20:57 -04:00
Atermonera
a54522751b Change of template 2018-03-29 18:16:04 -07:00
mistyLuminescence
dfc0dd48bc Removes vials 2018-03-30 02:12:58 +01:00
Leshana
15936a9eb1 Fixes Runtime in logging.dm,61 2018-03-29 21:05:53 -04:00
Leshana
779e6f177d Fixes machines being below tables they should sit upon. 2018-03-29 21:03:45 -04:00
Leshana
530c3e9a07 Fixes fullbright mode hiding lighting overlays.
Fullbright plane master being above lighting plane master is important, shouldn't be removed.
2018-03-29 20:20:47 -04:00
Atermonera
4b5fdb9825 Merge pull request #5076 from Anewbe/advanced_medkits
MDs and EMTs spawn with the white medkit
2018-03-29 16:31:10 -07:00
Anewbe
88463b5709 Normal brute kits disinfect wounds 2018-03-29 17:51:55 -05:00
Arokha Sieyes
b610a35887 Fix for MOB_CAN_SEE_PLANE 2018-03-29 15:20:55 -04:00
Leshana
e14140d8dc Grant remote profile access to R_DEBUG holders 2018-03-29 13:52:53 -04:00
Anewbe
92df13c8c1 Merge pull request #5098 from Woodratt/03232018_randomaddsntweaks
Changes to objects random
2018-03-29 12:37:14 -05:00
Leshana
1ae7f45f1f Merge branch 'master' into vplk-port-pipeland-theta 2018-03-28 17:47:21 -04:00
elgeonmb
499f6c84df prettified lorecodex, added a month's worth of news (#5112)
* prettified lorecodex : added a month's worth of news

* what the hell elgie

* all according to kaikoku
2018-03-28 13:01:29 -07:00
elgeonmb
0a1e3d798b Lore-Compliant Oculum News Channel (#5111)
* adds an e-reader full of news to the loadout

* Political Almanac -> Pocket Newscaster

* new news channel containing lore-compliant news that's not bad
2018-03-28 13:01:10 -07:00
Aronai Sieyes
7d3aec96fd Arranges lots of things into planes (#5072)
* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic
2018-03-28 12:59:12 -07:00
Atermonera
a2841ce9d6 Nanoui now supports use of multiple templates (#5105)
* Nanoui now supports use of multiple templates

* Removing debug code, indentation

* Indentation
2018-03-28 14:53:50 -05:00
Atermonera
6adbe5537e Merge pull request #5079 from BillyBangles/they-arent-sharpies-i-swear
Adds permanent markers
2018-03-28 11:49:10 -07:00
Neerti
e17d441348 Merge pull request #5107 from VOREStation/aro-ports-03252018
More VS Ports
2018-03-28 11:41:27 -04:00
Woodratt
32860140b4 44 revolvers
Port from Bay

- Addition of two more revolvers in 44 cal for variety
- Creation of rubber rounds for 44 cal (stats taken from virgo no idea how good they are in actual fights)
- Includes 44 ammo speedloaders, regular and rubber speedloaders
- Slight adjustments to allow for firing animations taken from Bay (the mosley revolver has a firing animation that plays)
- Includes in hand sprites

We did already have the 'webley' sprite (it exists in a recolored sprite). However it is a alternate sprite for the detective's 45 revolver. This brings it in as a actual proper revolver with sprites that are different than the detectives revolver, and maybe in the future can be thrown into loot lists and PoIs.
2018-03-26 14:33:43 -07:00
Neerti
3de715ef55 Fixes Suit Storage Icons
Items in suit storage should no longer vanish.
2018-03-26 00:41:55 -04:00
Arokha Sieyes
f6321228a0 POLARIS: Adds an animation thing, uses it on ventcrawls 2018-03-25 17:42:48 -04:00
Arokha Sieyes
6072077d10 POLARIS: Add eye color to shapeshifters 2018-03-25 17:18:34 -04:00
Arokha Sieyes
9012958724 POLARIS: Heal robolimbs when you heal everything
Typically only used in magic and stuff, makes sense to heal both (otherwise there's no way to heal whole FBP bodies)
2018-03-25 17:15:11 -04:00
Arokha Sieyes
7cac2052b5 POLARIS: Fix incorrect robolimb checks 2018-03-25 17:14:46 -04:00