Commit Graph

25769 Commits

Author SHA1 Message Date
Novacat
c06ccac8a5 Merge pull request #8935 from Cyantime/jetpackfuel
Jetpack cleanup, don't use fuel when unneeded
2020-09-01 01:05:04 -04:00
Novacat
b6cc3bd705 Merge pull request #8950 from VOREStation/upstream-merge-7600
[MIRROR] Reduce the ore scanner time from 10 to 2 seconds. Same as the mech one.
2020-09-01 00:52:53 -04:00
Novacat
77f39209a1 Merge pull request #8947 from VOREStation/upstream-merge-7593
[MIRROR] Increases number of things that survive overmap ztransit
2020-09-01 00:52:36 -04:00
Novacat
8bce0ae786 Merge pull request #8946 from VOREStation/upstream-merge-7591
[MIRROR] Stops meson/etc use with overmap consoles
2020-09-01 00:52:25 -04:00
Novacat
070a3489fe Merge pull request #8940 from VOREStation/upstream-merge-7583
[MIRROR] FBP Internals Additions
2020-09-01 00:51:59 -04:00
Novacat
d5f18ddb2e Merge pull request #8933 from VOREStation/upstream-merge-7552
[MIRROR] Adds hailer gas (face) masks.
2020-08-31 23:57:14 -04:00
Novacat
fe29585641 Merge pull request #8944 from VOREStation/upstream-merge-7589
[MIRROR] Adds toe-less jackboots to xenowear
2020-08-31 23:56:31 -04:00
Novacat
47acb763e0 Merge pull request #8941 from VOREStation/upstream-merge-7587
[MIRROR] Fixes Teshari dresses
2020-08-31 23:56:20 -04:00
Atermonera
ca2ce6adea 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 23:54:19 -04:00
Novacat
68f64d3d84 Update ship.dm 2020-08-31 23:53:59 -04:00
Atermonera
aa1575c27f Merge pull request #7593 from Cyantime/patch-3
Increases number of things that survive overmap ztransit
2020-08-31 23:41:07 -04:00
Novacat
f90777ead5 Merge pull request #8939 from VOREStation/upstream-merge-7573
[MIRROR] Distillery Upkeep, Chemistry Tweakening
2020-08-31 23:40:47 -04:00
Cyantime
6d5c14c448 Stops meson/etc use with overmap consoles 2020-08-31 23:39:49 -04:00
Unknown
c024404024 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7552 2020-08-31 23:39:16 -04:00
Atermonera
2a3a5483b0 Merge pull request #7589 from listerla/toelessjackboots
Adds toe-less jackboots to xenowear
2020-08-31 23:37:18 -04:00
Atermonera
500d859fd6 Merge pull request #7587 from listerla/teshclothesfix
Fixes Teshari dresses
2020-08-31 23:35:51 -04:00
Atermonera
a5c829ea53 FBP Internals Additions 2020-08-31 23:25:13 -04:00
Mechoid
97831abf14 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 22:37:18 -04:00
Atermonera
18060684ac Stop in the name of the law, open tag. 2020-08-31 22:36:05 -04:00
Cyantime
99009e6266 Jetpack cleanup, don't use fuel when unneeded 2020-08-31 21:13:04 -04:00
Atermonera
fb4d02df3d Merge pull request #7561 from Mechoid/ProjectileUpkeep
Projectile Upkeep
2020-08-31 18:23:39 -04:00
Atermonera
87221b5e66 Adds hailer gas (face) masks. 2020-08-31 18:10:57 -04:00
Novacat
1fcb6bf337 Merge pull request #8896 from Rykka-Stormheart/shep-dev-airlock-sound-prefs
Adds Toggles to Revert to Legacy Door Sounds and Enable Department Doors
2020-08-31 15:29:13 -04:00
ShadowLarkens
cd5e2976c5 Merge remote-tracking branch 'upstream/master' into rconsolefix 2020-08-31 11:19:53 -07:00
Novacat
4910e26bf8 Merge pull request #8919 from lbnesquik/Flyinginnggn
Make flying not cost your entire fat reserves
2020-08-31 00:39:26 -04:00
ShadowLarkens
dedb854338 Fixes emergent exploit of iteration order in crew monitors 2020-08-30 19:05:05 -07:00
Novacat
d10cb4aed1 Merge pull request #8913 from Heroman3003/datefix
Changes the dates of bank account creation to be more reasonable
2020-08-30 17:14:02 -04:00
Novacat
197d6d347f Merge pull request #8921 from lbnesquik/Kot-nif
Improve quick nif
2020-08-30 17:13:06 -04:00
Novacat
1abe8718e5 Merge pull request #8915 from VOREStation/upstream-merge-7579
[MIRROR] Makes borg cell replacement take priority over petting
2020-08-30 15:29:47 -04:00
Novacat
ac15f36943 Update robot.dm 2020-08-30 14:59:10 -04:00
lbnesquik
196580141b Improve quick nif
You can now choose which nif you want to give them
2020-08-30 20:53:23 +02:00
lbnesquik
305320d173 Make flying not cost your entire fat reserves 2020-08-30 20:33:39 +02:00
Heroman3003
8174488f34 Makes borg cell replacement take priority over petting 2020-08-30 02:50:16 -04:00
Cerebulon
7c57c7c0bd Vendor enhancement fixes (#7577)
* Vendor enhancement fixes

* skrellsnax trash, tuna name
2020-08-30 02:49:00 -04:00
Heroman
17d681c109 Changes the dates of bank account creation to be more reasonable 2020-08-30 13:57:21 +10:00
MrSign
f490bec8e2 adds toeless jackboots to loadout 2020-08-30 09:15:16 +10:00
MrSign
e0486dc479 Update loadout_shoes.dm 2020-08-30 09:00:50 +10:00
ShadowLarkens
63b9a5c80a Also fix the depth scanner 2020-08-29 13:31:50 -07:00
ShadowLarkens
20f1244c0c Whoops, don't make research levels global, we don't want permaautosync 2020-08-29 13:24:28 -07:00
ShadowLarkens
732b4a9530 Fix research console showing duplicates, make pages more clear 2020-08-29 12:49:45 -07:00
Heroman
c3bf4e5220 Makes rabbits not be vulpines 2020-08-30 05:32:23 +10:00
Rykka
9841414da6 Adds Toggles to Revert to Legacy Door Sounds and Enable Department Doors
Self-explanatory.

Adds toggle to go back to the old-school SS13 legacy airlock sounds, including the glass windoor airlock sounds, and a toggle to disable the per-department door sounds, which some found jarring/unrealistic.

If Per-Department sounds are disabled, the department doors will use hall1o/c for open/close respectively, following maintainer-requested behavior for these doors.

This also relocates the following sounds to be inside machines/door for more consistency:
- airlock.ogg
- airlockclose.ogg
- airlockforced.ogg
- airlock_creaking.ogg
- boltsup.ogg
- boltsdown.ogg
- blastdoorclose.ogg
- blastdooropen.ogg
- windowdoor.ogg
2020-08-29 03:04:34 -04:00
Novacat
692afaef75 Merge pull request #8794 from KasparoVy/mane-gain
Lets Taj Hairstyles be Selected by More Species
2020-08-28 16:11:57 -04:00
Novacat
81967dff01 Merge pull request #8887 from Heroman3003/xenobotany-remember
Allows xenobotanist to actually take research's loadout items.
2020-08-28 16:08:02 -04:00
Heroman
0a496c40ad Allows xenobotanist to actually take research's loadout items. 2020-08-29 05:31:01 +10:00
Heroman
ffdd8de3ce Site Management lookover for _vr stuff 2020-08-29 05:22:52 +10:00
Novacat
9bf1483963 Merge pull request #8846 from ShadowLarkens/tgui_silicon_law_panel
TGUI Law Manager
2020-08-28 14:48:01 -04:00
Novacat
0e1c17293e Merge pull request #8883 from Novacat/nova-basicfixes
Some quick fixes
2020-08-28 14:47:39 -04:00
ShadowLarkens
eac9e46615 TGUI Law Manager 2020-08-28 11:36:47 -07:00
Unknown
5be8cac469 Some quick fixes
- Fixes pathing error for ship capsules
- Adds a decal to all capsules
- Updates the Military capsule a bit
- Fixes a pathing error in an underdark POI
2020-08-28 14:36:16 -04:00