cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-31 11:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,176 Commits 8 Branches 26 Tags
86e413bf00a71afc9831e355d2b6ff72c3d2eed3
Commit Graph

9335 Commits

Author SHA1 Message Date
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
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
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
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
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
Screemonster
a2329fb1b5 Xenochimera things I missed reviewing the cleanup 2018-04-28 22:32:11 +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
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
Verkister
d7dde633ce Adds a funky fresh feature to beartraps. 
-Beartraps can now be worn on mask slot.
-Wearing them on mask slot enables brutal predation for the wearer.
 2018-04-28 00:24:13 +03:00
Aronai Sieyes
c93f0832ed Merge pull request #3559 from VOREStation/aro-sync-04252018 
Polaris Sync 04-25-2018
 2018-04-27 16:17:22 -04:00
Verkister
733c21944f Adds glowy eyes to badbois and sec/phoron oties. 
-Not glowing when resting though because of reasons.
 2018-04-26 23:22:53 +03:00
Verkister
5e1f0d6dcf Slightly softer corrupt pups. 
-Halved pounce chance and reduced mauling damage scaling by 5.
-Slightly reduced chatspam chance.
-Buffed the pounce chance for the extra special double corrupt prettybois though. Also gave their punts more flavor.
 2018-04-26 15:23:36 +03:00
Arokha Sieyes
6c686e6a2f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018 
# Conflicts:
#	README.md
#	code/game/jobs/job/job.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/npcs.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/Academy.dmm
#	maps/RandomZLevels/beach.dmm
#	maps/RandomZLevels/blackmarketpackers.dmm
#	maps/RandomZLevels/challenge.dmm
#	maps/RandomZLevels/example.dmm
#	maps/RandomZLevels/jungle.dmm
#	maps/RandomZLevels/listeningpost.dmm
#	maps/RandomZLevels/spacebattle.dmm
#	maps/RandomZLevels/stationCollision.dmm
#	maps/RandomZLevels/wildwest.dmm
#	maps/RandomZLevels/zresearchlabs.dmm
#	maps/northern_star/polaris-1.dmm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
#	maps/submaps/surface_submaps/plains/Boathouse.dmm
#	maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
#	maps/submaps/surface_submaps/wilderness/Boombase.dmm
#	maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
#	maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
#	maps/submaps/surface_submaps/wilderness/Drugden.dmm
#	maps/submaps/surface_submaps/wilderness/Rockybase.dmm
#	maps/submaps/surface_submaps/wilderness/Shack1.dmm
#	maps/virgo/virgo-6.dmm
#	vorestation.dme
 2018-04-25 17:23:33 -04:00
Aronai Sieyes
bba149737f Merge pull request #3527 from kcin2001/spirit-markings 
Adds in Spirit markings (that should work this time)
 2018-04-25 10:53:19 -04:00
Atermonera
7d6fba3ba1 Merge pull request #5194 from Anewbe/species_economic 
Species economic modifier is now a species var
 2018-04-24 23:26:41 -07:00
Aronai Sieyes
a53e7b534c Merge pull request #3528 from Verkister/patch-20 
Metabolism trait adjustments.
 2018-04-23 16:34:01 -04:00
Leshana
2a4182cc8e First effort fix of the slimes integration with taur riding. 2018-04-22 15:24:48 -04:00
Verkister
4c78ed0183 Metabolism trait adjustments. 
-Adjusts the metabolism traits some more to get them in line with some sort of numerical logic with better documentation.
-Slow metabolism is now -20% of default on every field.
-Fast metabolism now gives +20% processing rate and hunger/WG are both scaled to Teshari level (4x default)
-Apex metabolism stats now scaled to double the fast metabolism (+40%, 8x, still lower than pre-nerf). Also returns consistency with apex hunger/WG ratio that got bloopered in the lazy nerf. (gains left way too fast compared to hunger nerf. Gael just gained almost 5 pounds within overeat duration of like 10~15min lmao)
 2018-04-21 13:26:10 +03:00
kcin2001
e102d2b2fe adds in the code for the spirit markings 2018-04-21 00:09:34 -07:00
Cameron653
69407fad60 Makes clothing use the correct sprite sheet. 
For oddities like promethean teshari.
Without this, oddities like this happen https://i.imgur.com/DzLBviC.png
 2018-04-20 17:19:29 -04:00
