Commit Graph

31760 Commits

Author SHA1 Message Date
Leshana
171e24e4b8 Fix shuttle corner turfs disappearing when shuttle moves.
When shuttles land on a turf, it takes the appearance of the turf it lands on as an underlay.  Must make sure this underlay is on FLOAT_PLANE otherwise it will likely end up OVER the turf itself.
2018-04-09 18:12:56 -04:00
Verkister
5e0ed0585f done 2018-04-09 23:40:20 +03:00
Leshana
98d5f62250 Merge pull request #3400 from VOREStation/polaris-sync-2018-04-04
Polaris Sync 2018-04-04
2018-04-09 13:28:19 -04:00
Leshana
a2b40e5aef Merge pull request #3411 from Heroman3003/meson-overlay-fix
Fixed mesons NIFSoft overlay not highlighting open spaces above
2018-04-09 07:23:14 -04:00
deathride58
a5365c6814 fixes the meteor refusing to move at all after being deflected 2018-04-09 04:08:13 -04:00
Verkister
2311edbc36 snib 2018-04-09 09:38:42 +03:00
deathride58
1141e68bad allows meteors to be deflected by baseball bats 2018-04-09 02:34:00 -04:00
Verkister
661b2946ff Squashed commit of the following:
commit f55edb98499b600186be9f58c0d245b454479b74
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 17:05:19 2018 +0300

    we'll see about that whitelist crap later then

commit 186ce2aba274c4009c42a730d1ba7c67dddf8ea6
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 16:32:08 2018 +0300

    screw you too travis

commit 470789300bda3949de4027dc8e2c25ae8427eaae
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 16:10:29 2018 +0300

    Update painter_vr.dm

commit e9dee86b0cb84172c95f3a91ba73ce0b2661820c
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 15:51:37 2018 +0300

    Update painter_vr.dm
2018-04-09 09:32:58 +03:00
Arokha Sieyes
d67f433f22 Fixes #3344 - Holocarp set DM_HOLD when holodeck is safe 2018-04-08 22:00:10 -04:00
Arokha Sieyes
44437da3c3 Fixes #3368 - Teleporting now often respects dropnom pref 2018-04-08 21:42:33 -04:00
Cameron653
1b447796de Moves to proper file 2018-04-08 21:05:47 -04:00
Heroman3003
046cf046d8 Fixed mesons NIFSoft overlay not highlighting open spaces above 2018-04-09 10:57:23 +10:00
Aronai Sieyes
9daefbe6e6 Merge pull request #3358 from Verkister/ttail
Fixes feathered tesh tail into proper dual-color format.
2018-04-08 20:44:24 -04:00
Aronai Sieyes
c39a91eae1 Merge pull request #3325 from VOREStation/Cameron653-patch-1
Removes excavation drill since it's been ported upstream
2018-04-08 20:41:11 -04:00
Leshana
4e1fa47a0b Reverts gauze disinfecting until a proper solution can be put in place. 2018-04-08 20:24:48 -04:00
Cameron653
7c794107d3 Ckey locks it 2018-04-08 12:52:19 -04:00
Cameron653
e835ce0965 Update void_vr.dm 2018-04-08 12:50:54 -04:00
Verkister
e6e755d09d Adds a machine for recoloring apparel ingame.
-Not mapped in currently.
-Still unsure whether to have it whitelisted for white/grey items only or to let people have their fun experimenting on nasty aesthetics.
-Also supports bags and belts. Yes, I've heard the pleas of the people not liking the default grey being the only public backpack option there is.
2018-04-08 15:38:00 +03:00
Verkister
6d93803b78 Cargo pack tweaks. 2018-04-08 15:21:34 +03:00
Spades
a72abf203d Merge pull request #3407 from Little-119/rings-fix
Changes wedding rings to be a subtype of ring
2018-04-08 07:26:38 -04:00
Little-119
6ebe2269c4 Changes wedding rings to be a subtype of ring
Also moves them to their own .dm, since they're now a subtype of the thing in rings.dm. Also changed bethrothed to spouse, as the former is usually before marriage and not after.

Benefits of this include: Being able to wear gloves over wedding rings. Making them tiny instead of small. Making their gender neuter instead of plural, so it wont say "some wedding ring" when you examine someone wearing them. Probably more good things.

