Commit Graph

263 Commits

Author SHA1 Message Date
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
2020-05-06 21:53:03 +02:00
Steven Storesund
868d412d19 Aurora's floof, I mean fluff item 2020-05-03 19:44:13 -05:00
serenekerosene
9394d6561b Update custom_items_vr.dm 2020-04-30 21:39:26 -04:00
serenekerosene
b693f8e06c Scylla Fluff Item
I hope I did this right!!!!!!!! TY to Amaya for the guide

Fluff application was approved here: https://forum.vore-station.net/viewtopic.php?f=26&t=1744
2020-04-30 20:24:25 -04:00
Aronai Sieyes
351b3522bd Merge pull request #7534 from VOREStation/aro-moverework
Rewrite client/Move() for smoother movement ingame
2020-04-30 18:03:52 -04:00
Aronai Sieyes
1688e16d88 VS: Get your clicks out of my movement code 2020-04-30 15:41:26 -04:00
H0lySquirr3l
6691339d04 Add files via upload 2020-04-30 09:03:26 -05:00
Amaya
165931c96a aaaaaaaa 2020-04-29 17:10:07 +02:00
Amaya
c04d919051 *scream 2020-04-29 17:02:12 +02:00
C.L
3fc0f548f4 Well that was embarrasing
Got rid of "desc =" from the description.
2020-04-26 14:11:35 -04:00
Cameron653
1e29d2a734 Fixes & Changes Silencedmp5a5's fluff items. 2020-04-26 13:59:58 -04:00
Killian
65ca7b651b forgot to change the var on the debug/test kit 2020-04-10 16:11:13 +01:00
Killian
3d2f5337b8 Update custom_items_vr.dm 2020-04-10 16:06:44 +01:00
Killian
533dfe61bb WIP upgrade with proper casting 2020-04-09 21:38:33 +01:00
Killian
fd61ada76e conversion kit overhaul 2020-04-02 21:21:47 +01:00
Killian
6f20851b86 Update custom_items_vr.dm 2020-04-02 06:38:15 +01:00
Killian
1726b93739 messy update to kit logic 2020-04-02 03:51:09 +01:00
Killian
e2b32a1c15 update transfer behaviour, nonintrusive adjustments to gun spawning 2020-04-02 02:39:51 +01:00
Killian
65f36adbf1 Update custom_items_vr.dm 2020-04-02 02:05:41 +01:00
Killian
01498d023e modkit forensics and new checks 2020-04-02 01:52:08 +01:00
Killian
7732f38d2c conversion kit sanity checks 2020-04-01 13:44:57 +01:00
Killian
97cd4f349f conversion kit rejigger 2020-04-01 05:36:39 +01:00
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
Arokha Sieyes
74c6f7c1e7 Rename "Aronai Kadigan" -> "Aronai Sieyes" 2020-02-14 11:06:04 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Novacat
e5c7d83aba Merge pull request #6222 from Novacat/nova-pathfinder
Centcom/Tether Ship Changes
2019-12-06 16:06:56 -05:00
Unknown
aa25f5ebbd More Updates 2019-11-27 15:50:54 -05:00
Heroman
fb6f43d3e2 Moves Tempest's sirenbags to soundloop system 2019-11-24 17:13:39 +10:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
TheFurryFeline
aaa40000d0 Mouse Plushie Sprite Change
Title, changes a custom item's sprite to look more alive... Sorta.... Just doesn't make it look like it's a hecking dead mouse. Ported from https://github.com/CHOMPstation/CHOMPstation/pull/824
2019-11-12 10:34:24 -05:00
Hawk_v3
691a1239f4 Merge from Vorestation 2019-09-29 21:53:09 +01:00
Novacat
5139e5d56c Update custom_items_vr.dm 2019-09-26 01:14:31 -04:00
Unknown
050b04ecd6 Adds Alien Translocator 2019-09-25 01:36:23 -04:00
Cebutris
61cc46d6d9 delete-khi-again 2019-09-17 12:16:21 -04:00
Hawk_v3
a333c03a3c Merge remote-tracking branch 'upstream/release' 2019-09-14 17:10:36 +01:00
Mewchild
e77a66dcc3 Refactors Fluff Items, moves them to be loadout options 2019-09-10 04:59:10 -05:00
Hawk_v3
6d4ec50e08 Merge remote-tracking branch 'upstream/master' 2019-09-01 19:02:01 +01:00
Unknown
1607c10755 Suggested Changes 2019-08-29 04:04:32 -04:00
Unknown
9390884ca7 Buffs Mini Translocator
- Removes Z level restriction on mini translocator
- Decreases charge cost of mini translocator from 2400 to 480
- Mini Translocator starts with a device cell instead of a weapon cell
- Removes illegal tech level from Mini translocators

The overall effect is that mini translocators still start off with one charge and one beacon, but can now be used across z levels. Mini translocators can also be equipped with a weapon cell that gives them five charges instead of one.
2019-08-29 00:20:02 -04:00
Hawk_v3
0f3c802427 Merge remote-tracking branch 'upstream/master' 2019-08-22 21:32:01 +01:00
CRTXBacon
1b368e978d Update custom_items_vr.dm 2019-08-20 00:11:26 +01:00
Hawk_v3
c7b05c05fb Merge remote-tracking branch 'upstream/master' 2019-06-11 02:34:25 +01:00
Heroman
dea577a951 Updates fluff item lists 2019-06-09 15:40:38 +10:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Unknown
7dcbc669a2 Fixes Evian's Egg Implant
It was in a different part of the file so I missed it.
2019-04-12 23:22:28 -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
a6732daecc Fixes egg implants 2019-04-03 15:11:06 -04:00