cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/VOREStation/master' into ds9-uniforms

Browse Source
This commit is contained in:
Poojawa
2017-03-05 03:53:57 -06:00
parent 5fdbaceb44 0b060ece54
commit ec3056466c
4 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
View File

@@ -4,27 +4,27 @@
//KHI Uniforms //KHI Uniforms
/datum/gear/uniform/job_khi/cmd /datum/gear/uniform/job_khi/cmd
display_name = "kin uniform, cmd" display_name = "khi uniform, cmd"
path = /obj/item/clothing/under/rank/khi/cmd path = /obj/item/clothing/under/rank/khi/cmd
allowed_roles = list("Colony Director","Head of Personnel") allowed_roles = list("Colony Director","Head of Personnel")
/datum/gear/uniform/job_khi/sec /datum/gear/uniform/job_khi/sec
display_name = "kin uniform, sec" display_name = "khi uniform, sec"
path = /obj/item/clothing/under/rank/khi/sec path = /obj/item/clothing/under/rank/khi/sec
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer") allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
/datum/gear/uniform/job_khi/med /datum/gear/uniform/job_khi/med
display_name = "kin uniform, med" display_name = "khi uniform, med"
path = /obj/item/clothing/under/rank/khi/med path = /obj/item/clothing/under/rank/khi/med
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist") allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist")
/datum/gear/uniform/job_khi/eng /datum/gear/uniform/job_khi/eng
display_name = "kin uniform, eng" display_name = "khi uniform, eng"
path = /obj/item/clothing/under/rank/khi/eng path = /obj/item/clothing/under/rank/khi/eng
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer")
/datum/gear/uniform/job_khi/sci /datum/gear/uniform/job_khi/sci
display_name = "kin uniform, sci" display_name = "khi uniform, sci"
path = /obj/item/clothing/under/rank/khi/sci path = /obj/item/clothing/under/rank/khi/sci
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist") allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist")

17
code/modules/mob/living/carbon/human/emote_vr.dm
View File

@@ -2,7 +2,7 @@
switch(act) switch(act)
if ("mlem") if ("mlem")
message = "mlems their tongue up over their nose. Mlem." message = "mlems [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] tongue up over [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] nose. Mlem."
m_type = 1 m_type = 1
if ("awoo") if ("awoo")
message = "awoos loudly. AwoooOOOOoooo!" message = "awoos loudly. AwoooOOOOoooo!"
@@ -14,7 +14,7 @@
var/obj/item/organ/external/E = get_organ(organ_name) var/obj/item/organ/external/E = get_organ(organ_name)
if(!E || E.is_stump() || E.splinted || (E.status & ORGAN_BROKEN)) if(!E || E.is_stump() || E.splinted || (E.status & ORGAN_BROKEN))
involved_parts -= organ_name involved_parts -= organ_name
danger += 2 danger += 5 //Add 5% to the chance for each problem limb
//Taurs are harder to flip //Taurs are harder to flip
if(istype(tail_style, /datum/sprite_accessory/tail/taur)) if(istype(tail_style, /datum/sprite_accessory/tail/taur))
@@ -33,9 +33,16 @@
spawn(10) //Stick the landing. spawn(10) //Stick the landing.
var/breaking = pick(involved_parts) var/breaking = pick(involved_parts)
var/obj/item/organ/external/E = get_organ(breaking) var/obj/item/organ/external/E = get_organ(breaking)
src.Weaken(5) if(isSynthetic())
E.fracture() src.Weaken(5)
log_and_message_admins("broke their [breaking] with *flip, ahahah.", src) E.droplimb(1,DROPLIMB_EDGE)
message += " <span class='danger'>And loses a limb!</span>"
log_and_message_admins("lost their [breaking] with *flip, ahahah.", src)
else
src.Weaken(5)
E.fracture()
message += " <span class='danger'>And breaks something!</span>"
log_and_message_admins("broke their [breaking] with *flip, ahahah.", src)
if (message) if (message)
log_emote("[name]/[key] : [message]") log_emote("[name]/[key] : [message]")

24
code/modules/vore/fluffstuff/custom_clothes_vr.dm
View File