Atermonera
cfd14786fa Merge pull request #5190 from Anewbe/punpun_clothes 
PunPun's clothes show up when he spawns
 2018-04-20 10:24:59 -07:00
Aronai Sieyes
7ead58510c Merge pull request #3483 from VOREStation/aro-sstailears 
Add ability for shapeshifters to change ears, tails, wings
 2018-04-19 20:26:23 -04:00
Aronai Sieyes
b42f8c3df2 Merge pull request #3501 from VOREStation/aro-is3478 
Cleans up custom species icon base code
 2018-04-19 20:26:13 -04:00
Aronai Sieyes
6f57022a0c Merge pull request #3448 from VOREStation/aro-taurriding 
Lazily implements taur riding
 2018-04-19 20:21:46 -04:00
Anewbe
aecd924ef2 Merge pull request #5161 from Atermonera/refactor_human_examine 
Refactors human/examine.dm
 2018-04-19 18:39:00 -05:00
Arokha Sieyes
2cba96cf4c Switch to defines for custom species stuff 2018-04-19 19:34:10 -04:00
Aronai Sieyes
f03406754b Merge pull request #3492 from VOREStation/aro-marfix 
Rewrite shadekin update_icons()
 2018-04-19 19:24:36 -04:00
Anewbe
323d3aa42c Species economic modifier is now a species var 2018-04-19 18:06:02 -05:00
Aronai Sieyes
28c7a58ccf Merge pull request #3502 from VOREStation/aro-is3476 
Make farmbots fill 10x faster
 2018-04-19 19:05:59 -04:00
Arokha Sieyes
82b755bab8 Allow K9s to use the hailer and law emotes 
Fixes #3447
 2018-04-19 18:08:13 -04:00
Arokha Sieyes
2904fa1bef Make farmbots fill 10x faster 2018-04-19 17:48:02 -04:00
Anewbe
d139e961b9 PunPun's clothes show up when he spawns 2018-04-18 23:26:31 -05:00
Aronai Sieyes
35ec513b28 Merge pull request #3452 from VOREStation/aro-sync-04122018 
Polaris Sync 04-12-2018
 2018-04-18 14:04:27 -04:00
Aronai Sieyes
80c8bb5e34 Merge branch 'master' into aro-taurriding 2018-04-18 14:01:50 -04:00
NeverKnowWhyThis
5c234b773a Teshari stuff (#3467) 
* Teshari stuff

-Adds a head to belly colouration for Teshari body marking
-Adds a smaller feathered alternative body marking
-Adds a Teshari mohawk hairstyle
-Adds a second option for Teshari tai (colorable)
-Adds a snowflake tail for Schae Shooki
-Adds an option to have ears on a teshari

* Changed names

* Moved sprite to correct .dmi

* Moved tashari_fluffymohawk to it's correct location

* Removed old tag

* Name edits, fluff item removed until approved correctly

I wasn't aware of SCA's for tails, I'll have it go trough the process normally.

* Minor name edit

* Modified body_parts to correctly reflect sprite

* Namefix

* Modified sprites and code that called upon them

* More spritefixes, reworked colouring

* More minor tailtweaking

* More fixes, underfluff is now working, but still needs the sprite adjusted to fit properly

* Small feathers are showing up, but more sprite issues to fix

* Modified Mohawk to show up on the character, sprites still aren't being loaded correctly. And I don't understand why it's happening

* Fixed markings, mohawk more ear styles based of the original

* Minor edit to heel fluff
 2018-04-18 13:57:31 -04:00
Arokha Sieyes
1bfe702e5e Rewrite shadekin update_icons() 
No more ma usage, use SSoverlays, fix typing indicator bug
 2018-04-18 13:50:13 -04:00
Anewbe
31922d8f37 Merge pull request #5174 from Verkister/patch-13 
Fixes simplemob icons when killed while resting.
 2018-04-17 22:58:54 -05:00
Arokha Sieyes
f04aeac6ca Add ability for shapeshifters to change ears, tails, wings 2018-04-17 16:05:57 -04:00
atermonera
5411e74e1a Moved defines to a __define file 2018-04-15 18:32:51 -07:00
Leshana
b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14 
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
 2018-04-15 14:19:36 -04:00