Commit Graph

31271 Commits

Author SHA1 Message Date
listerla
715ab87e57 Adds toe-less jackboots to xenowear 2020-08-28 10:51:23 -04:00
listerla
64678f29c3 Fixes Teshari dresses 2020-08-27 23:31:36 -04:00
Mechoid
730a389186 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into ProjectileUpkeep 2020-08-27 19:43:07 -07:00
SplinterGP
b915e10de9 Tweaks hailer sec mask transforming and adds swat variants to lockers 2020-08-27 23:29:39 -03:00
Atermonera
73e7c4632e Merge pull request #7582 from Rykka-Stormheart/shep-dev-ambience-chance-fix
Hotfix for Ambience Freq Overwriting Ambience Chance on Save
2020-08-27 19:28:09 -07:00
Atermonera
ee5190fcf4 Merge pull request #7576 from Rykka-Stormheart/shep-dev-gas-overlay-updoot
Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases
2020-08-27 19:27:33 -07:00
atermonera
6709259962 Travis only loads legal engines 2020-08-27 19:06:56 -07:00
Rykka
4f93a3b7a8 Fix tags 2020-08-27 21:46:08 -04:00
Atermonera
ba57d83191 Merge pull request #7584 from Rykka-Stormheart/shep-dev-borgo-fixes
Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
2020-08-27 18:45:20 -07:00
Rykka
d728339cfb Updates a comment 2020-08-27 21:45:19 -04:00
Rykka
324cb1f12d Replace "Sleeping Agent" with Nitrous Oxide
This makes it identical to it's real-life counterpart, and brings some actual sprite improvements upstream from Virgo.

