Commit Graph

995 Commits

Author SHA1 Message Date
Rykka
4a78b14451 Port over Roundstats System 2020-01-15 16:42:41 -07:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
TheFurryFeline
2754068163 More Fixes
Brollies, T-comms access fix, body designer, Erik's Lungs
2019-12-31 20:03:39 -05:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Meghan-Rossi
604fd1b74f Resolve conflicts, fix compile errors 2019-12-19 17:49:21 +00:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Atermonera
ba8a46bb03 Merge pull request #6565 from Heroman3003/eyecolor-fix
Fixes species without eyecolor being able to get one
2019-12-15 14:49:27 -05:00
Heroman3003
402d0acebf Fixes vorestation species without eyecolor being able to have eyecolor 2019-12-14 09:51:20 +10:00
Unknown
f68a82b81f Replaces lentext with length 2019-12-12 13:13:18 -05:00
Unknown
985d57f323 513 Compatability 2019-12-12 10:40:27 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Novacat
26b0f83192 Merge pull request #6241 from Heroman3003/black-eyed-fluffers
New Species: Black-Eyed Shadekin
2019-12-06 11:37:23 -05:00
Heroman3003
69ca6dc2f3 Gives crewkin less weakness to attacks, but weaker bones 2019-12-03 09:54:00 +10:00
Anewbe
a1e0aa8b90 Merge pull request #6539 from Mechoid/FixBioprinter
Fix the bioprinter
2019-11-29 19:51:23 -05:00
Heroman3003
4bef69e32a Adds black-eyed shadekin 2019-11-26 09:35:24 +10:00
Hawk_v3
bafec81a0a Merge Upstream 2019-11-22 23:40:13 +00:00
Unknown
04ec5cf365 Fixes robolimb/ear path problems 2019-11-22 07:56:05 -05:00
Novacat
99301d33c0 Merge pull request #6216 from NoctuaAngelis/master
Fix for tucker0666 fluff
2019-11-22 07:22:05 -05:00
NoctuaAngelis
d6607f3c4d Add files via upload 2019-11-22 04:04:17 -06:00
NoctuaAngelis
481028c64e Add files via upload 2019-11-22 03:58:33 -06:00
Novacat
9ac320a347 Merge pull request #6194 from Heroman3003/shadekin-mini-fix
Fixes minor issues with shadekin
2019-11-21 21:43:44 -05:00
Sara Elizabeth
f3a2a1700a Merge remote-tracking branch 'VOREStation/master' 2019-11-17 11:20:39 -06:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
NoctuaAngelis
14cf784d3b Add files via upload 2019-11-16 17:11:54 -06:00
Heroman
eeb121a9b1 Fixes minor issues with shadekin 2019-11-16 13:04:01 +10:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Heroman
991ab37daf Progress 2019-11-11 06:04:55 +10:00
Hawk_v3
f976948ce3 Merge remote-tracking branch 'upstream/master' 2019-11-07 19:54:10 +00:00
Atermonera
a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Mechoid
e1fa847bc2 Xenowork Prep For Future (#6491)
* Xenowork, weeds walls and material blobs.

* More weeds

* XenoUpdoots

* Stop that, me.
2019-11-04 21:38:02 -05:00
Schnayy
d4e38581cc Adds new FBP brand + sprite. (#6513) 2019-11-03 13:34:52 -05:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
Novacat
5e7735a807 Update brain.dm 2019-10-22 21:14:26 -04:00
Unknown
6333e7ab72 Ports Polaris #6492
Fixes a divide by zero issue with brain damage and pulse.
2019-10-22 21:13:25 -04:00
Novacat
173fd85764 Merge pull request #6086 from Verkister/werespecies
Adds werebeast event species
2019-10-21 21:02:53 -04:00
Verkister
47d56f13d1 Adds werebeast event species
-Adds new customizable carbonspecies for werebeast shenanigans.
-Stats-wise somewhat faster, tougher, and hungrier compared to base humans. Also darksight.
-Added whatever the code needed to make it possible to have taller carbonspecies.
-As a side effect, the forementioned also makes it possible to do long necked species and more.
-The werebeast can use the tail, hair, ear, and markings customization. This will be messy on tails that rely heavily on human silhouette. The hair and ear customization is fully functional using unedited human assets with a coded offset.
-The hair/ears offset is a modifiable var for the species specific head organ subtype, and can be used by other species that use custom headtypes.
-The werebeast has a set of markings as well, restricted to the species. face, belly, socks, and nose.

Currently the werebeast ready clothing is limited to:
-Back: basic backpack, basic satchel, leather satchel, basic courier bag, and basic duffle.
-Belt: toolbelt and security belt.
-Eyes: most sunglasses and sunglass huds, welding goggles, regular and 3d glasses, plain, meson, and science goggles.
-Feet: black and brown basic shoes, galoshes, jackboots, and toeless jackboots.
-Hands: latex/white, nitrile, yellow/insulated, black, and fingerless gloves.
-Head: the entire selection of vanilla headgear.
-Suit: labcoat, regular and white hazard vest, and 4 flavors of varsity jackets.
-Uniform: white pants, white shorts, white, orange, yellow, black, grey, robo, engie, and janitor jumpsuits, swept and nurse skirt.
Everything else will likely not show up at all, but more can be added whenever needed.
2019-10-20 18:45:29 +03:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Hawk_v3
0f3c802427 Merge remote-tracking branch 'upstream/master' 2019-08-22 21:32:01 +01:00
Novacat
2c4cd96be7 Merge pull request #5396 from KasparoVy/taur_hide_stuff
Allows Tails to Hide Bodyparts, Shoes & Clip Uniforms/Suits
2019-08-21 22:15:53 -04:00
Atermonera
65b6dc762c Merge pull request #6410 from Mechoid/PrometheanOrgans1
Promethean Organ Tweakening
2019-08-21 17:40:45 -04:00
KasparoVy
e762c191ea Adds Ability for Tails to Hide Bodyparts
Adds a method for tails to hide bodyparts like legs to allow for a bit more spriter freedom. Sets Satyr legs & taur bodies to prevent regular legs from rendering when selected.

E.g.1 The Satyr legs & taur bodies prevent the regular leg organs from rendering, so you no longer have to sprite them such that they cover the pixels ordinary legs would've occupied.

E.g.2 The deer body has bulky front legs because if they weren't sprited to cover the regular body beneath you'd have wierd pixels poking out. This prevents that from happening by preventing legs from rendering when you got a taur tail.
2019-08-20 01:45:46 -04:00
DameonOwen
d1d42af439 One last change to the path 2019-08-17 08:35:20 -04:00
DameonOwen
e04724bdea I'm tired, okay? 2019-08-16 23:12:51 -04:00
DameonOwen
5eedd046a3 Port limbs, wings from Aphrodite 2019-08-16 23:09:32 -04:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
Andrew
e4deaa6478 Combat Mechs Can Punch More Things (#6303)
* Combat Mechs Can Punch More Things

Removes the var to check for the 5 things it can attack, instead it can punch anything (but not everything will take damage).

Gives punching objects a check so you don't accidently smash something without meaning to.

Gives closets and canisters a proc to take_damage so they'll actually get smashed by the mechs.

* Take_Damage Boogaloo

* More take_damage Stuff

Adds click delay on attacking barriers.
Proper noises when attacking material doors and barricades.

More stuff can be broken by mech punch and simple mobs.

* Adds changelong

* usr to user
2019-07-24 17:00:24 -04:00
Hawk_v3
bc7ea8379a Merge remote-tracking branch 'upstream/master' 2019-07-02 17:54:29 +01:00
Atermonera
9a994e4e16 Merge pull request #6226 from SubberTheFabulous/MonitorFix
Makes some alt. roboheads actually use their monitors
2019-06-24 15:24:23 -04:00
Hawk_v3
5ec6b3294e Merge remote-tracking branch 'upstream/master' 2019-06-18 01:26:30 +01:00