Commit Graph

712 Commits

Author SHA1 Message Date
Repede
9c61982751 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
# Conflicts:
#	code/game/machinery/vending_yw.dm
#	icons/vore/custom_clothes_yw.dmi
#	vorestation.dme
2019-11-29 19:13:53 -05:00
Luke Vale
a3aa3f252e Adds in GeneShadekins. A form of shadekin without their powers. 2019-11-25 22:02:12 -06:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
Heroman3003
62889c39d9 Removes deprecated code 2019-11-15 08:38:53 +10:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
RadiantFlash7
d57a9847c6 Disposals, snow, power, exploration
Exploration WIP
Fixes trail blazers
Finishes up disposals
Fixes power lines being wrong directional via sprite.
Fixes areas, and snow tiles to be simulated and outdoors.
fixes merge conflict as well.
2019-10-27 15:07:48 -04:00
RadiantFlash7
86e4d8a316 Revert "Revert "Revert "Disposals, exploration, snow fixes"""
This reverts commit ad78add3d0.
2019-10-27 14:00:53 -04:00
RadiantFlash7
ad78add3d0 Revert "Revert "Disposals, exploration, snow fixes""
This reverts commit 0f66788181.
2019-10-27 13:57:41 -04:00
RadiantFlash7
0f66788181 Revert "Disposals, exploration, snow fixes"
This reverts commit 16e7b75d0b.
2019-10-27 13:56:35 -04:00
RadiantFlash7
16e7b75d0b Disposals, exploration, snow fixes
Exploration WIP
Fixes trail blazers
Finishes up disposals
Fixes power lines being wrong directional via sprite.
Fixes areas, and snow tiles to be simulated and outdoors.
2019-10-27 13:19:06 -04:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01: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
Poojawa
f718201974 Adds Sound Code and toggles 2019-10-13 02:05:16 -05:00
Hawk_v3
2cc8800ede Merge remote-tracking branch 'upstream/master' 2019-10-08 15:14:36 +01:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Hawk_v3
691a1239f4 Merge from Vorestation 2019-09-29 21:53:09 +01:00
Hawk_v3
b22f2284fe Merge remote-tracking branch 'upstream/master' 2019-09-23 20:55:18 +01:00
Unknown
e4f1cdf3b5 Thickbelly Functionality
In theory, supposed to blind, and force the inhabitant to whisper. Still WIP. I would like to, instead of blind, reduce visual sight to 1 tile, so that actions are not affected.
2019-09-22 14:50:28 -04:00
Unknown
10f290106c Ports pan-slavic from Baystation 2019-09-18 15:57:30 -04:00
Hawk_v3
0f3c802427 Merge remote-tracking branch 'upstream/master' 2019-08-22 21:32:01 +01:00
Novacat
775d175b11 Merge pull request #5682 from VOREStation/upstream-merge-6358
[MIRROR] Exploration Expansion 1: Or, How I Learned To Love The Tree
2019-08-21 18:02:59 -04:00
Atermonera
65b6dc762c Merge pull request #6410 from Mechoid/PrometheanOrgans1
Promethean Organ Tweakening
2019-08-21 17:40:45 -04:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
Heroman
687fd0fc75 Allows players to select, customize and save whitelisted characters without whitelist 2019-08-03 06:59:00 +10:00
Hawk_v3
4668b23fea Merge remote-tracking branch 'upstream/master' 2019-07-10 01:50:50 +01:00
Heroman
37ee44bb55 Updates Tether camera networks 2019-07-10 05:28:48 +10:00
Heroman3003
ca13a8872c MC camera and access fixes and adjustments (#6269)
* Adjusts MC camera program, fixes ID program

* Fixes oversight with network access
2019-07-09 14:01:53 -04:00
Hawk_v3
124afe1cbc Merge remote-tracking branch 'upstream/master' 2019-07-07 18:41:28 +01:00
Spades
f12786365b Merge pull request #5368 from Heroman3003/filling-up-debris-field
Adds a bunch of PoIs to debris field
2019-07-05 07:03:18 -04:00
Hawk_v3
bc7ea8379a Merge remote-tracking branch 'upstream/master' 2019-07-02 17:54:29 +01:00
Heroman
2b16679f78 Updates lighting to match new numbers 2019-07-02 11:28:09 +10:00
Heroman
27f2a555a5 Increases edge buffer, fixes active edges 2019-06-25 15:52:42 +10:00
Heroman
f020cee3a6 Final touches 2019-06-25 14:42:36 +10:00
Anewbe
d017075732 Merge pull request #6219 from Mechoid/Event_Retweakening
Tweaks the NewTM event system further
2019-06-19 23:34:26 -04:00
Novacat
03a3944f36 An assortment of Lighting Stuff 2019-06-18 19:57:40 -04:00
Hawk_v3
5ec6b3294e Merge remote-tracking branch 'upstream/master' 2019-06-18 01:26:30 +01:00
Anewbe
50ff14f8f8 Merge pull request #6079 from Mechoid/AugmentPreWork
Augment Work
2019-06-16 20:58:32 -04:00
Hawk_v3
7bb9c92c9a Merge remote-tracking branch 'upstream/master' 2019-06-03 12:31:48 +01:00
Neerti
f5f20628fd Merge pull request #6169 from GeneriedJenelle/patch-1
Ports Radial Menus
2019-05-28 14:25:49 -04:00
Unknown
04341df092 Timer SS Fix Part two
Update of Polaris PR
2019-05-27 01:02:39 -04:00
Unknown
d13e8ee784 Critical Fixes
- Fixes HREF Exploit
- Replaces Timer Subsystem with a Bay port in a desperate attempt to fix the timer SS crashes
- Port of https://github.com/PolarisSS13/Polaris/pull/6180 and https://github.com/PolarisSS13/Polaris/pull/6178
- Fixes #5272
2019-05-26 23:58:56 -04: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
Heroman
f688ef9c37 Fixes the generation of PoIs 2019-05-07 05:20:36 +10:00
Hawk_v3
27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Heroman
b17718ea6c Implements selection of whitelisted species 2019-04-28 17:45:44 +10:00