cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 22:18:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Amaya
2020-10-06 13:22:47 +02:00
parent bbce09c27c 7b44df4701
commit 92fa5a4148
10 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+3 -3
View File
@@ -8,7 +8,7 @@
/datum/gear/choker/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/collar
display_name = "collar, silver"
@@ -18,7 +18,7 @@
/datum/gear/collar/New()
..()
gear_tweaks = list(gear_tweak_collar_tag)
gear_tweaks += gear_tweak_collar_tag
/datum/gear/collar/golden
display_name = "collar, golden"
@@ -106,4 +106,4 @@
/datum/gear/accessory/flops/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks += gear_tweak_free_color_choice
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+1 -1
View File
@@ -25,7 +25,7 @@
/datum/gear/fluff/collar/New()
..()
gear_tweaks = list(gear_tweak_collar_tag)
gear_tweaks += gear_tweak_collar_tag
// 0-9 CKEYS
/datum/gear/fluff/malady_crop
code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm
+2 -2
View File
@@ -12,7 +12,7 @@
/datum/gear/gloves/colored/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/gloves/latex/colorable
@@ -21,7 +21,7 @@
/datum/gear/gloves/latex/colorable/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/gloves/siren
display_name = "gloves, Siren"
code/modules/client/preference_setup/loadout/loadout_head_vr.dm
+1 -1
View File
@@ -12,7 +12,7 @@
/datum/gear/head/headbando/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks += gear_tweak_free_color_choice
//Detective alternative
/datum/gear/head/detective_alt
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+1 -1
View File
@@ -16,7 +16,7 @@
/datum/gear/suit/labcoat_colorable/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/jacket_modular
display_name = "jacket, modular"
code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/datum/category_item/catalogue/technology/drone/hivebot/laser // Hivebot Scanner Data - This is for Laser Hivebots
/datum/category_item/catalogue/technology/drone/hivebot/rapidfire // Hivebot Scanner Data - This is for Rapidfire Hivebots
name = "Drone - Rapidfire Hivebot"
desc = "A drone that walks on several legs, with yellow/gold armor plating. It appears to have some sort of \
rifle, built for high-rate fire. Other than that, it has similar yellowish color \
code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support_vr.dm
+1 -1
View File
@@ -5,7 +5,7 @@
to the other hivebots. Other than that, it has similar yellowish color to regular hivebots."
value = CATALOGUER_REWARD_HARD
/datum/category_item/catalogue/technology/drone/hivebot/logistics // Hivebot Scanner Data - This is for Commander Hivebots
/datum/category_item/catalogue/technology/drone/hivebot/logistics // Hivebot Scanner Data - This is for Logistics Hivebots
name = "Drone - Logistics Hivebot"
desc = "A drone that walks on several legs, with yellow/gold armor plating. It appears to have some sort of \
ballistic weapon. It also appears to have supply deploying bays, and internal fabs to repair and buff their allies' special capabilities. \
code/modules/vore/appearance/sprite_accessories_taur_vr.dm
+13 -8
View File
@@ -68,8 +68,13 @@
var/mob/living/carbon/human/H = M
if(isTaurTail(H.tail_style))
to_chat(src,"<span class='warning'>Too many legs. TOO MANY LEGS!!</span>")
return FALSE
var/datum/sprite_accessory/tail/taur/ridertype = H.tail_style
if(ridertype.can_ride)
if(istype(ridertype, /datum/sprite_accessory/tail/taur/naga) || istype(ridertype, /datum/sprite_accessory/tail/taur/slug))
to_chat(src,"<span class='warning'>Too few legs. TOO FEW LEGS!!</span>")
return FALSE
to_chat(src,"<span class='warning'>Too many legs. TOO MANY LEGS!!</span>")
return FALSE
. = ..()
if(.)
@@ -190,18 +195,18 @@
extra_overlay = "fatwolf_markings"
//icon_sprite_tag = "fatwolf2c"
/datum/sprite_accessory/tail/taur/wolf/skunk
name = "Skunk (Taur)"
icon_state = "skunk_s"
extra_overlay = "skunk_markings"
icon_sprite_tag = "skunk"
/datum/sprite_accessory/tail/taur/wolf/synthwolf
name = "SynthWolf dual-color (Taur)"
icon_state = "synthwolf_s"
extra_overlay = "synthwolf_markings"
//icon_sprite_tag = "synthwolf"
/datum/sprite_accessory/tail/taur/skunk
name = "Skunk (Taur)"
icon_state = "skunk_s"
extra_overlay = "skunk_markings"
icon_sprite_tag = "skunk"
/datum/sprite_accessory/tail/taur/naga
name = "Naga (Taur)"
icon_state = "naga_s"
maps/expedition_vr/space/_fueldepot.dm
+7 -1
View File
@@ -35,4 +35,10 @@
/turf/simulated/floor/tiled/techmaint/airless
oxygen = 0
nitrogen = 0
temperature = TCMB
temperature = TCMB
/obj/machinery/atmospherics/pipe/tank/phoron/full
start_pressure = 15000
/obj/machinery/atmospherics/pipe/tank/air/full
start_pressure = 15000
maps/expedition_vr/space/fueldepot.dmm
+2 -2
View File
@@ -644,7 +644,7 @@
/turf/simulated/shuttle/plating/airless,
/area/tether_away/fueldepot)
"bo" = (
/obj/machinery/atmospherics/pipe/tank/phoron,
/obj/machinery/atmospherics/pipe/tank/phoron/full,
/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/techmaint/airless,
/area/tether_away/fueldepot)
@@ -1124,7 +1124,7 @@
/turf/simulated/shuttle/plating/airless,
/area/tether_away/fueldepot)
"cn" = (
/obj/machinery/atmospherics/pipe/tank/air{
/obj/machinery/atmospherics/pipe/tank/air/full{
icon_state = "air_map";
dir = 1
},