Commit Graph

1087 Commits

Author SHA1 Message Date
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
Killian
dcd691245c feex title 2020-02-17 10:35:55 +00:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Leshana
fffd922cde Fix character setup preview icons rendering prior to SSAtoms initialization
- Rendering the characters involved creating mannequin mobs, prior to SSAtoms init these would not be initialized and thus have no DNA.  This prints many warning messages, causes runtimes, and ultimately the icon does not render correctly.
- Its fixed here since it seems that needing to use mobs prior to initialization is a pretty unique edge case.  Comment added to explain to future us.
2020-02-04 16:33:22 -05:00
Hawk_v3
a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00:00
Atermonera
d6b16dd09e Merge pull request #6585 from Verkister/patch-31
Fixes gentle hairstyle missing
2019-12-25 18:10:05 -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
8bdc4df281 Merge pull request #6561 from Schnayy/hairtie_fix
Gives appropriate hairstyles the hair_tieable flag.
2019-12-15 14:43:53 -05:00
Unknown
5705f65444 Post-patch Bug Fixes
- Rana Starsong-Uma's fluff item is keyed to the right character
- Fixes an error where a Vorestation hair style was overriding a Polaris one
2019-12-10 00:05:21 -05:00
Novacat
1814dda55b Merge pull request #6279 from VOREStation/upstream-merge-6541
[MIRROR] Adds Teshari Underfluff marking
2019-12-09 09:27:26 -05:00
Unknown
8a11325fda Removes duplicate 2019-12-09 09:07:11 -05:00
listerla
fad12cddfa Ports a ton of hair (#6549) 2019-12-08 17:41:20 -05:00
listerla
a099218780 Adds Teshari Underfluff (#6541) 2019-12-08 17:36:46 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Luke Vale
d8d92ed78b Adds in the //YW edits to the VR files 2019-11-25 22:10:56 -06:00
Luke Vale
a3aa3f252e Adds in GeneShadekins. A form of shadekin without their powers. 2019-11-25 22:02:12 -06:00
Heroman3003
4bef69e32a Adds black-eyed shadekin 2019-11-26 09:35:24 +10:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Sk1Tz
3ba8cf4403 Added neckfluff for facial hair option 2019-11-14 21:13:42 -05:00
Heroman3003
ab603cffa4 Finishes up the main shadekin features 2019-11-15 11:13:31 +10: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
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01: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
Hawk_v3
9e88f55480 Merge remote-tracking branch 'upstream/release' 2019-09-16 14:57:39 +01:00
Heroman
c92960feca Some post-release fixes 2019-09-15 06:27:32 +10:00
Hawk_v3
a333c03a3c Merge remote-tracking branch 'upstream/release' 2019-09-14 17:10:36 +01:00
Novacat
2d8376a2fa Update new_player.dm 2019-09-10 02:20:48 -04:00
Unknown
c8d445d4d9 Miscellaneous Fixes
- Reverts #4785. It never functioned in its intended purpose, and mostly just seemed to affect people who had the same names.
2019-09-10 02:19:06 -04:00
Hawk_v3
6d4ec50e08 Merge remote-tracking branch 'upstream/master' 2019-09-01 19:02:01 +01:00
Rykka_Stormheart
116f532169 Several mice tweaks, mainly:
Uncommented out the mice pull_size and mob_pull - this fixes mice pulling lockers and shit.
Reduced mouse spawn time by half, since mice are nerfed now to not be able to pull large shit. (As they shouldn't be able to.)
Merged/incorporated file from https://github.com/VOREStation/VOREStation/pull/5709 - his was simple_animal, I moved it to simple_mob. All credits for changes in mouse_vr.dm go to them.

Small Fixes:
Added a little extra comment to the mice examine text. <3
Fixed the "Observe" Spawn timer - it originally said 5 minutes, fixed it to show the "actual" respawn time - 60 seconds.
2019-08-25 00:15:33 -06:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
Spades
70072ca29c Merge pull request #5561 from TheFurryFeline/TFF-Reminder_For_Suit_Sensors!
Suit Sensors Selectable
2019-08-05 18:56:01 -04:00
TheFurryFeline
2877917f3a Suit Sensors Selectable
Allows selection of suit sensor settings in VORE tab on Character Setup. Work credited to https://github.com/PolarisSS13/Polaris/pull/4354 Adjustments made as needed to account for outdated code as well as making use of preferences_vr at last.
2019-08-05 17:49:49 -04:00
Heroman
687fd0fc75 Allows players to select, customize and save whitelisted characters without whitelist 2019-08-03 06:59:00 +10:00
Hawk_v3
124afe1cbc Merge remote-tracking branch 'upstream/master' 2019-07-07 18:41:28 +01:00
Heroman
c1cef80bf9 Changes lobby screen name to match server name 2019-07-06 06:34:15 +10:00
Hawk_v3
3aa4e406f9 Merge remote-tracking branch 'upstream/master' 2019-05-15 14:46:50 +01:00
Heroman3003
6f80f45eed Ports character setup subsystem 2019-05-14 11:48:34 +10:00
Hawk_v3
9b0186a2c1 Merge remote-tracking branch 'upstream/master' 2019-05-09 23:11:58 +01:00
Heroman
ad21685c86 Adds astolfo hairstyle 2019-05-09 07:47:32 +10:00
Hawk_v3
27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01:00
Heroman
ff9e4f2e4a Makes Flavor Text properly required for joining 2019-05-02 14:40:13 +10:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Unknown
bcbeb0cf0d Rosettes Part two 2019-04-10 19:38:07 -04:00
Unknown
5e9ac3f00d Rosettes, radiopack sprites
- Adds Rosettes and Colorable Rosettes
- Adds on mob sprite for the subspace radio
2019-04-08 14:07:24 -04:00