Razgriz
3009bade9e
Remove sleeving cure
...
Removing resleeving sickness
2020-01-13 18:49:46 -07:00
Hawk_v3
6dcf1520b4
Let's get this wrapped up and ready to go.
...
Removed all KHI references, and the Vore AI Law stuff.
2020-01-13 19:38:10 +00:00
Hawk_v3
20596d9787
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
Heroman
a9c1f48a93
Adds a single cure pill to vault, doubles amount ERT gets, changes taste
2020-01-10 09:31:51 +10:00
Heroman
9490261230
Adds Kitsuhanan Cure for resleeving sickness
2020-01-06 07:15:13 +10:00
Hawk_v3
a48b6f7cb2
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
Cerebulon
183b1d99b1
Coffee Shop Revamp
2019-12-22 22:54:01 -05:00
Hawk_v3
5b13642c12
Merge remote-tracking branch 'upstream/master'
2019-12-08 18:15:35 +00:00
Mechoid
99bc3dcdbc
Security / PseudoCargo Expansion
2019-11-24 17:23:48 -05:00
Hawk_v3
bafec81a0a
Merge Upstream
2019-11-22 23:40:13 +00:00
Unknown
a788cad3d9
Nerfs Chemistry Bag Toting
...
Chemistry bags can no longer be carried around in the belt slot, considering the number of chems they can carry they are probably a bit too large for that.
2019-11-17 15:55:19 -05:00
Hawk_v3
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00:00
Meghan-Rossi
f8c214ea67
Fix box of service keys being called "box of command keys"
2019-11-12 08:55:43 +00:00
Hawk_v3
c95a447b71
Merge remote-tracking branch 'upstream/master'
2019-10-27 17:58:34 +00:00
Cerebulon
6385a2f662
ERT Rangers Costumes ( #6493 )
...
* Sprites
* and code fuckit
2019-10-25 15:07:49 -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
Repede
e7a5341f2d
Adds f13 (Mauser) brand cigarettes to game vending machines.
2019-10-17 19:09:57 -04:00
Hawk_v3
a333c03a3c
Merge remote-tracking branch 'upstream/release'
2019-09-14 17:10:36 +01:00
Novacat
ab256b75b3
Merge pull request #5846 from Novacat/nova-basicfixes
...
Shelter Capsule Improvements
2019-09-14 00:38:45 -04:00
Unknown
5e2abf9fd4
This is becoming a shelter capsule PR
2019-09-12 22:50:03 -04:00
Unknown
a94aaac8fb
More tweaks
2019-09-09 23:37:41 -04:00
Hawk_v3
6d4ec50e08
Merge remote-tracking branch 'upstream/master'
2019-09-01 19:02:01 +01:00
Unknown
0d73c8ad76
Early Polaris Ports
...
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434
No vorestation edit markings because they are polariscode ports.
2019-08-30 23:55:58 -04:00
Hawk_v3
b6ebecf7ec
Merge remote-tracking branch 'upstream/master'
2019-08-30 21:38:17 +01:00
Unknown
14eb525030
Adjusts Vorestation pills and pillbottles
2019-08-28 04:06:19 -04:00
Hawk_v3
bc7ea8379a
Merge remote-tracking branch 'upstream/master'
2019-07-02 17:54:29 +01:00
mistyLuminescence
c406672c26
Adds two new Cargo crates!
2019-06-29 19:46:41 -04:00
Hawk_v3
5ec6b3294e
Merge remote-tracking branch 'upstream/master'
2019-06-18 01:26:30 +01:00
Novacat
13739440c2
Grey scale pills and colored pillbottles
2019-06-16 21:28:56 -04:00
Hawk_v3
129ac045e7
Merge remote-tracking branch 'upstream/master'
2019-06-12 18:47:10 +01:00
Neerti
21244ade2f
Merge pull request #6204 from Ketrai/worms
...
Adds worms
2019-06-11 17:35:11 -04:00
Hawk_v3
7bb9c92c9a
Merge remote-tracking branch 'upstream/master'
2019-06-03 12:31:48 +01:00
Atermonera
ef4c7b6601
Merge pull request #6172 from mistyLuminescence/contacts
...
Makeover Kit
2019-05-28 13:10:09 -04:00
Hawk_v3
c2d90f5c3f
Merge remote-tracking branch 'upstream/master'
2019-05-23 22:46:42 +01:00
Neerti
5ed3916de3
Merge pull request #6166 from Sebbe9123/fixholoprojectors
...
Lets sec people carry holoprojectors in their belts
2019-05-20 18:43:52 -04:00
Hawk_v3
27e73883fc
Merge remote-tracking branch 'upstream/release'
2019-05-04 21:03:48 +01:00
Unknown
07b866b2f8
Last Second Tweaks
...
- Swaps trash pile money breifcase with something more balanced.
- Adds emergency softsuit box to luxury capsules.
2019-05-03 16:32:21 -04:00
Unknown
27565f4da9
Boxed emergency suits
2019-05-03 03:06:00 -04:00
Unknown
68649aeb71
Recommended changes
2019-05-02 17:38:26 -04:00
Unknown
1b1489d8cc
Adds medicíne pills/bottles for adminbus
2019-05-02 17:08:39 -04:00
Hawk_v3
50e2482613
Merge remote-tracking branch 'upstream/master'
2019-04-22 20:12:14 +01:00
Heroman
727ecd39a8
Removes glucose autoinjectors from vendomats
2019-04-21 16:06:49 +10:00
Atermonera
2869ad6f73
Merge pull request #6106 from chaoko99/Pullbox
...
ore bags will now automatically pick up ore and dump them into a box if one is being pulled.
2019-04-18 13:19:50 -04:00
Repede
e4dd365fe1
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/controllers/subsystems/mapping_vr.dm
# code/datums/datum.dm
# code/datums/datumvars.dm
# code/datums/supplypacks/voidsuits.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/defib.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/world.dm
# code/modules/client/preference_setup/loadout/loadout_accessories.dm
# code/modules/client/preference_setup/loadout/loadout_eyes.dm
# code/modules/client/preference_setup/loadout/loadout_head.dm
# code/modules/client/preference_setup/loadout/loadout_suit.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/food/food/snacks.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/reagents/Chemistry-Recipes.dm
# code/world.dm
# config/custom_items.txt
# config/example/config.txt
# config/example/game_options.txt
# icons/mob/robots.dmi
# icons/obj/mining.dmi
# maps/submaps/surface_submaps/wilderness/wilderness.dm
# vorestation.dme
2019-04-07 19:40:12 -04:00
Unknown
7ecddb11de
Service Keys Too
2019-04-03 15:11:06 -04:00
Unknown
2a100c5cb1
Command key box
2019-04-03 15:11:06 -04:00
Unknown
5ce5403b17
Apparently it exists and is in the wrong dmi
2019-03-30 00:52:46 -04:00
