cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 04:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,760 Commits 8 Branches 26 Tags
75bb0143a7bd2c1906b176249e032070a02ada44
Commit Graph

25797 Commits

Author SHA1 Message Date
Novacat
75bb0143a7 Merge pull request #8988 from VOREStation/upstream-merge-7622 
[MIRROR] Changes default skin tone from 35 to 110
 2020-09-05 12:27:45 -04:00
Novacat
90e5a7b05c Merge pull request #8989 from VOREStation/upstream-merge-7621 
[MIRROR] Bring shotgun slugs AP potential to 20%
 2020-09-05 12:16:34 -04:00
Novacat
549d875f53 Update preferences.dm 2020-09-05 12:16:09 -04:00
Kates
7177686b57 Bring shotgun slugs AP potential to 20% (#7621) 2020-09-05 11:11:34 -04:00
listerla
2b600cbe85 Changes default skin tone from 35 to 110 2020-09-05 11:09:18 -04:00
listerla
becef24a2c carot -> carrot (#7612) 2020-09-05 09:28:43 -04:00
Novacat
e1f1b2a5b9 Merge pull request #8892 from Cyantime/patch-3 
Enables the construction of battery rack circuits from APC circuits
 2020-09-05 01:10:51 -04:00
Novacat
9f2a4a7404 Merge pull request #8931 from lbnesquik/Kot-APC-inducer 
You can now use the inducer on the APC. Probably.
 2020-09-05 01:10:17 -04:00
Atermonera
f612958f0c Merge pull request #7603 from Greenjoe12345/customloadout 
adds the ability to give loadout items a custom name/description
 2020-09-04 22:31:18 -04:00
Novacat
807d89d9e9 Merge pull request #8957 from ShadowLarkens/tgui_civ 
TGUI Civilian (except no double travis)
 2020-09-04 19:32:32 -04:00
Novacat
cf4e8ea637 Merge pull request #8961 from dwinters99/dingaling 
Added audio to jingle-bell verb
 2020-09-03 15:41:59 -04:00
lbnesquik
abd819b0b4 Allow inducers to interact with APC's. 
Probably.
 2020-09-03 21:13:04 +02:00
Meghan-Rossi
b1601323d5 Fix bumpnoms 
Gets bumpnoms working.  Tested it with a fennec, seems to work fine.
 2020-09-03 10:46:30 +01:00
ShadowLarkens
c32f05e1f7 TGUI Civilian 
UI's Converted:
 - Aurora Cooking
 - Chaplain Book Selection
 - ColorMate
 - Cryo Storage
 - Holodeck
 - Jukebox
 - Looking Glass
 - Microwave
 - Newscasters
 - Timeclock
 - Vending Machine Improvements
 2020-09-02 13:32:42 -07:00
Cyantime
90fc34d566 Remove unneeded edits 2020-09-02 14:03:27 -04:00
Cyantime
09ee83dd02 Fix combat drones becoming offset after attacking 2020-09-02 14:01:15 -04:00
Novacat
48db324343 Merge pull request #8922 from lbnesquik/Kot-minin-inducer 
Add the inducer to mining & survey vendors.
 2020-09-02 13:32:21 -04:00
Novacat
d87dcbf0f7 Merge pull request #8958 from Muffindrake/lead_typo 
Fix refined MAT_LEAD 0 nutrition, gem_eater typos
 2020-09-02 11:03:32 -04:00
David Winters
5c63b01475 ding ding 2020-09-02 00:21:17 -04:00
ShadowLarkens
051710824b Allow shuffling vore bellies around. 2020-09-01 20:35:13 -07:00
Muffindrake
eb830751ee Fix refined MAT_LEAD 0 nutrition, gem_eater typos 2020-09-02 01:31:36 +02:00
Verkister
bf5ea9e217 Merge pull request #8747 from VOREStation/Verkister-patch-1 
Buffs/fixes darksight traits.
 2020-09-01 20:56:19 +03:00
Novacat
dba5a14b5f Merge pull request #8952 from Heroman3003/constructible-vorelaws 
Constructible vorelaws
 2020-09-01 08:02:26 -04:00
Heroman3003
33f85fc4d6 Makes the vorelaw boards makeable 2020-09-01 16:34:24 +10:00
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
Kates
07d92c80ba Update survey_vendor.dm 2020-08-31 22:52:34 +02: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