Earlyport of https://github.com/VOREStation/VOREStation/pull/8812 with an actual rename of the gas, ID, and sprite used.
2020-08-27 21:45:19 -04:00
Mechoid
92224fc043 Adds two effect types for PoIs and theoretical future bossmobs. 2020-08-27 18:39:57 -07:00
Atermonera
8dc9ba1385 Ladders respect Move Up/Down paradigm (#7559) 2020-08-27 18:37:35 -07:00
Atermonera
60aec770ff Station overmap sensors should connect automatically now (#7547) 2020-08-27 18:31:22 -07:00
Atermonera
3a554b776f Merge pull request #7575 from lbnesquik/Kot-Beer-IS-FOR-MEN
Make it so beer bottles are filled. No longer get scammed!
2020-08-27 18:30:42 -07:00
Atermonera
3e4bf4a993 Merge pull request #7574 from Rykka-Stormheart/shep-dev-engine-randomization
Adds Engine Randomization on Mapload! (From VOREStation!)
2020-08-27 18:27:19 -07:00
Atermonera
6d4d5d6efd Merge pull request #7571 from listerla/nomoresitemanager
Colony Director -> Site Manager
2020-08-27 17:41:52 -07:00
Atermonera
ffea09e303 Merge pull request #7570 from ShadowLarkens/fading_titlescreen
Fading titlescreen from /tg/
2020-08-27 17:39:09 -07:00
Atermonera
f39b4c9b3d Merge pull request #7568 from lbnesquik/Kot-Cargo-comp-tweak
Add a warning line to the supply computer about access.
2020-08-27 17:36:58 -07:00
Atermonera
94655ff1e9 Merge pull request #7567 from lbnesquik/Kot-PIZZAFIX
Fix a pizza issue.
2020-08-27 17:36:02 -07:00
Atermonera
7d2a4f9e03 Merge pull request #7565 from Cyantime/patch-1
Fix ventcrawling while in 0 gravity
2020-08-27 17:34:50 -07:00
Rykka
f7fcdf2458 Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
ACTUALLY fixes problems with borgs permanently breaking their syringes and being able to put modules into potted plants, which causes unwanted fuckery.

Reverts #7560
2020-08-27 20:17:24 -04:00
Atermonera
d63d05acbd Merge pull request #7560 from cadyn/cadyn-bugfixes
Some borg bugfixes
2020-08-27 16:59:27 -07:00
Atermonera
17c1219248 Merge pull request #7558 from Cyantime/lanternlight
Returns the jackolantern overlay
2020-08-27 16:58:28 -07:00
Atermonera
f3f77d9c1f Merge pull request #7556 from Rykka-Stormheart/shep-dev-merc-fixes
Fixes Mercs threaten timers, and threaten sounds
2020-08-27 16:57:39 -07:00
Atermonera
cfbf5d10b4 Merge pull request #7554 from Heroman3003/turfslow
Fixes turf slowdown not applying on non-water/snow turfs
2020-08-27 16:56:43 -07:00
Atermonera
2064750ea2 Merge pull request #7553 from Shadow-Quill/patch-1
[Untested] Emotes won't be foiled by pesky capitals
2020-08-27 16:46:33 -07:00
Atermonera
5ee2dc80bf Merge pull request #7551 from Rykka-Stormheart/shep-dev-portals-documentation
Improves Portal Documentation for New Mappers unfamiliar with DIR
2020-08-27 16:46:01 -07:00
Atermonera
a7e1d20511 Merge pull request #7550 from Khloross/cookingfix
Fix combinination_cook() creating items with no reagents
2020-08-27 16:45:40 -07:00
Atermonera
eb57005043 Merge pull request #7548 from Mechoid/XenoarchUpkeep
Xenoarchaeology Upkeep
2020-08-27 16:44:53 -07:00
Atermonera
d0d1308cec Merge pull request #7480 from listerla/dionamarkings
Ports Aurora Diona markings
2020-08-27 16:25:37 -07:00
Atermonera
4bf64e6b2a Merge pull request #7459 from Rykka-Stormheart/shep-dev-sound-overhaul
Massive Ambience and Sound Overhaul + Addition
2020-08-27 16:23:38 -07:00
Killian
d8a711021d can inject synths, fix borghypo filename 2020-08-27 23:22:33 +01:00
Rykka
80207c6025 Hotfix for Ambience Freq Overwriting Ambience Chance on Save
I accidentally had ambience_freq being written to ambience_chance, oops.
2020-08-27 18:18:08 -04:00
lbnesquik
1974f6c84c Make it so beer bottles are filled. No longer get scammed! 2020-08-26 19:13:13 +02:00
Rykka
f623763472 Adds Engine Randomization on Mapload!
Engines will now be randomly placed on mapload, maintainers will need to update the server config to enable the system.

Add this to Config:

\# Control which submaps are loaded for the Dynamic Engine system
ENGINE_MAP Supermatter Engine,Edison's Bane

This will load either Supermatter or Tesla based on randomization. If you'd prefer to just stick with SM, remove "Edison's Bane" from the config file and leave in Supermatter Engine.

The way this is done DOES require the engine load system to be used, but it should pave the way for more modular engines in the future!

This also allows older maps to be loaded with hard-coded engines, if you comment out the line in config to disable it, it will skip engine loading.

If there's any issues, refer to the relevant submaps to tweak 'em. <3

TL;DR - Supermatter is now changed to on-mapload, Tesla added as option for mapload engine start. Remove the "Edison's Bane" from config and put the entire line into your config to make the engine work now. :blep:

Please merge this quickly, it will produce conflicts.
2020-08-26 12:25:40 -04:00
Verkister
20f9a7449d Enables passtable for cleanbots (#7545)
One of the most common reasons behind cleanbots getting stuck in stupid places is because they went after some mess underneath table/rack/railing/whatever without ever getting to reach it.
2020-08-26 00:51:17 -07:00
Verkister
b57adfe825 Fixes eye glow appearance flags (#7544)
Fixes eye glow layer not inheriting mob appearance flags.
2020-08-26 00:50:22 -07:00
Cyantime
cd50f655b5 Prevent acid glands from melting non-simulated turfs (#7541) 2020-08-26 00:49:33 -07:00
Killian
8c1ef13113 ChewMAX Bar Fix (#7540)
* Update robotics.dm

* Update scanner.dm

* Update snacks.dm
2020-08-26 00:48:34 -07:00
Shadow-Quill
d9846c6967 Attack! (#7538) 2020-08-26 00:47:49 -07:00
listerla
e9a3cb18bb Closes a string properly 2020-08-25 20:16:31 -04:00
listerla
583bccdbb8 Indentation fixes 2020-08-25 20:14:28 -04:00
listerla
d56974cb92 Colony Director -> Site Manager 2020-08-25 20:12:29 -04:00
listerla
831cb38cd0 This file now uses absolute pathing. 2020-08-25 19:58:39 -04:00
ShadowLarkens
5d972a399c Fading titlescreen from /tg/ 2020-08-25 16:53:12 -07:00
Atermonera
7595e09d2b Merge pull request #7474 from lbnesquik/Kot-Mecha-missile-tweak
Improvements to mech missiles.
2020-08-25 16:15:12 -07:00
Atermonera
a16e6ae0e8 Merge pull request #7456 from listerla/footwear
The great Aurora shoe heist
2020-08-25 16:14:48 -07:00
lbnesquik
286500969e Remove stale code. 2020-08-25 22:58:15 +02:00
Kates
0805347196 Remove a dot too many. 2020-08-25 21:44:08 +02:00