Commit Graph

31700 Commits

Author SHA1 Message Date
Aronai Sieyes
0e62b4a159 Merge pull request #3413 from VOREStation/aro-telenompref
Fixes #3368 - Teleporting now often respects dropnom pref
2018-04-10 12:51:26 -04:00
Aronai Sieyes
9fbbcac1da Merge pull request #3414 from deathride58/BATTERUP
Adds the ability for meteors to be deflected by baseball bats
2018-04-10 12:39:04 -04:00
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
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
deathride58
1141e68bad allows meteors to be deflected by baseball bats 2018-04-09 02:34:00 -04: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
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
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
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
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
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
Leshana
1f4bdc4389 Reverted use of 'usr' back to 'user' from commit 05fd53ebcc 2018-04-01 22:03:10 -04:00
Leshana
666215bae8 Merge pull request #3369 from VOREStation/aro-posiempty
Fixes infinite loop in FBP naming w/o client
2018-04-01 19:17:38 -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
Leshana
88c4ca0246 Fix light/camera layers for macros and fix constants for them too. 2018-04-01 16:29:52 -04:00
Leshana
07c0ef2b8a Fix unused variable warnings. 2018-04-01 16:17:35 -04: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