cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 11:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Arokha/matdefs

Browse Source
This commit is contained in:
Aronai Sieyes
2021-07-07 14:29:30 -04:00
committed by GitHub
parent 26beb5d8e7 f3c583b740
commit 8bcd31c91e
283 changed files with 4118 additions and 1405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/observer/observer.dm
+10 -7
View File
@@ -334,14 +334,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
to_chat(src, "<font color='blue'><B>AntagHUD [antagHUD ? "Enabled" : "Disabled"]</B></font>")
/mob/observer/dead/proc/jumpable_areas()
var/list/areas = return_areas()
var/list/areas = return_sorted_areas()
if(client?.holder)
return areas
for(var/area/A as anything in areas)
for(var/key in areas)
var/area/A = areas[key]
if(A.z in using_map?.secret_levels)
areas -= A
return areas
areas -= key
return areas
/mob/observer/dead/proc/jumpable_mobs()
var/list/mobs = getmobs()
@@ -363,11 +364,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
to_chat(usr, "Not when you're not dead!")
return
var/area/A = tgui_input_list(usr, "Select an area:", "Ghost Teleport", jumpable_areas())
if(!A)
var/list/areas = jumpable_areas()
var/input = tgui_input_list(usr, "Select an area:", "Ghost Teleport", areas)
if(!input)
return
var/area/A = areas[input]
if(!A) return
usr.forceMove(pick(get_area_turfs(A)))
usr.on_mob_jump()
code/modules/mob/inventory.dm
+3 -6
View File
@@ -147,12 +147,9 @@ var/list/slot_equipment_priority = list( \
// If canremove or other conditions need to be checked then use unEquip instead.
/mob/proc/drop_from_inventory(var/obj/item/W, var/atom/target)
if(W)
remove_from_mob(W, target)
if(!(W && W.loc))
return 1 // self destroying objects (tk, grabs)
return 1
return 0
if(!W)
return 0
return remove_from_mob(W, target)
//Drops the item in our left hand
/mob/proc/drop_l_hand(var/atom/Target)
code/modules/mob/living/bot/edCLNbot.dm
+1 -1
View File
@@ -37,7 +37,7 @@
if(!red_switch && blue_switch && !green_switch && prob(50) || src.emagged)
if(istype(loc, /turf/simulated))
var/turf/simulated/T = loc
visible_message("<span class='notice'>\The [src] squirts a puddle of water on the floor!</span>")
visible_message("<b>\The [src]</b> squirts a puddle of water on the floor!")
T.wet_floor()
if(!red_switch && !blue_switch && green_switch && prob(10) || src.emagged)
code/modules/mob/living/bot/floorbot.dm
+5 -5
View File
@@ -228,7 +228,7 @@
return
busy = 1
update_icons()
visible_message("<span class='notice'>\The [src] begins to repair the hole.</span>")
visible_message("<b>\The [src]</b> begins to repair the hole.")
if(do_after(src, 50))
if(A && (locate(/obj/structure/lattice, A) && building == 1 || !locate(/obj/structure/lattice, A) && building == 2)) // Make sure that it still needs repairs
var/obj/item/I
@@ -245,7 +245,7 @@
if(F.broken || F.burnt)
busy = 1
update_icons()
visible_message("<span class='notice'>\The [src] begins to remove the broken floor.</span>")
visible_message("<b>\The [src]</b> begins to remove the broken floor.")
if(do_after(src, 50, F))
if(F.broken || F.burnt)
F.make_plating()
@@ -255,7 +255,7 @@
else if(!F.flooring && amount)
busy = 1
update_icons()
visible_message("<span class='notice'>\The [src] begins to improve the floor.</span>")
visible_message("<b>\The [src]</b> begins to improve the floor.")
if(do_after(src, 50))
if(!F.flooring)
F.set_flooring(get_flooring_data(floor_build_type))
@@ -265,7 +265,7 @@
update_icons()
else if(istype(A, /obj/item/stack/tile/floor) && amount < maxAmount)
var/obj/item/stack/tile/floor/T = A
visible_message("<span class='notice'>\The [src] begins to collect tiles.</span>")
visible_message("<b>\The [src]</b> begins to collect tiles.")
busy = 1
update_icons()
if(do_after(src, 20))
@@ -279,7 +279,7 @@
else if(istype(A, /obj/item/stack/material) && amount + 4 <= maxAmount)
var/obj/item/stack/material/M = A
if(M.get_material_name() == MAT_STEEL)
visible_message("<span class='notice'>\The [src] begins to make tiles.</span>")
visible_message("<b>\The [src]</b> begins to make tiles.")
busy = 1
update_icons()
if(do_after(50))
code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
+1 -1
View File
@@ -18,6 +18,6 @@
return
user.unEquip(W)
wear_hat(W)
user.visible_message("<span class='notice'>\The [user] puts \the [W] on \the [src].</span>")
user.visible_message("<b>\The [user]</b> puts \the [W] on \the [src].")
return
return ..()
code/modules/mob/living/carbon/brain/MMI.dm
+1 -1
View File
@@ -58,7 +58,7 @@
to_chat(user, "<span class='warning'>\The [src] appears to reject this brain. It is incompatable.</span>")
return
user.visible_message("<span class='notice'>\The [user] sticks \a [O] into \the [src].</span>")
user.visible_message("<b>\The [user]</b> sticks \a [O] into \the [src].")
B.preserved = TRUE
brainmob = B.brainmob
code/modules/mob/living/carbon/human/examine.dm
+12
View File
@@ -133,6 +133,18 @@
if(accessories_visible.len)
tie_msg += " Attached to it is [english_list(accessories_visible)]."
var/list/pocket_msg
if(l_store)
var/l_store_message = l_store.pocket_description(src, user)
if(l_store_message)
LAZYADD(pocket_msg, l_store_message)
if(r_store)
var/r_store_message = r_store.pocket_description(src, user)
if(r_store_message)
LAZYADD(pocket_msg, r_store_message)
if(LAZYLEN(pocket_msg))
tie_msg += " Near the waist it has [english_list(pocket_msg)]."
if(w_uniform.blood_DNA)
msg += "<span class='warning'>[T.He] [T.is] wearing [bicon(w_uniform)] [w_uniform.gender==PLURAL?"some":"a"] [(w_uniform.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [w_uniform.name]![tie_msg]</span>"
else
code/modules/mob/living/carbon/human/human.dm
+2 -2
View File
@@ -1395,8 +1395,8 @@
/mob/living/carbon/human/drop_from_inventory(var/obj/item/W, var/atom/Target = null)
if(W in organs)
return
..()
return 0
return ..()
/mob/living/carbon/human/reset_view(atom/A, update_hud = 1)
..()
code/modules/mob/living/carbon/human/human_defense.dm
+1 -1
View File
@@ -421,7 +421,7 @@ emp_act
return
if(!zone)
visible_message("<span class='notice'>\The [O] misses [src] narrowly!</span>")
visible_message("<b>\The [O]</b> misses [src] narrowly!")
return
O.throwing = 0 //it hit, so stop moving
code/modules/mob/living/carbon/human/species/species_shapeshift.dm
+1 -1
View File
@@ -164,7 +164,7 @@ var/list/wrapped_species_by_ref = list()
return
wrapped_species_by_ref["\ref[src]"] = new_species
visible_message("<span class='notice'>\The [src] shifts and contorts, taking the form of \a [new_species]!</span>")
visible_message("<b>\The [src]</b> shifts and contorts, taking the form of \a [new_species]!")
regenerate_icons()
/mob/living/carbon/human/proc/shapeshifter_select_colour()
code/modules/mob/living/carbon/human/species/station/prometheans.dm
+1 -1
View File
@@ -167,7 +167,7 @@ var/datum/species/shapeshifter/promethean/prometheans
if(FEMALE)
t_him = "her"
H.visible_message("<span class='notice'>\The [H] glomps [target] to make [t_him] feel better!</span>", \
H.visible_message("<b>\The [H]</b> glomps [target] to make [t_him] feel better!", \
"<span class='notice'>You glomp [target] to make [t_him] feel better!</span>")
H.apply_stored_shock_to(target)
code/modules/mob/living/carbon/human/species/station/teshari.dm
+1 -1
View File
@@ -207,7 +207,7 @@
// Handled!
if(!silent)
to_chat(H, SPAN_NOTICE("You catch the air in your wings and greatly slow your fall."))
landing.visible_message(SPAN_NOTICE("\The [H] glides down from above, landing safely."))
landing.visible_message("<b>\The [H]</b> glides down from above, landing safely.")
H.Stun(1)
playsound(H, "rustle", 25, 1)
return TRUE
code/modules/mob/living/carbon/human/update_icons.dm
+5
View File
@@ -271,6 +271,11 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
for(var/M in part.markings)
icon_key += "[M][part.markings[M]["color"]]"
// VOREStation Edit Start
if(part.nail_polish)
icon_key += "_[part.nail_polish.icon]_[part.nail_polish.icon_state]_[part.nail_polish.color]"
// VOREStation Edit End
if(part.robotic >= ORGAN_ROBOT)
icon_key += "2[part.model ? "-[part.model]": ""]"
code/modules/mob/living/carbon/lick_wounds.dm
+1 -1
View File
@@ -51,7 +51,7 @@
return
else
visible_message("<span class='notice'>\The [src] starts licking the wounds on [M]'s [affecting.name] clean.</span>", \
visible_message("<b>\The [src]</b> starts licking the wounds on [M]'s [affecting.name] clean.", \
"<span class='notice'>You start licking the wounds on [M]'s [affecting.name] clean.</span>" )
for (var/datum/wound/W in affecting.wounds)
code/modules/mob/living/living.dm
+2 -2
View File
@@ -719,8 +719,8 @@
/mob/living/carbon/drop_from_inventory(var/obj/item/W, var/atom/Target = null)
if(W in internal_organs)
return
..()
return 0
return ..()
/mob/living/touch_map_edge()
code/modules/mob/living/silicon/ai/multicam.dm
+1 -1
View File
@@ -153,7 +153,7 @@ Whatever you did that made the last camera window disappear-- don't do that agai
. = ..()
/area/ai_multicam_room
name = "ai_multicam_room"
name = "AI Multicam Room"
icon_state = "ai_camera_room"
dynamic_lighting = FALSE
ambience = list()
code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
+1 -1
View File
@@ -269,7 +269,7 @@
playsound(src, 'sound/weapons/Egloves.ogg', 50, 1, -1)
R.cell.charge -= 666
else
user.visible_message("<span class='notice'>\the [user] affectionately licks all over \the [target]'s face!</span>", "<span class='notice'>You affectionately lick all over \the [target]'s face!</span>")
user.visible_message("<span class='notice'>\The [user] affectionately licks all over \the [target]'s face!</span>", "<span class='notice'>You affectionately lick all over \the [target]'s face!</span>")
playsound(src, 'sound/effects/attackblob.ogg', 50, 1)
water.use_charge(5)
var/mob/living/carbon/human/H = target
code/modules/mob/living/silicon/robot/drone/drone.dm
+1 -1
View File
@@ -173,7 +173,7 @@ var/list/mob_hat_cache = list()
return
user.unEquip(W)
wear_hat(W)
user.visible_message("<span class='notice'>\The [user] puts \the [W] on \the [src].</span>")
user.visible_message("<b>\The [user]</b> puts \the [W] on \the [src].")
return
else if(istype(W, /obj/item/borg/upgrade/))
to_chat(user, "<span class='danger'>\The [src] is not compatible with \the [W].</span>")
code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm
+1 -1
View File
@@ -165,4 +165,4 @@
if(!recharge_complete && recharging_atom.percent() >= 100)
recharge_complete = TRUE
visible_message(SPAN_NOTICE("\The [src] beeps and flashes a green light above \his recharging port."))
visible_message("<b>\The [src]</b> beeps and flashes a green light above \his recharging port.")
code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm
+2 -2
View File
@@ -6,7 +6,7 @@
if(istype(recharging_atom) && !QDELETED(recharging_atom) && recharging_atom.loc == src)
recharging_atom.dropInto(loc)
user.put_in_hands(recharging_atom)
user.visible_message(SPAN_NOTICE("\The [user] pops \the [recharging_atom] out of \the [src]'s recharging port."))
user.visible_message("<b>\The [user]</b> pops \the [recharging_atom] out of \the [src]'s recharging port.")
recharging = null
return TRUE
@@ -24,7 +24,7 @@
W.forceMove(src)
recharging = weakref(W)
recharge_complete = FALSE
user.visible_message(SPAN_NOTICE("\The [user] slots \the [W] into \the [src]'s recharging port."))
user.visible_message("<b>\The [user]</b> slots \the [W] into \the [src]'s recharging port.")
return TRUE
if(istype(W, /obj/item/device/floor_painter))
code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm
+5 -5
View File
@@ -82,9 +82,9 @@
if(istype(ejecting) && !QDELETED(ejecting) && ejecting.loc == src)
ejecting.dropInto(loc)
if(user == src)
visible_message(SPAN_NOTICE("\The [src] ejects \the [ejecting] from its cargo compartment."))
visible_message("<b>\The [src]</b> ejects \the [ejecting] from its cargo compartment.")
else
user.visible_message(SPAN_NOTICE("\The [user] pulls \the [ejecting] from \the [src]'s cargo compartment."))
user.visible_message("<b>\The [user]</b> pulls \the [ejecting] from \the [src]'s cargo compartment.")
/mob/living/silicon/robot/platform/attack_ai(mob/user)
if(isrobot(user) && user.Adjacent(src))
@@ -99,7 +99,7 @@
if(!istype(removing) || QDELETED(removing) || removing.loc != src)
LAZYREMOVE(stored_atoms, remove_ref)
else
user.visible_message(SPAN_NOTICE("\The [user] begins unloading \the [removing] from \the [src]'s cargo compartment."))
user.visible_message("<b>\The [user]</b> begins unloading \the [removing] from \the [src]'s cargo compartment.")
if(do_after(user, 3 SECONDS, src) && !QDELETED(removing) && removing.loc == src)
drop_stored_atom(removing, user)
return TRUE
@@ -124,9 +124,9 @@
if(!can_mouse_drop(dropping, user) || !can_store_atom(dropping, user))
return FALSE
if(user == src)
visible_message(SPAN_NOTICE("\The [src] begins loading \the [dropping] into its cargo compartment."))
visible_message("<b>\The [src]</b> begins loading \the [dropping] into its cargo compartment.")
else
user.visible_message(SPAN_NOTICE("\The [user] begins loading \the [dropping] into \the [src]'s cargo compartment."))
user.visible_message("<b>\The [user]</b> begins loading \the [dropping] into \the [src]'s cargo compartment.")
if(do_after(user, 3 SECONDS, src) && can_mouse_drop(dropping, user) && can_store_atom(dropping, user))
store_atom(dropping, user)
return FALSE
code/modules/mob/living/simple_mob/defense.dm
+1 -1
View File
@@ -64,7 +64,7 @@
MED.amount -= 1
if(MED.amount <= 0)
qdel(MED)
visible_message("<span class='notice'>\The [user] applies the [MED] on [src].</span>")
visible_message("<b>\The [user]</b> applies the [MED] on [src].")
else
var/datum/gender/T = gender_datums[src.get_visible_gender()]
to_chat(user, "<span class='notice'>\The [src] is dead, medical items won't bring [T.him] back to life.</span>") // the gender lookup is somewhat overkill, but it functions identically to the obsolete gender macros and future-proofs this code
code/modules/mob/living/simple_mob/simple_mob_vr.dm
+3 -3
View File
@@ -161,9 +161,9 @@
vore_pounce_cooldown = world.time + 20 SECONDS // don't attempt another pounce for a while
if(prob(successrate)) // pounce success!
M.Weaken(5)
M.visible_message("<span class='danger'>\the [src] pounces on \the [M]!</span>!")
M.visible_message("<span class='danger'>\The [src] pounces on \the [M]!</span>!")
else // pounce misses!
M.visible_message("<span class='danger'>\the [src] attempts to pounce \the [M] but misses!</span>!")
M.visible_message("<span class='danger'>\The [src] attempts to pounce \the [M] but misses!</span>!")
playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
if(will_eat(M) && (!M.canmove || vore_standing_too)) //if they're edible then eat them too
@@ -263,7 +263,7 @@
if(istype(tmob) && will_eat(tmob) && !istype(tmob, type) && prob(vore_bump_chance) && !ckey) //check if they decide to eat. Includes sanity check to prevent cannibalism.
if(tmob.canmove && prob(vore_pounce_chance)) //if they'd pounce for other noms, pounce for these too, otherwise still try and eat them if they hold still
tmob.Weaken(5)
tmob.visible_message("<span class='danger'>\the [src] [vore_bump_emote] \the [tmob]!</span>!")
tmob.visible_message("<span class='danger'>\The [src] [vore_bump_emote] \the [tmob]!</span>!")
set_AI_busy(TRUE)
spawn()
animal_nom(tmob)
code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm
+1 -1
View File
@@ -38,7 +38,7 @@
var/obj/item/weapon/storage/S = O
var/obj/item/weapon/holder/H = new holder_type(get_turf(src),src) //this works weird, but it creates an empty holder, to see if that holder can fit
if(S.can_be_inserted(H) && (src.size_multiplier <= 0.75))
visible_message("<span class='notice'>\the [src] squeezes into \the [S].</span>")
visible_message("<b>\The [src]</b> squeezes into \the [S].")
H.forceMove(S)
return 1
else
code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm
+1 -1
View File
@@ -185,7 +185,7 @@ var/list/_cat_default_emotes = list(
/mob/living/simple_mob/animal/passive/cat/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen))
if(named)
to_chat(user, "<span class='notice'>\the [name] already has a name!</span>")
to_chat(user, "<span class='notice'>\The [name] already has a name!</span>")
else
var/tmp_name = sanitizeSafe(input(user, "Give \the [name] a name", "Name"), MAX_NAME_LEN)
if(length(tmp_name) > 50)
code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm
+1 -1
View File
@@ -116,5 +116,5 @@
if(prob(10))
for(var/mob/living/L in hearers(holder))
if(!istype(L, holder)) // Don't follow other hooligan crabs.
holder.visible_message("<span class='notice'>\The [holder] starts to follow \the [L].</span>")
holder.visible_message("<b>\The [holder]</b> starts to follow \the [L].")
set_follow(L, rand(20 SECONDS, 40 SECONDS))
code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm
+2 -2
View File
@@ -181,7 +181,7 @@
if(holder.get_active_hand() && istype(holder.get_active_hand(), /obj/item/clothing/head) && !S.hat)
var/obj/item/I = holder.get_active_hand()
S.take_hat(S)
holder.visible_message("<span class='notice'>\The [holder] wears \the [I]</span>")
holder.visible_message("<b>\The [holder]</b> wears \the [I]")
/mob/living/simple_mob/animal/sif/sakimm/intelligent
desc = "What appears to be an oversized rodent with hands. This one has a curious look in its eyes."
@@ -327,7 +327,7 @@
if(istype(holder) && istype(holder.get_active_hand(), /obj/item/clothing/head) && !S.hat)
var/obj/item/I = holder.get_active_hand()
S.take_hat(S)
holder.visible_message("<span class='notice'>\The [holder] wears \the [I]</span>")
holder.visible_message("<b>\The [holder]</b> wears \the [I]")
carrying_item = TRUE
if(istype(holder) && S.hat) // Do we have a hat? Hats are loot.
code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm
+1 -1
View File
@@ -41,7 +41,7 @@
var/mob/living/L = A
if(prob(scare_chance))
L.Stun(1)
L.visible_message("<span class='danger'>\the [src] scares \the [L]!</span>")
L.visible_message("<span class='danger'>\The [src] scares \the [L]!</span>")
// Spookiest of bats
/mob/living/simple_mob/animal/space/bats/cult
code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm
+1 -1
View File
@@ -116,7 +116,7 @@
my_storage.rangedload(T, src)
if(my_storage.contents.len >= my_storage.max_storage_space)
visible_message("<span class='notice'>\The [src] emits a shrill beep, indicating its storage is full.</span>")
visible_message("<b>\The [src]</b> emits a shrill beep, indicating its storage is full.")
var/obj/structure/ore_box/OB = locate() in view(2, src)
code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm
+1 -1
View File
@@ -126,7 +126,7 @@
var/repair_upper_bound = A.melee_damage_upper * -1
adjustBruteLoss(rand(repair_lower_bound, repair_upper_bound))
adjustFireLoss(rand(repair_lower_bound, repair_upper_bound))
user.visible_message("<span class='notice'>\The [user] mends some of \the [src]'s wounds.</span>")
user.visible_message("<b>\The [user]</b> mends some of \the [src]'s wounds.")
else
to_chat(user, "<span class='notice'>\The [src] is undamaged.</span>")
return
code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm
+1 -1
View File
@@ -48,7 +48,7 @@
var/mob/living/L = A
if(prob(12))
L.Weaken(3)
L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
L.visible_message("<span class='danger'>\The [src] knocks down \the [L]!</span>")
// Strong Variant
/mob/living/simple_mob/faithless/strong
code/modules/mob/living/simple_mob/subtypes/vore/rat.dm
+1 -1
View File
@@ -160,7 +160,7 @@
hunger += 5
else
food.Weaken(5)
food.visible_message("<span class='danger'>\the [src] pounces on \the [food]!</span>!")
food.visible_message("<span class='danger'>\The [src] pounces on \the [food]!</span>!")
target_mob = food
EatTarget()
hunger = 0
code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm
+1 -1
View File
@@ -69,7 +69,7 @@ List of things solar grubs should be able to do:
if(attached)
set_AI_busy(TRUE)
if(prob(2))
src.visible_message("<span class='notice'>\The [src] begins to sink power from the net.</span>")
src.visible_message("<b>\The [src]</b> begins to sink power from the net.")
if(prob(5))
var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
sparks.set_up(5, 0, get_turf(src))
code/modules/mob/new_player/new_player.dm
+1 -3
View File
@@ -132,9 +132,7 @@
new_player_panel_proc()
if(href_list["observe"])
var/alert_time = ticker?.current_state <= GAME_STATE_SETTING_UP ? 1 : round(config.respawn_time/10/60)
if(tgui_alert(src,"Are you sure you wish to observe? You will have to wait up to [alert_time] minute\s before being able to spawn into the game!","Player Setup",list("Yes","No")) == "Yes")
if(tgui_alert(src,"Are you sure you wish to observe? If you do, make sure to not use any knowledge gained from observing if you decide to join later.","Player Setup",list("Yes","No")) == "Yes")
if(!client) return 1
//Make a new mannequin quickly, and allow the observer to take the appearance
code/modules/mob/new_player/preferences_setup.dm
+1 -1
View File
@@ -29,7 +29,7 @@
all_underwear[WRC.name] = WRI.name
backbag = rand(1,5)
backbag = rand(1,6)
pdachoice = rand(1,5)
age = rand(current_species.min_age, current_species.max_age)
b_type = RANDOM_BLOOD_TYPE
code/modules/mob/new_player/sprite_accessories.dm
+4 -4
View File
@@ -23,7 +23,7 @@
var/icon_state // the icon_state of the accessory
var/preview_state // a custom preview state for whatever reason
var/name // the preview name of the accessory
var/name = "ERROR - FIXME" // the preview name of the accessory
// Determines if the accessory will be skipped or included in random hair generations
var/gender = NEUTER
@@ -1819,6 +1819,7 @@ shaved
//Teshari things
/datum/sprite_accessory/hair/teshari
name = "Teshari Default"
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "teshari_default"
species_allowed = list(SPECIES_TESHARI)
@@ -1855,8 +1856,8 @@ shaved
icon_state = "teshari_mohawk"
/datum/sprite_accessory/hair/teshari/pointy
name = "Teshari Pointy"
icon_state = "teshari_pointy"
name = "Teshari Pointy"
icon_state = "teshari_pointy"
/datum/sprite_accessory/hair/teshari/upright
name = "Teshari Upright"
@@ -1875,7 +1876,6 @@ shaved
icon_state = "teshari_mushroom"
//Tesh things ported from Ark Station
/datum/sprite_accessory/hair/teshari/twies
name = "Teshari Twies"
icon_state = "teshari_twies"
code/modules/mob/new_player/sprite_accessories_extra_vr.dm
+240 -123
View File
@@ -5,732 +5,849 @@
color_blend_mode = ICON_ADD
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) //This lets all races use
/datum/sprite_accessory/marking/vr
icon = 'icons/mob/human_races/markings_vr.dmi'
/datum/sprite_accessory/marking/vr/vulp_belly
/datum/sprite_accessory/marking/vr_vulp_belly
name = "belly fur (Vulp)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "vulp_belly"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_TORSO,BP_GROIN)
/datum/sprite_accessory/marking/vr/vulp_fullbelly
/datum/sprite_accessory/marking/vr_vulp_fullbelly
name = "full belly fur (Vulp)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "vulp_fullbelly"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_TORSO,BP_GROIN)
/datum/sprite_accessory/marking/vr/vulp_crest
/datum/sprite_accessory/marking/vr_vulp_crest
name = "belly crest (Vulp)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "vulp_crest"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_TORSO,BP_GROIN)
/datum/sprite_accessory/marking/vr/vulp_nose
/datum/sprite_accessory/marking/vr_vulp_nose
name = "nose (Vulp)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "vulp_nose"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/vulp_short_nose
/datum/sprite_accessory/marking/vr_vulp_short_nose
name = "nose, short (Vulp)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "vulp_short_nose"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/snoutstripe
/datum/sprite_accessory/marking/vr_snoutstripe
name = "snout stripe (Vulp)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "snoutstripe"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/vulp_face
/datum/sprite_accessory/marking/vr_vulp_face
name = "face (Vulp)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "vulp_face"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/vulp_facealt
/datum/sprite_accessory/marking/vr_vulp_facealt
name = "face, alt. (Vulp)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "vulp_facealt"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/vulp_earsface
/datum/sprite_accessory/marking/vr_vulp_earsface
name = "ears and face (Vulp)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "vulp_earsface"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/vulp_all
/datum/sprite_accessory/marking/vr_vulp_all
name = "all head highlights (Vulp)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "vulp_all"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/sergal_full
/datum/sprite_accessory/marking/vr_sergal_full
name = "Sergal Markings"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "sergal_full"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)
species_allowed = list("Sergal")
/datum/sprite_accessory/marking/vr/sergal_full_female
/datum/sprite_accessory/marking/vr_sergal_full_female
name = "Sergal Markings (Female)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "sergal_full_female"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)
species_allowed = list("Sergal")
/datum/sprite_accessory/marking/vr/monoeye
/datum/sprite_accessory/marking/vr_monoeye
name = "Monoeye"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "monoeye"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/spidereyes
/datum/sprite_accessory/marking/vr_spidereyes
name = "Spider Eyes"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "spidereyes"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/sergaleyes
/datum/sprite_accessory/marking/vr_sergaleyes
name = "Sergal Eyes"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "eyes_sergal"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/closedeyes
/datum/sprite_accessory/marking/vr_closedeyes
name = "Closed Eyes"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "eyes_closed"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/brows
/datum/sprite_accessory/marking/vr_brows
name = "Eyebrows"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "brows"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/nevrean_female
/datum/sprite_accessory/marking/vr_nevrean_female
name = "Female Nevrean beak"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "nevrean_f"
body_parts = list(BP_HEAD)
color_blend_mode = ICON_MULTIPLY
gender = FEMALE
/datum/sprite_accessory/marking/vr/nevrean_male
/datum/sprite_accessory/marking/vr_nevrean_male
name = "Male Nevrean beak"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "nevrean_m"
body_parts = list(BP_HEAD)
color_blend_mode = ICON_MULTIPLY
gender = MALE
/datum/sprite_accessory/marking/vr/spots
/datum/sprite_accessory/marking/vr_spots
name = "Spots"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "spots"
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)
/datum/sprite_accessory/marking/vr/shaggy_mane
/datum/sprite_accessory/marking/vr_shaggy_mane
name = "Shaggy mane/feathers"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "shaggy"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_TORSO)
/datum/sprite_accessory/marking/vr/jagged_teeth
/datum/sprite_accessory/marking/vr_jagged_teeth
name = "Jagged teeth"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "jagged"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/blank_face
/datum/sprite_accessory/marking/vr_blank_face
name = "Blank round face (use with monster mouth)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "blankface"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/monster_mouth
/datum/sprite_accessory/marking/vr_monster_mouth
name = "Monster mouth"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "monster"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/saber_teeth
/datum/sprite_accessory/marking/vr_saber_teeth
name = "Saber teeth"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "saber"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/fangs
/datum/sprite_accessory/marking/vr_fangs
name = "Fangs"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "fangs"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/tusks
/datum/sprite_accessory/marking/vr_tusks
name = "Tusks"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "tusks"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/otie_face
/datum/sprite_accessory/marking/vr_otie_face
name = "Otie face"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "otieface"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/otie_nose
/datum/sprite_accessory/marking/vr_otie_nose
name = "Otie nose"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "otie_nose"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/otienose_lite
/datum/sprite_accessory/marking/vr_otienose_lite
name = "Short otie nose"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "otienose_lite"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/backstripes
/datum/sprite_accessory/marking/vr_backstripes
name = "Back stripes"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "otiestripes"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_TORSO,BP_HEAD)
/datum/sprite_accessory/marking/vr/belly_butt
/datum/sprite_accessory/marking/vr_belly_butt
name = "Belly and butt"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "bellyandbutt"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_GROIN,BP_TORSO)
/datum/sprite_accessory/marking/vr/fingers_toes
/datum/sprite_accessory/marking/vr_fingers_toes
name = "Fingers and toes"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "fingerstoes"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND)
/datum/sprite_accessory/marking/vr/otie_socks
/datum/sprite_accessory/marking/vr_otie_socks
name = "Fingerless socks"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "otiesocks"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND)
/datum/sprite_accessory/marking/vr/corvid_beak
/datum/sprite_accessory/marking/vr_corvid_beak
name = "Corvid beak"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "corvidbeak"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/corvid_belly
/datum/sprite_accessory/marking/vr_corvid_belly
name = "Corvid belly"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "corvidbelly"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_GROIN,BP_TORSO,BP_HEAD)
/datum/sprite_accessory/marking/vr/cow_body
/datum/sprite_accessory/marking/vr_cow_body
name = "Cow markings"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "cowbody"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)
/datum/sprite_accessory/marking/vr/cow_nose
/datum/sprite_accessory/marking/vr_cow_nose
name = "Cow nose"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "cownose"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/zmask
/datum/sprite_accessory/marking/vr_zmask
name = "Eye mask"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "zmask"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/zbody
/datum/sprite_accessory/marking/vr_zbody
name = "Thick jagged stripes"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "zbody"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_LEG,BP_R_LEG,BP_GROIN,BP_TORSO)
/datum/sprite_accessory/marking/vr/znose
/datum/sprite_accessory/marking/vr_znose
name = "Jagged snout"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "znose"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/otter_nose
/datum/sprite_accessory/marking/vr_otter_nose
name = "Otter nose"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "otternose"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/otter_face
/datum/sprite_accessory/marking/vr_otter_face
name = "Otter face"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "otterface"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/deer_face
/datum/sprite_accessory/marking/vr_deer_face
name = "Deer face"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "deerface"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/sharkface
/datum/sprite_accessory/marking/vr_sharkface
name = "Akula snout"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "sharkface"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/sheppy_face
/datum/sprite_accessory/marking/vr_sheppy_face
name = "Shepherd snout"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "shepface"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/sheppy_back
/datum/sprite_accessory/marking/vr_sheppy_back
name = "Shepherd back"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "shepback"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_TORSO,BP_GROIN)
/datum/sprite_accessory/marking/vr/zorren_belly_male
/datum/sprite_accessory/marking/vr_zorren_belly_male
name = "Zorren Male Torso"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "zorren_belly"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_TORSO,BP_GROIN)
/datum/sprite_accessory/marking/vr/zorren_belly_female
/datum/sprite_accessory/marking/vr_zorren_belly_female
name = "Zorren Female Torso"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "zorren_belly_female"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_TORSO,BP_GROIN)
/datum/sprite_accessory/marking/vr/zorren_back_patch
/datum/sprite_accessory/marking/vr_zorren_back_patch
name = "Zorren Back Patch"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "zorren_backpatch"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_TORSO)
/datum/sprite_accessory/marking/vr/zorren_face_male
/datum/sprite_accessory/marking/vr_zorren_face_male
name = "Zorren Male Face"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "zorren_face"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
gender = MALE
/datum/sprite_accessory/marking/vr/zorren_face_female
/datum/sprite_accessory/marking/vr_zorren_face_female
name = "Zorren Female Face"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "zorren_face_female"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
gender = FEMALE
/datum/sprite_accessory/marking/vr/zorren_muzzle_male
/datum/sprite_accessory/marking/vr_zorren_muzzle_male
name = "Zorren Male Muzzle"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "zorren_muzzle"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
gender = MALE
/datum/sprite_accessory/marking/vr/zorren_muzzle_female
/datum/sprite_accessory/marking/vr_zorren_muzzle_female
name = "Zorren Female Muzzle"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "zorren_muzzle_female"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
gender = FEMALE
/datum/sprite_accessory/marking/vr/zorren_socks
/datum/sprite_accessory/marking/vr_zorren_socks
name = "Zorren Socks"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "zorren_socks"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND)
/datum/sprite_accessory/marking/vr/zorren_longsocks
/datum/sprite_accessory/marking/vr_zorren_longsocks
name = "Zorren Longsocks"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "zorren_longsocks"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND)
/datum/sprite_accessory/marking/vr/tesh_feathers
/datum/sprite_accessory/marking/vr_tesh_feathers
name = "Teshari Feathers"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "tesh-feathers"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND)
/datum/sprite_accessory/marking/vr/harpy_feathers
/datum/sprite_accessory/marking/vr_harpy_feathers
name = "Rapala leg Feather"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "harpy-feathers"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_LEG,BP_R_LEG)
/datum/sprite_accessory/marking/vr/harpy_legs
/datum/sprite_accessory/marking/vr_harpy_legs
name = "Rapala leg coloring"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "harpy-leg"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG)
/datum/sprite_accessory/marking/vr/chooves
/datum/sprite_accessory/marking/vr_chooves
name = "Cloven hooves"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "chooves"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT)
/datum/sprite_accessory/marking/vr/body_tone
/datum/sprite_accessory/marking/vr_body_tone
name = "Body toning (for emergency contrast loss)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "btone"
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)
/datum/sprite_accessory/marking/vr/gloss
/datum/sprite_accessory/marking/vr_gloss
name = "Full body gloss"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "gloss"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)
/datum/sprite_accessory/marking/vr/eboop_panels
/datum/sprite_accessory/marking/vr_eboop_panels
name = "Eggnerd FBP panels"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "eboop"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)
/datum/sprite_accessory/marking/vr/osocks_rarm
/datum/sprite_accessory/marking/vr_osocks_rarm
name = "Modular Longsock (right arm)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "osocks"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_R_ARM,BP_R_HAND)
/datum/sprite_accessory/marking/vr/osocks_larm
/datum/sprite_accessory/marking/vr_osocks_larm
name = "Modular Longsock (left arm)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "osocks"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_ARM,BP_L_HAND)
/datum/sprite_accessory/marking/vr/osocks_rleg
/datum/sprite_accessory/marking/vr_osocks_rleg
name = "Modular Longsock (right leg)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "osocks"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_R_FOOT,BP_R_LEG)
/datum/sprite_accessory/marking/vr/osocks_lleg
/datum/sprite_accessory/marking/vr_osocks_lleg
name = "Modular Longsock (left leg)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "osocks"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_L_LEG)
/datum/sprite_accessory/marking/vr/animeeyesinner
/datum/sprite_accessory/marking/vr_animeeyesinner
name = "Anime Eyes Inner"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "animeeyesinner"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/animeeyesouter
/datum/sprite_accessory/marking/vr_animeeyesouter
name = "Anime Eyes Outer"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "animeeyesouter"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/panda_eye_marks
/datum/sprite_accessory/marking/vr_panda_eye_marks
name = "Panda Eye Markings"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "eyes_panda"
body_parts = list(BP_HEAD)
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
/datum/sprite_accessory/marking/vr/catwomantorso
/datum/sprite_accessory/marking/vr_catwomantorso
name = "Catwoman chest stripes"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "catwomanchest"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_TORSO)
/datum/sprite_accessory/marking/vr/catwomangroin
/datum/sprite_accessory/marking/vr_catwomangroin
name = "Catwoman groin stripes"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "catwomangroin"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_GROIN)
/datum/sprite_accessory/marking/vr/catwoman_rleg
/datum/sprite_accessory/marking/vr_catwoman_rleg
name = "Catwoman right leg stripes"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "catwomanright"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_R_LEG)
/datum/sprite_accessory/marking/vr/catwoman_lleg
/datum/sprite_accessory/marking/vr_catwoman_lleg
name = "Catwoman left leg stripes"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "catwomanleft"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_LEG)
/datum/sprite_accessory/marking/vr/teshi_small_feathers
/datum/sprite_accessory/marking/vr_teshi_small_feathers
name = "Teshari small wingfeathers"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "teshi_sf"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND,BP_TORSO)
/datum/sprite_accessory/marking/vr/spirit_lights
/datum/sprite_accessory/marking/vr_spirit_lights
name = "Ward - Spirit FBP Lights"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "lights"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_HEAD)
/datum/sprite_accessory/marking/vr/spirit_lights_body
/datum/sprite_accessory/marking/vr_spirit_lights_body
name = "Ward - Spirit FBP Lights (body)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "lights"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO)
/datum/sprite_accessory/marking/vr/spirit_lights_head
/datum/sprite_accessory/marking/vr_spirit_lights_head
name = "Ward - Spirit FBP Lights (head)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "lights"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/spirit_panels
/datum/sprite_accessory/marking/vr_spirit_panels
name = "Ward - Spirit FBP Panels"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "panels"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)
/datum/sprite_accessory/marking/vr/spirit_panels_body
/datum/sprite_accessory/marking/vr_spirit_panels_body
name = "Ward - Spirit FBP Panels (body)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "panels"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)
/datum/sprite_accessory/marking/vr/spirit_panels_head
/datum/sprite_accessory/marking/vr_spirit_panels_head
name = "Ward - Spirit FBP Panels (head)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "panels"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/tentacle_head
/datum/sprite_accessory/marking/vr_tentacle_head
name = "Squid Head"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "tentaclehead"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/tentacle_mouth
/datum/sprite_accessory/marking/vr_tentacle_mouth
name = "Tentacle Mouth"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "tentaclemouth"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/rosette
/datum/sprite_accessory/marking/vr_rosette
name = "Rosettes"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "rosette"
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)
/datum/sprite_accessory/marking/vr/werewolf_nose
/datum/sprite_accessory/marking/vr_werewolf_nose
name = "Werewolf nose"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon = 'icons/mob/species/werebeast/werebeast_markings.dmi'
icon_state = "werewolf_nose"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
species_allowed = list(SPECIES_WEREBEAST)
/datum/sprite_accessory/marking/vr/werewolf_face
/datum/sprite_accessory/marking/vr_werewolf_face
name = "Werewolf face"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon = 'icons/mob/species/werebeast/werebeast_markings.dmi'
icon_state = "werewolf"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
species_allowed = list(SPECIES_WEREBEAST)
/datum/sprite_accessory/marking/vr/werewolf_belly
/datum/sprite_accessory/marking/vr_werewolf_belly
name = "Werewolf belly"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon = 'icons/mob/species/werebeast/werebeast_markings.dmi'
icon_state = "werewolf"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_GROIN,BP_TORSO)
species_allowed = list(SPECIES_WEREBEAST)
/datum/sprite_accessory/marking/vr/werewolf_socks
/datum/sprite_accessory/marking/vr_werewolf_socks
name = "Werewolf socks"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon = 'icons/mob/species/werebeast/werebeast_markings.dmi'
icon_state = "werewolf"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND)
species_allowed = list(SPECIES_WEREBEAST)
/datum/sprite_accessory/marking/vr/shadekin_snoot
/datum/sprite_accessory/marking/vr_shadekin_snoot
name = "Shadekin Snoot"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "shadekin-snoot"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW)
/datum/sprite_accessory/marking/vr/taj_nose_alt
/datum/sprite_accessory/marking/vr_taj_nose_alt
name = "Nose Color, alt. (Taj)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "taj_nosealt"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/talons
/datum/sprite_accessory/marking/vr_talons
name = "Talons"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "talons"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG)
/datum/sprite_accessory/marking/vr/claws
/datum/sprite_accessory/marking/vr_claws
name = "Claws"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "claws"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_HAND,BP_R_HAND)
/datum/sprite_accessory/marking/vr/equine_snout //Why the long face? Works best with sergal bodytype.
/datum/sprite_accessory/marking/vr_equine_snout //Why the long face? Works best with sergal bodytype.
name = "Equine Snout"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "donkey"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/equine_nose
/datum/sprite_accessory/marking/vr_equine_nose
name = "Equine Nose"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "dnose"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/bee_stripes
/datum/sprite_accessory/marking/vr_bee_stripes
name = "bee stripes"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "beestripes"
body_parts = list(BP_TORSO,BP_GROIN)
/datum/sprite_accessory/marking/vr/vas_toes
/datum/sprite_accessory/marking/vr_vas_toes
name = "Bug Paws (Vasilissan)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "vas_toes"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT)
//CitRP stuff
/datum/sprite_accessory/marking/vr/vox_alt
/datum/sprite_accessory/marking/vr_vox_alt
name = "Vox Alternate"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "bay_vox"
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD)
species_allowed = list(SPECIES_VOX)
/datum/sprite_accessory/marking/vr/vox_alt_eyes
/datum/sprite_accessory/marking/vr_vox_alt_eyes
name = "Alternate Vox Eyes"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "bay_vox_eyes"
body_parts = list(BP_HEAD)
species_allowed = list(SPECIES_VOX)
/datum/sprite_accessory/marking/vr/c_beast_body
/datum/sprite_accessory/marking/vr_c_beast_body
name = "Cyber Body"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "c_beast_body"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN)
/datum/sprite_accessory/marking/vr/c_beast_plating
/datum/sprite_accessory/marking/vr_c_beast_plating
name = "Cyber Plating (Use w/ Cyber Body)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "c_beast_plating"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM)
/datum/sprite_accessory/marking/vr/c_beast_band
/datum/sprite_accessory/marking/vr_c_beast_band
name = "Cyber Band (Use w/ Cybertech head)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "c_beast_band"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/c_beast_cheek_a
/datum/sprite_accessory/marking/vr_c_beast_cheek_a
name = "Cyber Beast Cheeks A (Use A, B and C)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "c_beast_a"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/c_beast_cheek_b
/datum/sprite_accessory/marking/vr_c_beast_cheek_b
name = "Cyber Beast Cheeks B (Use A, B and C)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "c_beast_b"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/c_beast_cheek_c
/datum/sprite_accessory/marking/vr_c_beast_cheek_c
name = "Cyber Beast Cheeks C (Use A, B and C)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "c_beast_c"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/teshari_large_eyes
/datum/sprite_accessory/marking/vr_teshari_large_eyes
name = "Teshari large eyes"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "teshlarge_eyes"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
species_allowed = list(SPECIES_TESHARI)
/datum/sprite_accessory/marking/vr/teshari_coat
/datum/sprite_accessory/marking/vr_teshari_coat
name = "Teshari coat"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "tesh_coat"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_HEAD)
species_allowed = list(SPECIES_TESHARI)
/datum/sprite_accessory/marking/vr/teshari_pattern_male
/datum/sprite_accessory/marking/vr_teshari_pattern_male
name = "Teshari male pattern"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "tesh-pattern-male"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD)
species_allowed = list(SPECIES_TESHARI)
/datum/sprite_accessory/marking/vr/teshari_pattern_female
/datum/sprite_accessory/marking/vr_teshari_pattern_female
name = "Teshari female pattern"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "tesh-pattern-fem"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD)
species_allowed = list(SPECIES_TESHARI)
/datum/sprite_accessory/marking/vr/voxscales
/datum/sprite_accessory/marking/vr_voxscales
name = "Vox Scales"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "Voxscales"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_HEAD)
/datum/sprite_accessory/marking/vr/voxclaws
/datum/sprite_accessory/marking/vr_voxclaws
name = "Vox Claws"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "Voxclaws"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND)
/datum/sprite_accessory/marking/vr/voxbeak
/datum/sprite_accessory/marking/vr_voxbeak
name = "Vox Beak"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "Voxscales"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/unathihood
/datum/sprite_accessory/marking/vr_unathihood
name = "Cobra Hood"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "unathihood"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/unathidoublehorns
/datum/sprite_accessory/marking/vr_unathidoublehorns
name = "Double Unathi Horns"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "unathidoublehorns"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/unathihorns
/datum/sprite_accessory/marking/vr_unathihorns
name = "Unathi Horns"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "unathihorns"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/unathiramhorns
/datum/sprite_accessory/marking/vr_unathiramhorns
name = "Unathi Ram Horns"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "unathiramhorns"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/unathishortspines
/datum/sprite_accessory/marking/vr_unathishortspines
name = "Unathi Short Spines"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "unathishortspines"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/unathilongspines
/datum/sprite_accessory/marking/vr_unathilongspines
name = "Unathi Long Spines"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "unathilongspines"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/unathishortfrills
/datum/sprite_accessory/marking/vr_unathishortfrills
name = "Unathi Short Frills"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "unathishortfrills"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/unathilongfrills
/datum/sprite_accessory/marking/vr_unathilongfrills
name = "Unathi Long Frills"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "unathilongfrills"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr/thunderthighs
/datum/sprite_accessory/marking/vr_thunderthighs
name = "Boosted Thighs"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "thunderthighs"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_LEG,BP_R_LEG)
code/modules/mob/new_player/sprite_accessories_taur_vr.dm
+6 -6
View File
@@ -57,7 +57,7 @@
suit_sprites = 'icons/mob/taursuits_wolf_vr.dmi'
icon_sprite_tag = "wolf"
/datum/sprite_accessory/tail/taur/fatwolf
/datum/sprite_accessory/tail/taur/wolf/fatwolf
name = "Fat Wolf (Taur)"
icon_state = "fatwolf_s"
icon_sprite_tag = "wolf" //This could be modified later.
@@ -83,7 +83,7 @@
extra_overlay2 = "synthwolf_glow"
//icon_sprite_tag = "synthwolf"
/datum/sprite_accessory/tail/taur/ch/wolf/fatsynthwolf
/datum/sprite_accessory/tail/taur/wolf/fatsynthwolf
name = "Fat SynthWolf dual-color (Taur)"
icon_state = "fatsynthwolf_s"
extra_overlay = "fatsynthwolf_markings"
@@ -219,11 +219,11 @@
extra_overlay = "lizard_markings"
//icon_sprite_tag = "lizard2c"
/datum/sprite_accessory/tail/taur/ch/lizard/fat
/datum/sprite_accessory/tail/taur/lizard/fatlizard
name = "Fat Lizard (Taur)"
icon_state = "fatlizard_s"
/datum/sprite_accessory/tail/taur/ch/lizard/fat_2c
/datum/sprite_accessory/tail/taur/lizard/fatlizard_2c
name = "Fat Lizard (Taur, dual-color)"
icon_state = "fatlizard_s"
extra_overlay= "fatlizard_markings"
@@ -235,7 +235,7 @@
extra_overlay2 = "synthlizard_glow"
//icon_sprite_tag = "synthlizard"
/datum/sprite_accessory/tail/taur/ch/lizard/fatsynthlizard
/datum/sprite_accessory/tail/taur/lizard/fatsynthlizard
name = "Fat SynthLizard dual-color (Taur)"
icon_state = "fatsynthlizard_s"
extra_overlay = "fatsynthlizard_markings"
@@ -326,7 +326,7 @@
extra_overlay2 = "synthfeline_glow"
//icon_sprite_tag = "synthfeline"
/datum/sprite_accessory/tail/taur/ch/feline/fatsynthfeline
/datum/sprite_accessory/tail/taur/feline/fatsynthfeline
name = "Fat SynthFeline dual-color (Taur)"
icon_state = "fatsynthfeline_s"
extra_overlay = "fatsynthfeline_markings"
code/modules/mob/new_player/sprite_accessories_vr.dm
-58
View File
@@ -243,64 +243,6 @@
icon_state = "hair_fingerwave"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
//Teshari things
/datum/sprite_accessory/hair/teshari
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_altdefault
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_tight
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_excited
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_spike
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_long
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_burst
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_shortburst
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_mohawk
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_pointy
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_upright
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_mane
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_droopy
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_mushroom
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_twies
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_backstrafe
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_longway
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_tree
icon_add = 'icons/mob/human_face_vr_add.dmi'
/datum/sprite_accessory/hair/teshari_fluffymohawk
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
//Skrell 'hairstyles' - these were requested for a chimera and screw it, if one wants to eat seafood, go nuts
/datum/sprite_accessory/hair/skr_tentacle_veryshort
code/modules/mob/typing_indicator.dm
+19 -2
View File
@@ -40,7 +40,7 @@
set hidden = 1
set_typing_indicator(TRUE)
var/message = input(usr, "","say (text)") as text
var/message = tgui_input_text(usr, "Type your message:", "Say")
set_typing_indicator(FALSE)
if(message)
@@ -51,8 +51,25 @@
set hidden = 1
set_typing_indicator(TRUE)
var/message = input(usr, "","me (text)") as message //VOREStation Edit
var/message = tgui_input_message(usr, "Type your message:", "Emote")
set_typing_indicator(FALSE)
if(message)
me_verb(message)
// No typing indicators here, but this is the file where the wrappers are, so...
/mob/verb/whisper_wrapper()
set name = ".Whisper"
set hidden = 1
var/message = tgui_input_text(usr, "Type your message:", "Whisper")
if(message)
whisper(message)
/mob/verb/subtle_wrapper()
set name = ".Subtle"
set hidden = 1
var/message = tgui_input_message(usr, "Type your message:", "Subtle")
if(message)
me_verb_subtle(message)