cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 19:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,213 Commits 8 Branches 26 Tags
862f1eff44dd5493aa73db3b8eeb3a73f0e4ec8a
Commit Graph

20766 Commits

Author SHA1 Message Date
Leshana
862f1eff44 Override Polaris change: keep our light power usage the same as it was 2018-05-10 13:48:54 -04:00
Leshana
33202c5c38 Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01 
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml
 2018-05-10 13:48:20 -04:00
Aronai Sieyes
86e413bf00 Merge pull request #3634 from VOREStation/aro-taur_suits_must_die 
Removes taur suits
 2018-05-08 19:09:29 -04:00
Aronai Sieyes
f2dae552f8 Merge pull request #3645 from VOREStation/aro-issue-3637 
Fix talking in AR when caught in own soulcatcher
 2018-05-08 19:08:51 -04:00
Aronai Sieyes
47b099a318 Merge pull request #3643 from VOREStation/aro-issue-3638 
Process text formatting in subtle messages like say/emote/whisper
 2018-05-08 18:59:36 -04:00
Aronai Sieyes
0d761c4ac8 Merge pull request #3654 from InterroLouis/master 
Kai-netic Accelerator Fluff Item
 2018-05-08 18:59:00 -04:00
Aronai Sieyes
4b20cfe73f Merge pull request #3239 from Verkister/patch-16 
Little more realistic gurgle gain tweak and oxyloss compensation.
 2018-05-08 14:44:57 -04:00
Aronai Sieyes
7334cd2638 Merge pull request #3623 from Verkister/flavormenu 
Adds selectable sets of contamination flavors for bellies.
 2018-05-08 11:26:34 -04:00
Aronai Sieyes
cad6ace6b0 Merge pull request #3624 from VOREStation/exp-rust-g 
Implement rust-g library for logging
 2018-05-08 11:22:52 -04:00
Aronai Sieyes
df33ce737e Merge pull request #3656 from Heroman3003/shadekin-exclusion 
Removed shadekin from Slime Vore reaction
 2018-05-08 10:32:30 -04:00
Heroman3003
1dcb2e1a1b Removed shadekin from Slime Vore reaction 2018-05-08 14:29:48 +10:00
InterroLouis
dc299bdd3b Add files via upload 2018-05-07 20:24:32 -04:00
Arokha Sieyes
3bac36d5f1 Fixes IC button label reference in chat messages 
Fixes #3586
 2018-05-06 01:39:56 -04:00
Arokha Sieyes
067750b306 Fix talking in AR when caught in own soulcatcher 
Fixes #3637
 2018-05-06 01:25:56 -04:00
Arokha Sieyes
29aa4c28a0 Process text formatting in subtle messages like say/emote/whisper 
Fixes #3638
 2018-05-06 01:19:02 -04:00
Aronai Sieyes
5108d13609 Merge pull request #3629 from VOREStation/aro-colorblind 
Fix Colorblindness
 2018-05-05 11:30:37 -04:00
Spades
ba5bfa00bb Merge pull request #3583 from Verkister/chompychomp 
Adds a funky fresh feature to beartraps.
 2018-05-05 08:32:38 -04:00
Arokha Sieyes
4ce3f055b5 Fix underdark mob spawn areas again again again 2018-05-04 22:18:03 -04:00
Arokha Sieyes
c4cbe31199 Removes taur suits 2018-05-04 22:16:17 -04:00
Leshana
86eac9c0b1 Implement rust-g library 2018-05-04 18:58:31 -04:00
Verkister
6821d3fcae small fixes etc. 
-Renamed the legacy flavor list from "all" to "generic"
-Added a few new/mode specific flavors.
-Rearranged the flavor lists into alphabetical order.
-Fixed a typo.
-Applied some suggested tweaks.
-Fixed oversight of the prey drop contamination not being updated for this.
-Fixed belly transfers not removing transfered items from source belly items_preserved list while at it.
 2018-05-04 14:48:51 +03:00
Arokha Sieyes
cdd35ccb70 VS: Support genetic modifiers in resleeving, fix colorblindness 2018-05-03 17:52:27 -04:00
Arokha Sieyes
8fbf78974a POLARIS: Colorblindness Traits/Modifiers 2018-05-03 17:51:52 -04:00
Verkister
7b0bdccade Adds selectable sets of contamination flavors for bellies. 
-Divides item contamination flavors into categories to match better with the "belly" types.
-The selection menu shows up when itemweak mode is selected.
-The selection should save for each belly along with other prefs.
-The flavors have been cropped into following categories:
->All, contains the whole list as before apart from possible specific ones. Is the designated default option.
->Acrid, contains flavors implying regular nasty digestion.
->Dirty, contains flavors related to visual contamination.
->Musky, contains suggestively sloppy flavors without excess filth.
->Smelly, contains more airborne flavors without visual slop or crud.
->Wet, contains flavors of more neutral-ish soakage.
 2018-05-01 13:34:42 +03:00
