Kelshark
33d109b2dd
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
2017-11-25 11:35:10 -05:00
mistyLuminescence
1f84c0c8ee
Drinking changes
2017-11-24 00:59:45 +00:00
Anewbe
0e726d595e
Removes synthblood from the surgeon borg
2017-11-23 01:46:54 -06:00
Anewbe
ec59a15bdf
Creates synthblood reagent, adds it to surgeon borg hyposprays
2017-11-22 17:44:01 -06:00
killer653
70e53b96bb
Polaris Sync
2017-11-10 11:37:41 -05:00
Kelshark
8b32b39c6f
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
2017-11-07 08:17:53 -05:00
killer653
11c195debb
Polaris Sync
2017-11-04 13:37:13 -04:00
mistyLuminescence
41f332df42
fuck this pr PART TWO
2017-11-04 00:00:07 +00:00
mistyLuminescence
a0c5ecb8d5
UPDATES IT FOR REAL THIS TIME
2017-11-03 23:29:14 +00:00
Wickedtemp
a3ba6ff5d9
Update hypospray.dm
2017-10-31 20:52:02 -05:00
Kelshark
92980edc93
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/jobs/job/science.dm
# code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
# code/modules/mob/living/carbon/human/species/station/seromi.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# config/custom_items.txt
2017-10-29 18:14:56 -04:00
killer653
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
Cameron653
9eac4c3996
Update blood_pack_vr.dm
2017-10-26 23:49:25 -04:00
Cameron653
0a046e364a
Makes bloodbags have 10 uses.
2017-10-26 23:13:02 -04:00
Anewbe
7a36a8cfb6
Merge pull request #4118 from mistyLuminescence/cryostorage
...
Reworks cryopod storage
2017-10-22 19:03:07 -05:00
Anewbe
6a52111680
Merge pull request #4116 from Neerti/10/20/2017_syndie_borgs_are_back
...
Syndicate Borgs II, Return of the Salt
2017-10-21 13:58:52 -05:00
Neerti
083369c614
Update borghydro.dm
2017-10-21 10:42:53 -04:00
Cameron653
25ae5840e4
Lets blood bags be drank in increments
2017-10-20 17:16:22 -04:00
mistyLuminescence
ae308a3a91
Reworks cryopod storage
2017-10-20 19:14:45 +01:00
Anewbe
52cbe08c76
Should be able to transfer reagents between glasses again
2017-10-20 12:56:07 -05:00
Neerti
1aff3fc8c0
Syndicate Borgs II, Return of the Salt
...
Adds an option in mercenary uplinks to purchase three different 'classes' of drones.
See PR for more details.
2017-10-20 13:01:45 -04:00
Kelshark
3ab70b7996
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/objects/items/weapons/tools.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# config/custom_items.txt
# vorestation.dme
2017-10-17 08:49:37 -04:00
killer653
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
Ansari
768dc2d7c0
Port over Chemistry bag from Paradise ( #4067 )
...
* Add in chemistry bag from Paradise, based on /tg/ bag. Add it to biogenerator. Add it to wardrobe.
* Make itemsize large so it cannot be put in backpack. Slowdown = 1.
2017-10-15 15:04:56 -05:00
elgeonmb
251f5a4139
Adds drink fluff; fixes drink descriptions ( #4038 )
...
* It's not all Morpheus this time (#1 )
* drink fluff
* changes drink descriptions to suck less
* Update containers.dm
* Update bottle.dm
2017-10-12 23:01:24 -05:00
Cameron Lennox
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
Kelshark
9e4136784d
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
# config/jobwhitelist.txt
# icons/mob/species/akula/mask_vr.dmi
# icons/mob/species/fennec/mask_vr.dmi
# icons/mob/species/fox/mask_vr.dmi
# icons/mob/species/nevrean/mask_vr.dmi
# icons/mob/species/vulpkanin/mask.dmi
# icons/mob/vore/taurs_vr.dmi
2017-10-03 19:04:51 -04:00
elgeonmb
e5474c2dc1
Food fluff ( #4008 )
...
* food fluff
* Update polaris.dme
* what the hell is Jargon 4
* screeching
* somehow that last one broke something
* how can I not spell vacuum
2017-10-02 19:59:00 -05:00
Ketrai
12ea8d0d8d
updates grub-food
...
Makes it so you can slice the bugball food item as intended, so you can decontaminate it before serving.
(previously the bugball had to be decontaminated, bitten open, then decontaminated again to avoid poison)
2017-10-01 13:20:10 +02:00
killer653
da09bbdc17
Suck Ze Bloodbags
2017-09-29 23:30:29 -04:00
MisterLayne
dde6d7d00a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/26/2017_Synthetic_Syring_Fix
2017-09-26 17:30:30 -04:00
MisterLayne
99d68540bc
Fixes Glitched Synthetic Syring
2017-09-26 17:12:47 -04:00
Anewbe
7c9813e24a
Fixes a runtime
2017-09-25 23:42:25 -05:00
Anewbe
6067afe64c
Merge pull request #3824 from Cameron653/DRINK_SPILLING
...
Allows the dumping of drinks & beaker spill tweak
2017-09-25 14:51:52 -05:00
Ketrai
e79f1f6534
fixes smol bug
2017-09-24 18:39:44 +02:00
Kelshark
457ff1356a
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/reagents/reagent_containers/food/snacks.dm
# code/modules/vore/resizing/resize_vr.dm
# config/custom_items.txt
2017-09-23 11:40:55 -04:00
Anewbe
c80b535a29
Merge pull request #3902 from Neerti/9/19/2017_lost_drone
...
Adds the Lost Drone
2017-09-22 15:24:05 -05:00
Anewbe
40075a319a
Merge pull request #3806 from ghost/woodbuck
...
Adds wooden buckets, craftable with botany.
2017-09-22 12:20:29 -05:00
Neerti
afd7b15442
Adds the Lost Drone
2017-09-22 01:17:53 -04:00
killer653
2755d3ddb1
HOTFIX
2017-09-21 20:26:48 -04:00
Kelshark
c91dbd0057
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
2017-09-21 18:37:11 -04:00
Anewbe
61936496b1
Merge pull request #3813 from Belsima/clickityclack
...
Adds a metric assload of sounds.
2017-09-20 22:20:17 -05:00
Anewbe
79581c5341
Merge pull request #3877 from Neerti/9/17/2017_trash_pile_port
...
Ports Trashpiles
2017-09-19 01:26:20 -05:00
Neerti
1c264176d9
Ports Trashpiles
...
Mostly ports Vore's Trashpile code, and made more generic, as I plan to use these for surface loot later.
Adds mold reagent to give a consequence to eating food you found in the garbage.
These aren't mapped in but I or someone else can do that later.
2017-09-18 06:34:10 -04:00
PrismaticGynoid
2a866c4924
Fixes for nettles ( #3854 )
...
* Fixes for nettles
Nettle plants can now spawn randomly from weeds - it was trying to spawn 'nettles', but the name of the plant is 'nettle', so it never spawned. Now it can.
You now hit people with food if you use it on harm intent. This is mostly so that you can use nettles as a weapon again, but hey, who wouldn't want to hit people over the head with a baguette.
Nettles and other stinging "fruits" can no longer be used to generate infinite chemicals by throwing them. Chemicals that the "fruits" inject are now properly removed when hitting a target.
* Fixes for nettles
Nettle plants can now spawn randomly from weeds - it was trying to spawn 'nettles', but the name of the plant is 'nettle', so it never spawned. Now it can.
You now hit people with food if you use it on harm intent. This is mostly so that you can use nettles as a weapon again, but hey, who wouldn't want to hit people over the head with a baguette.
Nettles and other stinging "fruits" can no longer be used to generate infinite chemicals by throwing them. Chemicals that the "fruits" inject are now properly removed when hitting a target.
2017-09-17 23:45:29 -05:00
killer653
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
killer653
5d3a64f74c
Makes beakers require harm intent to splash/spill
2017-09-13 03:25:22 -04:00
killer653
2fa9a55360
Puts in a check so you don't drink & splash
2017-09-12 23:26:39 -04:00
killer653
577bc7f1d9
Allows dumping the contents out of bar glasses
2017-09-12 22:25:42 -04:00
Ketrai
ab5aee8473
adds 2 more dishes
2017-09-11 19:18:09 +02:00
