Commit Graph

31244 Commits

Author SHA1 Message Date
ShadowLarkens
ef846b5807 TGUI Fix verb, TGUI AI state fix, TGUI focus fix 2020-09-16 19:54:54 -07:00
ShadowLarkens
44f65e2602 TGUI Medical Conversion 2020-09-04 16:25:32 -07:00
Atermonera
1a91b1c380 Merge pull request #7602 from Cyantime/patch-2
Fix jetpack ion trail
2020-08-31 22:03:57 -07:00
Atermonera
0e71313afa Merge pull request #7600 from lbnesquik/Kot-Scanner-ore
Reduce the ore scanner time from 10 to 2 seconds. Same as the mech one.
2020-08-31 20:53:34 -07:00
Atermonera
fee3fd2bc8 Merge pull request #7593 from Cyantime/patch-3
Increases number of things that survive overmap ztransit
2020-08-31 20:40:13 -07:00
Cyantime
dbc006fdc6 Stops meson/etc use with overmap consoles (#7591)
* Stops meson/etc use with overmap consoles

* whoops that's a living var

* testing is for nerds
2020-08-31 20:39:14 -07:00
Atermonera
ef3d0a775b Merge pull request #7590 from Heroman3003/misses
Some missed instances of Colony Director
2020-08-31 20:36:39 -07:00
Atermonera
31f54f66d7 Merge pull request #7589 from listerla/toelessjackboots
Adds toe-less jackboots to xenowear
2020-08-31 20:36:18 -07:00
Atermonera
2cbad2298d Merge pull request #7587 from listerla/teshclothesfix
Fixes Teshari dresses
2020-08-31 20:35:13 -07:00
Atermonera
24e638c433 Merge pull request #7583 from KillianKirilenko/kk-misc2
FBP Internals Additions
2020-08-31 20:24:17 -07:00
Mechoid
86cd06d283 Distillery Upkeep, Chemistry Tweakening (#7573)
* Distillery For Chemistry

* Synthplasma, Synthblood but not horrifically strong.

* Rectify, I said, damnit!

* Distillery for Chem. Now with STRONG DMM.

* changeling
2020-08-31 19:35:25 -07:00
Mechoid
a8c62e89d7 Stop in the name of the law, open tag. 2020-08-31 19:11:57 -07:00
Atermonera
2cfa7b5cc3 Merge pull request #7561 from Mechoid/ProjectileUpkeep
Projectile Upkeep
2020-08-31 15:23:21 -07:00
Atermonera
cc3591ca80 Merge pull request #7552 from SplinterGP/master
Adds hailer gas (face) masks.
2020-08-31 15:08:57 -07:00
Cyantime
e5e9abceb2 Fix jetpack ion trail 2020-08-30 19:45:55 -04:00
lbnesquik
d6dcf28b1a Reduce the ore scanner time from 10 to 2 seconds. Same as the mech one. 2020-08-30 22:13:24 +02:00
Cyantime
9359f5b4f6 Fix doppler array iconstates (#7581) 2020-08-29 23:51:36 -07:00
Heroman3003
4cd8585e7e Makes borg cell replacement take priority over petting (#7579)
* Makes borg cell replacement take priority over petting

* dont pet WHILE taking cell out either
2020-08-29 23:49:02 -07:00
Cerebulon
811cd0b47e Vendor enhancement fixes (#7577)
* Vendor enhancement fixes

* skrellsnax trash, tuna name
2020-08-29 23:47:17 -07:00
Rykka Stormheart
e2cff9b3fa Adds Door Volume Channel (#7592)
Adds Door Channel Volume preference for doors, that applies to open/close/bolts sounds.

This should prevent complaints of "Doors are too loud" - adjust the volume channel to your personal preference.
2020-08-29 00:10:42 -07:00
SplinterGP
093c73ae3c tweaks to sec hailer masks 2020-08-28 20:44:31 -03:00
Cyantime
b7b01eb7a6 Increases number of things that survive overmap ztransit 2020-08-28 18:52:27 -04:00
Heroman
c534b58efa Some missed instances of Colony Director 2020-08-29 05:11:33 +10:00
listerla
6ba5d3b90e Adds toe-less jackboots to xenowear 2020-08-28 10:52:08 -04:00
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
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