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

Merge branch 'master' into nova-ert

Browse Source
This commit is contained in:
Novacat
2019-03-30 13:01:14 -04:00
committed by GitHub
parent 527b7a760d a2ca1346c8
commit d0672ec8a1
32 changed files with 383 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/inventory.dm
+3 -1
View File
@@ -82,6 +82,8 @@ This saves us from having to call add_fingerprint() any time something is put in
if(slot_tie)
return 1
/obj/item/var/suitlink = 1 //makes belt items require a jumpsuit- set individual items to suitlink = 0 to allow wearing on belt slot without suit
/mob/living/carbon/human/u_equip(obj/W as obj)
if(!W) return 0
@@ -98,7 +100,7 @@ This saves us from having to call add_fingerprint() any time something is put in
drop_from_inventory(l_store)
if (wear_id)
drop_from_inventory(wear_id)
if (belt)
if (belt && belt.suitlink == 1)
worn_clothing -= belt
drop_from_inventory(belt)
worn_clothing -= w_uniform
code/modules/mob/living/carbon/human/species/station/station_special_vr.dm
+1
View File
@@ -66,6 +66,7 @@
base_color = "#333333"
blood_color = "#14AD8B"
reagent_tag = IS_CHIMERA
/datum/species/xenochimera/handle_environment_special(var/mob/living/carbon/human/H)
//If they're KO'd/dead, they're probably not thinking a lot about much of anything.
code/modules/mob/living/carbon/human/species/station/station_vr.dm
+2 -8
View File
@@ -37,8 +37,6 @@
flesh_color = "#AFA59E"
base_color = "#777777"
reagent_tag = IS_SERGAL
heat_discomfort_strings = list(
"Your fur prickles in the heat.",
"You feel uncomfortably warm.",
@@ -99,8 +97,6 @@
base_color = "#777777"
blood_color = "#1D2CBF"
reagent_tag = IS_AKULA
/datum/species/akula/can_breathe_water()
return TRUE // Surprise, SHERKS.
@@ -140,8 +136,6 @@
flesh_color = "#AFA59E"
base_color = "#333333"
reagent_tag = IS_SERGAL
heat_discomfort_strings = list(
"Your fur prickles in the heat.",
"You feel uncomfortably warm.",
@@ -320,8 +314,8 @@
color_mult = 1
min_age = 18
gluttonous = 0 //Moving this here so I don't have to fix this conflict every time polaris glances at station.dm
inherent_verbs = list(/mob/living/proc/shred_limb, /mob/living/carbon/human/proc/lick_wounds)
heat_discomfort_level = 294 //Prevents heat discomfort spam at 20c
inherent_verbs = list(/mob/living/proc/shred_limb)
heat_discomfort_level = 295 //Prevents heat discomfort spam at 20c
/datum/species/skrell
spawn_flags = SPECIES_CAN_JOIN
code/modules/mob/new_player/sprite_accessories_vr.dm
+25
View File
@@ -209,6 +209,31 @@
icon_state = "hair_messy"
species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN)
taj_ears_curls
name = "Tajaran Curly"
icon_state = "hair_curly"
species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN)
taj_ears_wife
name = "Tajaran Housewife"
icon_state = "hair_wife"
species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN)
taj_ears_victory
name = "Tajaran Victory Curls"
icon_state = "hair_victory"
species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN)
taj_ears_bob
name = "Tajaran Bob"
icon_state = "hair_tbob"
species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN)
taj_ears_fingercurl
name = "Tajaran Finger Curls"
icon_state = "hair_fingerwave"
species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN)
teshari_fluffymohawk
name = "Teshari Fluffy Mohawk"
icon = 'icons/mob/human_face_vr.dmi'