@@ -803,48 +803,48 @@
item_state = "" item_state = ""
cmd //Command version cmd //Command version
name = "KIN command suit" name = "KHI command suit"
desc = "Kitsuhana Industrial Navy uniform. An extra-comfortable command one, at that. I guess if you DON'T want anarchy for some reason." desc = "Kitsuhana Heavy Industries uniform. An extra-comfortable command one, at that. I guess if you DON'T want anarchy for some reason."
icon_state = "khi_uniform_cmd_i" icon_state = "khi_uniform_cmd_i"
item_state = "khi_uniform_cmd" item_state = "khi_uniform_cmd"
worn_state = "khi_uniform_cmd" worn_state = "khi_uniform_cmd"
armor = list(melee = 5, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) armor = list(melee = 5, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
sec //Security version sec //Security version
name = "KIN security suit" name = "KHI security suit"
desc = "Kitsuhana Industrial Navy uniform. This one has angry red security stripes. Keepin' the peace in style." desc = "Kitsuhana Heavy Industries uniform. This one has angry red security stripes. Keepin' the peace in style."
icon_state = "khi_uniform_sec_i" icon_state = "khi_uniform_sec_i"
item_state = "khi_uniform_sec" item_state = "khi_uniform_sec"
worn_state = "khi_uniform_sec" worn_state = "khi_uniform_sec"
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
med //Medical version med //Medical version
name = "KIN medical suit" name = "KHI medical suit"
desc = "Kitsuhana Industrial Navy uniform. The medical version. Why not just get a new body, anyway?" desc = "Kitsuhana Heavy Industries uniform. The medical version. Why not just get a new body, anyway?"
icon_state = "khi_uniform_med_i" icon_state = "khi_uniform_med_i"
item_state = "khi_uniform_med" item_state = "khi_uniform_med"
worn_state = "khi_uniform_med" worn_state = "khi_uniform_med"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 50, rad = 5) armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 50, rad = 5)
eng //Engineering version eng //Engineering version
name = "KIN engineering suit" name = "KHI engineering suit"
desc = "Kitsuhana Industrial Navy uniform. One fit for an engineer, by the looks of it. Building the future, one disaster at a time." desc = "Kitsuhana Heavy Industries uniform. One fit for an engineer, by the looks of it. Building the future, one disaster at a time."
icon_state = "khi_uniform_eng_i" icon_state = "khi_uniform_eng_i"
item_state = "khi_uniform_eng" item_state = "khi_uniform_eng"
worn_state = "khi_uniform_eng" worn_state = "khi_uniform_eng"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10) armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10)
sci //Science version sci //Science version
name = "KIN science suit" name = "KHI science suit"
desc = "Kitsuhana Industrial Navy uniform. For performing science in, based on the color! Only SCIENCE can save us now." desc = "Kitsuhana Heavy Industries uniform. For performing science in, based on the color! Only SCIENCE can save us now."
icon_state = "khi_uniform_sci_i" icon_state = "khi_uniform_sci_i"
item_state = "khi_uniform_sci" item_state = "khi_uniform_sci"
worn_state = "khi_uniform_sci" worn_state = "khi_uniform_sci"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 5, bio = 0, rad = 5) armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 5, bio = 0, rad = 5)
fluff/aronai //Aro fluff version fluff/aronai //Aro fluff version
name = "KIN meditech suit" name = "KHI meditech suit"
desc = "Kitsuhana Industrial Navy uniform. This one has the colors of a resleeving or mnemonics engineer. It has 'Aronai' written inside the top." desc = "Kitsuhana Heavy Industries uniform. This one has the colors of a resleeving or mnemonics engineer. It has 'Aronai' written inside the top."
icon_state = "khi_uniform_aro_i" icon_state = "khi_uniform_aro_i"
item_state = "khi_uniform_aro" item_state = "khi_uniform_aro"
worn_state = "khi_uniform_aro" worn_state = "khi_uniform_aro"

2
vorestation.dme
View File

@@ -1253,6 +1253,7 @@
#include "code\modules\client\preference_setup\loadout\loadout_shoes.dm" #include "code\modules\client\preference_setup\loadout\loadout_shoes.dm"
#include "code\modules\client\preference_setup\loadout\loadout_smoking.dm" #include "code\modules\client\preference_setup\loadout\loadout_smoking.dm"
#include "code\modules\client\preference_setup\loadout\loadout_suit.dm" #include "code\modules\client\preference_setup\loadout\loadout_suit.dm"
#include "code\modules\client\preference_setup\loadout\loadout_suit_vr.dm"
#include "code\modules\client\preference_setup\loadout\loadout_uniform.dm" #include "code\modules\client\preference_setup\loadout\loadout_uniform.dm"
#include "code\modules\client\preference_setup\loadout\loadout_uniform_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_uniform_vr.dm"
#include "code\modules\client\preference_setup\loadout\loadout_utility.dm" #include "code\modules\client\preference_setup\loadout\loadout_utility.dm"
@@ -2055,6 +2056,7 @@
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Core.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Core.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Dispenser.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Dispenser.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Food-Drinks.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Food-Drinks.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Food-Drinks_vr.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Medicine.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Medicine.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Other.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Other.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Toxins.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Toxins.dm"