Hawk_v3
bafec81a0a
Merge Upstream
2019-11-22 23:40:13 +00:00
Atermonera
19d4bde603
Merge pull request #6528 from Meghan-Rossi/atmosanalyzer
...
Improve analyzers and gas mixers
2019-11-19 14:31:00 -05: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
Heroman3003
62889c39d9
Removes deprecated code
2019-11-15 08:38:53 +10:00
Meghan-Rossi
a09456b541
Adds a way to set the tag of loadout collars as part of the loadout
2019-11-13 03:42:03 +00: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
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
Poojawa
f718201974
Adds Sound Code and toggles
2019-10-13 02:05:16 -05:00
Hawk_v3
691a1239f4
Merge from Vorestation
2019-09-29 21:53:09 +01:00
Novacat
7009fc0453
Update logging.dm
2019-09-28 03:42:41 -04:00
GeneriedJenelle
3622a2fd2a
Ports World Server Dialogue/Attack Log Viewer
2019-09-28 03:38:06 -04:00
Hawk_v3
ac61a5cc37
Merge remote-tracking branch 'upstream/master'
2019-09-19 19:54:34 +01:00
TheFurryFeline
f1ba4aca5e
Nom the Communicators!
...
Making a call with your friend? Want to give them a good view of what you can do to them? Here ya go~! Also includes commwatches by default since they're a child of the device/communicator. :3 Ports https://github.com/CHOMPstation/CHOMPstation/pull/798 because I rather like it. Would be interesting when used for scenes or tempting partners into a future scene.
2019-09-19 03:58:43 -04:00
Hawk_v3
0f3c802427
Merge remote-tracking branch 'upstream/master'
2019-08-22 21:32:01 +01:00
KasparoVy
d9b1e02405
Tails/Taurs Hide Shoes & Clip Uniforms/Suits
...
Hides shoes when the goat legs or taur bodies are selected.
Adds a method by which you can clip off parts of sprites, ported from Para.
Sets goat legs & taur bodies to clip off the lower parts of uniforms and suits
so long as the clothing doesn't hide tails or is a taur suit.
2019-08-20 01:56:08 -04: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
c82722cdbf
Ports fixes from Polaris early
2019-07-30 05:23:32 +10:00
Hawk_v3
8654b6bdf4
Merge remote-tracking branch 'upstream/master'
2019-07-19 22:05:31 +01:00
Novacat
ea05ba7d02
Merge pull request #5454 from TheFurryFeline/TFF-Nomming_Collars
...
Edible Collars
2019-07-17 17:36:11 -04:00
Atermonera
9325f590ca
Mining Expansion, the Diggening.
2019-07-13 03:48:38 -04:00
TheFurryFeline
ca01048bab
Edible Collars
...
Allows those with Trash Can trait to nom on someone's collar. Also adds in a custom flavour message.
2019-07-10 13:43:29 -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
Hawk_v3
27e73883fc
Merge remote-tracking branch 'upstream/release'
2019-05-04 21:03:48 +01:00
Unknown
808e64c3bb
Ports https://github.com/PolarisSS13/Polaris/pull/6146
2019-05-01 20:50:31 -04: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
Heroman3003
1290db61f8
Initial commit
2019-04-26 11:19:53 +10:00
Hawk_v3
50e2482613
Merge remote-tracking branch 'upstream/master'
2019-04-22 20:12:14 +01:00
Neerti
3f7d2a0450
Fixes fireaxe cabinets
2019-04-16 22:00:42 -04:00
Hawk_v3
41f0bd9f6d
Merge remote-tracking branch 'upstream/master'
2019-04-14 19:44:13 +01:00
Spades
16ee6b9221
Merge pull request #4897 from Heroman3003/bone-zone
...
Added a remains option for digesty vore
2019-04-12 09:11:04 -04:00
Novacat
466516b066
Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"
2019-04-08 15:24:27 -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
Novacat
f73a757152
Merge pull request #4924 from VOREStation/upstream-merge-6025
...
[MIRROR] Replaces AI-controlled Maint Drones with AI-controlled Borg Shells
2019-04-06 14:56:27 -04:00
Unknown
c4860391b6
Conflict Resolution
2019-04-06 14:47:21 -04:00
Unknown
0482da8c52
Ports two polaris bugfix PRs early
2019-04-06 12:21:24 -04:00
Neerti
1d59d8683c
Replaces AI-controlled Maint Drones with AI-controlled Borg Shells
2019-04-06 05:07:05 -04:00
Heroman
b11015107c
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
Heroman3003
82ed5a8fe1
Made gurgle bones digestible and trash-edible
2019-04-02 08:42:07 +10:00
Heroman3003
c1d356fe8b
Added a remains option to digesty vore
2019-04-01 12:28:02 +10:00
Neerti
f8c9664178
Explorer Update - Cataloguers
2019-03-30 16:19:24 -04:00
Novacat
6729bfb147
Merge pull request #4858 from Heroman3003/uncontamine
...
Added ability to toggle and configure contamination and item digestion
2019-03-28 22:12:38 -04:00
Novacat
bada08276f
Merge branch 'master' into upstream-merge-5959
2019-03-28 20:30:41 -04:00
Unknown
a4373601f0
Fixes Merge Errors
2019-03-28 13:53:03 -04:00