Issue reported by HzDonut.
2018-04-08 01:06:36 -04:00
Cameron653
c026f42676 Adds SilencedMP5A5's fluff items
https://forum.vore-station.net/viewtopic.php?f=27&t=1302
2018-04-08 01:03:07 -04:00
Verkister
1f9f404012 Adds a bunch of stuff to cargo selection.
-Xenowear crate, 13 non-random xenowear items for 100 points.
-Teshari smocks crate, comes with all the 5 basic colors for 25 points.
-Teshari undercoats, comes with 4 random colors from basic and grey selection for 20 points.
-Teshari undercoats black, comes with 4 random colors from the black trim selection for 20 points.
-Teshari cloaks, comes with 4 random colors from basic and grey selection for 40 points.
-Teshari cloaks black, comes with 4 random colors from the black trim selection for 40 points.
-Utility uniforms, comes with the 3 loadout utility uniforms (black/blue/grey) for 30 points.
-Skirts crate, comes with the 10 regular type skirts for 40 points.
-Varsity jackets, comes with the set of 6 colors for 60 points.
-Leather gear crate, comes with 5 random items from a selection of 21 more or less tough/kinky gear for 50 points.
-Eyewear crate, comes with 11 cosmetic and/or prescription pieces for 50 points.
-Gloves crate, comes with 4 random gloves with a chance to hit a couple fancier ones among the basic colors for 40 points.
-Boots crate, comes with 3 random pairs of boots freely available in loadout for 60 points.
-Taurbags crate, comes with the 3 universal saddlebags we have (basic/robust/vest) for 60 points.
-Cuisine crate, comes with 5 random foods from a list of varying cultural fanciness for 25 points.
-Burger crate, comes with 5 random basic burgers for 15 points.
-Special burger crate, comes with 3 random special burgers for 60 points.
-Bakery products, comes with 5 random bakery products for 15 points.
-Cakes crate, comes with 5 random cakes for 50 points.
-Mexican food crate, comes with 5 random mexican foods for 15 points.
-Asian food crate, comes with 5 random asian foods for 15 points.
-Action figures crate, comes with 5 random figures for 50 points.
-Tabletop miniatures crate, delivers the set of those characters for 30 points.
-Plushies crate, comes with 3 random plushies for 30 points.
2018-04-07 18:14:35 +03:00
Leshana
e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04
# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
2018-04-06 15:40:06 -04:00
Aronai Sieyes
e49e883f5f Merge pull request #3384 from Cameron653/VOX_STUFF_FIX
Fixes vox not having hardsuit sprites.
2018-04-06 15:39:55 -04:00
Aronai Sieyes
58a2459c6d Merge pull request #3385 from Michiyamenotehifunana/egun-replacer
Overrides the base Energy Gun sprite with a good looking one
2018-04-06 15:36:59 -04:00
Aronai Sieyes
2f8063c560 Merge pull request #3380 from Ketrai/patch-8
Nerfs solargrub drain speed.
2018-04-06 15:34:44 -04:00
Aronai Sieyes
dc3a587b7f Merge pull request #3390 from Verkister/collors
Small Shock/Holo collar tweaks.
2018-04-06 15:11:16 -04:00
Leshana
c8dd30846c Merge pull request #3378 from VOREStation/polaris-sync-2018-03-30
Polaris Sync 2018-03-30
2018-04-06 14:42:19 -04:00
Michiyamenotehifunana
2318db9cd7 Improves contrasts on sprites and removes the need for mirroring upstream sprites 2018-04-06 17:59:10 +08:00
Ketrai
26d028a16f Update solargrub.dm 2018-04-06 11:40:26 +02:00
Verkister
04a6d1a4b0 more fixes etc 2018-04-06 10:48:38 +03:00
Verkister
5d8b6cd1a6 Small Shock/Holo collar tweaks.
-Updates their old >> dialogue.
-Makes shock collars taggable.

Was gonna fix them showing up in forced lowercase on people but that turned out to be a separate polaris issue that I just opened a fix for up there.
2018-04-05 15:48:03 +03:00
Michiyamenotehifunana
50d7706cd2 Fixes Pathing 2018-04-05 20:21:15 +08:00
Verkister
4a81fcf8d8 Fixes a bunch of simple animal vore icon issues. 2018-04-05 09:59:24 +03: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
Cameron653
5fe6ae2125 Fixes vox not having hardsuit sprites. Uses the new defines. 2018-04-03 16:19:07 -04: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
9634cf04ce Don't kick admin observers for inactivity. They might be waiting for ahelps. 2018-04-02 22:48:00 -04: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
Ketrai
9cac16375a Nerfs solargrub drain speed.
Due to the lack of saturation in the moderate event container, solargrubs show up way too frequently, and changing the frequency doesn't help. The container has to pick. This change will just bump the drain speed down so severely, that if you kill one or two grubs, the station should barely feel the impact anymore. As opposed to having to kill 4/5 grubs on average.

Gradual nerfs seem logical, as grubs get more and mroe of a day-to-day experience, and most people know about them now. Time to stop the witch hunting for those annoying grubs :p
2018-04-02 12:19:26 +02: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
Cameron653
f66f87b1f6 Fixes a bug. It's flatland zorren.
Fixes #3376
2018-04-01 23:07:12 -04:00