Commit Graph

3161 Commits

Author SHA1 Message Date
Nadyr
e1c359c9d3 Merge pull request #716 from CHOMPStationBot/upstream-merge-9230
[MIRROR] [MIRROR] Adds tesla generator crate to cargo
2020-10-22 09:34:20 -04:00
Nadyr
2f2df3d6a2 Merge pull request #718 from CHOMPStationBot/upstream-merge-9228
[MIRROR] [MIRROR] fix infinite ratburgers
2020-10-22 09:27:16 -04:00
Verkister
56bd71350b Merge pull request #9221 from VOREStation/upstream-merge-7703
[MIRROR] Make the tesla ball eventually run out of energy
2020-10-19 10:39:52 +00:00
Verkister
bcc001c7be Merge pull request #9222 from VOREStation/upstream-merge-7704
[MIRROR] Fix missing areas for some mountain pois
2020-10-19 10:39:45 +00:00
Verkister
a47085ef8e Merge pull request #9223 from VOREStation/upstream-merge-7705
[MIRROR] Fix blood from artifacts breaking the pathogenic isolator
2020-10-19 10:39:37 +00:00
Verkister
e8e63a2ea1 Merge pull request #9228 from VOREStation/upstream-merge-7711
[MIRROR] fix infinite ratburgers
2020-10-19 10:39:06 +00:00
Verkister
210505f2e4 Merge pull request #9230 from VOREStation/upstream-merge-7717
[MIRROR] Adds tesla generator crate to cargo
2020-10-19 10:38:51 +00:00
Verkister
16a23eadec Merge pull request #9235 from VOREStation/upstream-merge-7726
[MIRROR] Fix most borosilicate shards disappearing instantly after being made
2020-10-19 10:37:24 +00:00
Atermonera
03f7a2ad58 Merge pull request #7630 from Mechoid/ExoEncumberence
Exo Encumberence
2020-09-24 01:57:48 -04:00
Novacat
41c8e4a671 Merge pull request #9032 from VOREStation/upstream-merge-7475
[MIRROR] Hydro upkeep
2020-09-21 19:42:43 -04:00
Novacat
4b83c18fb7 Merge pull request #9071 from VOREStation/upstream-merge-7660
[MIRROR] Fix duplicate results from analyzing some objects
2020-09-21 16:54:29 -04:00
Novacat
9eff136dc9 Merge pull request #9063 from VOREStation/upstream-merge-7642
[MIRROR] Adds two new augments to Traitor uplink
2020-09-21 13:50:29 -04:00
Novacat
32fa026aa5 Merge pull request #9079 from VOREStation/upstream-merge-7672
[MIRROR] Fix fat tasting bitter
2020-09-21 13:43:02 -04:00
Atermonera
797873c769 Merge pull request #7672 from Meghan-Rossi/triglyceride_taste
Fix fat tasting bitter
2020-09-21 12:55:01 -04:00
Meghan-Rossi
cbfd4789d7 Fix duplicate results from analyzing some objects (#7660) 2020-09-20 07:18:35 -04:00
Meghan-Rossi
2ebfd20cb0 Fix trying to put people on themselves with the stripping menu (#7659)
*If you try to put someone in one of their own slots using the stripping menu, now you will instead try to strip that slot.

This always seems to be what people trying this actually mean to do, I've made this mistake and seen a few others make it too.  This also fixes buggy behavior downstream where people can actually succeed in putting people on themselves.
2020-09-20 07:16:19 -04:00
SubberTheFabulous
378ba4f4c0 Adds two new augments to Traitor uplink 2020-09-20 06:49:58 -04:00
Mechoid
68a37c64fa Hydro upkeep 2020-09-16 19:40:41 -04:00
Meghan-Rossi
5bfd87a63c Fix omni filters reacting incorrectly to some configuration changes (#7633)
*Fixes omni filters reacting incorrectly to configuration changes that swap ports.
2020-09-11 03:13:49 -04:00
Atermonera
577606690c changeopg update (#7632) 2020-09-07 23:38:09 -04:00
Kates
21b8fedb3f Allow mechs to butcher things with their drill. (#7493)
* Allow mechs to butcher things with their drill.
- Vague copy of a TG feature, made difficult by their different code. Still, it works.

* Add changelog
2020-09-06 14:19:24 -04:00
Killian
c7242b59de Update Random Spawners (#7614)
* Update spacesuits.dm

* more random stuff

* even more random stuff, plus changelog

* random large, couple more odds & ends

* more tweaks
2020-09-05 10:26:14 -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
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
87221b5e66 Adds hailer gas (face) masks. 2020-08-31 18:10:57 -04:00
Novacat
762f655b59 Merge pull request #8873 from VOREStation/upstream-merge-7559
[MIRROR] Ladders respect Move Up/Down paradigm
2020-08-28 13:35:11 -04:00
Atermonera
f2f5ba7a9e Ladders respect Move Up/Down paradigm 2020-08-27 21:39:06 -04:00
Atermonera
ac824e6bfc The great Aurora shoe heist 2020-08-25 19:17:10 -04:00
Atermonera
9422c5b06e Merge pull request #7539 from Atermonera/changelog
Great Glittering Changelog!
2020-08-22 17:59:23 -04:00
Atermonera
4097a3c765 Allows you to right click to lower job preference 2020-08-22 01:41:52 -04:00
Novacat
87f2c0c594 Merge pull request #8798 from VOREStation/upstream-merge-7484
[MIRROR] Adds Repeating Ambience and Ambience Chance Preferences!
2020-08-22 00:47:08 -04:00
Atermonera
3c67a19a20 Ports borg petting from CHOMPStation 2020-08-21 23:32:15 -04:00
Atermonera
325afb857e Adds Repeating Ambience and Ambience Chance Preferences! 2020-08-21 23:30:59 -04:00
Novacat
16465b5618 Merge pull request #8728 from VOREStation/upstream-merge-7466
[MIRROR] Adds wearing cones and caution signs
2020-08-21 13:33:08 -04:00
Novacat
ab88747252 Merge pull request #8755 from VOREStation/upstream-merge-7452
[MIRROR] Gives FBP's a proc to change their monitor display without using a mask item.
2020-08-21 13:32:51 -04:00
Novacat
a6efe9acbb Merge pull request #8756 from VOREStation/upstream-merge-7449
[MIRROR] Flavour Enhancement: Vending
2020-08-21 13:32:37 -04:00
Novacat
4082d5355b Merge pull request #8785 from VOREStation/upstream-merge-7523
[MIRROR] Ghost sechud verb, shift-click examine, alt-click turf tab
2020-08-21 13:32:20 -04:00
Verkister
929ce6c728 Merge branch 'master' into upstream-merge-7386 2020-08-21 14:12:26 +03:00
Novacat
4374731142 Merge pull request #8783 from VOREStation/upstream-merge-7522
[MIRROR] Improve cleanbot ai slightly
2020-08-21 01:42:29 -04:00
Novacat
4dc293b831 Merge pull request #8784 from VOREStation/upstream-merge-7521
[MIRROR] Adds metamorphic pint glasses to RSF, autolathe, supply packs
2020-08-21 01:42:13 -04:00
Novacat
10bcf007c5 Merge pull request #8782 from VOREStation/upstream-merge-7519
[MIRROR] Allows building plating on grass
2020-08-21 01:41:51 -04:00
Atermonera
8fc35d4da4 Merge pull request #7523 from Meghan-Rossi/ghostqol
Ghost sechud verb, shift-click examine, alt-click turf tab
2020-08-21 01:30:40 -04:00
Atermonera
4a6d87c3a5 Merge pull request #7521 from Meghan-Rossi/metapint
Adds metamorphic pint glasses to RSF, autolathe, supply packs
2020-08-21 01:28:23 -04:00
Atermonera
4eb14e5a0d Merge pull request #7522 from Meghan-Rossi/cleanbotaitweak
Improve cleanbot ai slightly
2020-08-21 01:28:12 -04:00
Atermonera
83e9effdf7 Merge pull request #7519 from Meghan-Rossi/grassbuilding
Allows building plating on grass
2020-08-21 01:26:56 -04:00
Atermonera
0ebcca246e Merge pull request #7518 from Meghan-Rossi/borgcookfix
Fix cyborgs not being able to cook
2020-08-21 01:25:40 -04:00
Novacat
9207c1dd50 Merge pull request #8764 from VOREStation/upstream-merge-7492
[MIRROR] Skrell blood is now hemocyanin-based
2020-08-21 01:12:00 -04:00
Novacat
dc48492db5 Merge pull request #8774 from VOREStation/upstream-merge-7509
[MIRROR] Stop bots standing around blocking doors
2020-08-21 01:11:26 -04:00