Spades
2bfba8338f Merge pull request #3571 from Verkister/lucidumb 
Adds glowy eyes to badbois and sec/phoron oties.
 2018-05-01 05:11:21 -04:00
Aronai Sieyes
9d8a0ea18e Merge pull request #3616 from VOREStation/aro-issue-3540 
Fix a couple maint drone issues, plus a PoI
 2018-04-30 19:23:54 -04:00
Leshana
fc42ce8a92 Merge pull request #3605 from VOREStation/aro-survsleeper 
Shelter sleeper description tweak
 2018-04-30 19:18:08 -04:00
Arokha Sieyes
f77dbccbe5 Fix a couple maint drone issues, plus a PoI 
Fixes #3540 for ventcrawling, and tags the drone fabricators properly. Also Fixes #3566 since that's a map edit on the same map.
 2018-04-30 17:36:33 -04:00
Verkister
d022c02a23 Merge branch 'master' into lucidumb 2018-04-30 22:49:12 +03:00
Arokha Sieyes
f1e47c85f4 Xenochimera can't take synth limbs 
As requested in, and Resolves #3564
 2018-04-30 15:45:50 -04:00
Verkister
5e1eb72e21 pathing update 2018-04-30 20:34:49 +03:00
Aronai Sieyes
d2de3d2c8a Merge pull request #3588 from VOREStation/use-names-that-make-fucking-sense 
Makes file pathing for mobs not piss me off
 2018-04-30 12:53:20 -04:00
Mechoid
9dda8cfe92 Power cost decrease on Lights and Shield Diffusers 2018-04-29 20:11:20 -07:00
Arokha Sieyes
edec960bda Shelter sleeper description tweak 2018-04-29 21:03:29 -04:00
Atermonera
b130f1cea3 Merge pull request #5211 from Anewbe/hidden_late_join 
Hides jobs with the Never pref on late join
 2018-04-28 20:56:25 -07:00
Atermonera
4828319605 Merge pull request #5212 from Woodratt/04252018_POIstage05 
PoI Stage 0.5
 2018-04-28 20:48:30 -07:00
Neerti
e3e1a7ad9c Upgrades Planetary Weather to vis_contents (#5170) 
* Upgrades Planetary Weather to vis_contents
Makes the weather on Sif use vis_contents instead of overlays, which should fix all weather-related icon issues, and may or may not be faster.
Weather updates instantly now.
Fixes indoor PoIs having outdoor weather.

* Tries to appease Travis
 2018-04-28 20:40:11 -07:00
Neerti
81c19c62a3 Merge pull request #5218 from Mewchild/MC-Snowsuit 
Fixes miners not being able to take supply snowsuit
 2018-04-28 22:10:12 -04:00
Anewbe
31963b9c20 Merge pull request #5221 from ReddeyfishVor/patch-4 
Prevent negative weight events from happening
 2018-04-28 20:32:33 -05:00
Aronai Sieyes
1849e1280e Merge pull request #3577 from Screemonster/willitblend 
Makes blenders multitoolable for grub larva
 2018-04-28 20:49:19 -04:00
Screemonster
a2329fb1b5 Xenochimera things I missed reviewing the cleanup 2018-04-28 22:32:11 +01:00
Screemonster
d4b800d263 does the thing more betterer 2018-04-28 21:02:34 +01:00
Spades
b06b1d16a8 Makes file pathing for mobs not complete autism 2018-04-28 13:37:41 -04:00
Spades
638a3f22d5 Merge pull request #3101 from VOREStation/aro-xen 
[Pls Review] Xenochimera Cleanup
 2018-04-28 10:48:19 -04:00
Verkister
87d2dbc3fb got em 2018-04-28 13:19:35 +03:00
ReddeyfishVor
3c931ad535 Prevent negative weight events from happening 2018-04-27 17:10:41 -07:00
Arokha Sieyes
6f50bce4e7 Xenochimera refactoring 2018-04-27 20:04:59 -04:00
kcin2001
0b4507f333 Merge branch 'master' into herms 2018-04-27 17:00:09 -07:00
kcin2001
4bb676b317 fixes gender_vr 2018-04-27 15:58:10 -07:00
kcin2001
51cd8636be Adding herms all the way 2018-04-27 15:53:37 -07:00