mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-28 15:48:49 +01:00
Fixes
Some fixes here and there to make the new vore updates not want to murder us
This commit is contained in:
izac112
@@ -190,11 +190,6 @@ var/global/list/datum/dna/gene/dna_genes[0]
|
||||
size_multiplier = player_sizes_list.Find(N)
|
||||
break
|
||||
|
||||
var/taurtype = /datum/sprite_accessory/tail/taur/spider
|
||||
if(istype(character.tail_style, taurtype))
|
||||
character.verbs += /mob/proc/weaveWebBindings
|
||||
|
||||
|
||||
// Technically custom_species is not part of the UI, but this place avoids merge problems.
|
||||
src.custom_species = character.custom_species
|
||||
if(istype(character.species,/datum/species/custom))
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
flags = PHORONGUARD //YAWN Edit
|
||||
|
||||
/obj/item/clothing/suit/space/rig
|
||||
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_FENNEC, SPECIES_XENOHYBRID SPECIES_GREY_YW/*ywedit*/)
|
||||
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_FENNEC, SPECIES_XENOHYBRID, SPECIES_GREY_YW/*ywedit*/)
|
||||
|
||||
/obj/item/clothing/shoes/magboots/rig/ce
|
||||
name = "advanced boots"
|
||||
|
||||
@@ -110,9 +110,9 @@ proc/get_radio_key_from_channel(var/channel)
|
||||
whispering = 1
|
||||
. = 1
|
||||
//VOREStation Edit End
|
||||
//YW Edit start
|
||||
//YW Edit start
|
||||
if(wingdings)
|
||||
message = span("wingdings",(message))
|
||||
S.message = span("wingdings",(S.message))
|
||||
. = 1
|
||||
//YW Edit End
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
return 'icons/vore/custom_onmob_yw.dmi'
|
||||
else
|
||||
return ..()
|
||||
*/yw edit end
|
||||
yw edit end*/
|
||||
|
||||
/mob/living/proc/weaveWebBindings()
|
||||
set name = "Weave Web Bindings"
|
||||
@@ -28,7 +28,7 @@
|
||||
src.visible_message("<span class='notice'>\the [src] pulls silk from their manibles and delicately weaves it into bindings.</span>")
|
||||
adjust_nutrition(-30)
|
||||
spawn(30) //5 seconds to weave the bindings~
|
||||
var/obj/item/clothing/suit/straight_jacket/web_bindings/bindings = new() //This sprite is amazing, I must say.
|
||||
var/obj/item/clothing/suit/web_bindings/bindings = new() //This sprite is amazing, I must say.
|
||||
src.put_in_hands(bindings)
|
||||
else
|
||||
to_chat(src, "You do not have enough nutrition to create webbing!") //CK~
|
||||
|
||||
@@ -570,7 +570,6 @@
|
||||
name = "Mocha's modkit"
|
||||
desc = "A kit containing all the needed tools and parts to modify a Explorer Suit"
|
||||
owner_ckey = "mocatheporg1"
|
||||
skip_contents = 1 //the hood is parts of the contents so we need to skip it
|
||||
|
||||
icon = 'icons/vore/custom_items_vr.dmi'
|
||||
icon_state = "modkit"
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
name = "Sheri's modkit"
|
||||
desc = "A kit containing all the needed tools and parts to modify a Research Director rig suit. It has a snake painted on it."
|
||||
owner_ckey = "esperkin"
|
||||
skip_contents = 1
|
||||
|
||||
icon = 'icons/vore/custom_items_vr.dmi'
|
||||
icon_state = "modkit"
|
||||
|
||||
@@ -54,12 +54,14 @@ var/const/SAR =(1<<14)
|
||||
economic_modifier = 7
|
||||
minimal_player_age = 7
|
||||
pto_type = PTO_EXPLORATION
|
||||
|
||||
access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_research, access_gateway, access_pathfinder)
|
||||
minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_research, access_gateway, access_pathfinder)
|
||||
outfit_type = /decl/hierarchy/outfit/job/pathfinder
|
||||
job_description = "The Pathfinder's job is to lead and manage expeditions, and is the primary authority on all off-station expeditions."
|
||||
|
||||
/datum/alt_title/pathfinder
|
||||
title = "Pathfinder"
|
||||
|
||||
/datum/job/pilot
|
||||
title = "Pilot"
|
||||
flag = PILOT
|
||||
@@ -73,12 +75,14 @@ var/const/SAR =(1<<14)
|
||||
economic_modifier = 5
|
||||
minimal_player_age = 3
|
||||
pto_type = PTO_EXPLORATION
|
||||
|
||||
access = list(access_pilot)
|
||||
minimal_access = list(access_pilot)
|
||||
outfit_type = /decl/hierarchy/outfit/job/pilot
|
||||
job_description = "A Pilot flies the various shuttles in the Borealis System."
|
||||
|
||||
/datum/alt_title/pilot
|
||||
title = "Pilot"
|
||||
|
||||
/datum/job/explorer
|
||||
title = "Explorer"
|
||||
flag = EXPLORER
|
||||
@@ -91,12 +95,14 @@ var/const/SAR =(1<<14)
|
||||
selection_color = "#999440"
|
||||
economic_modifier = 6
|
||||
pto_type = PTO_EXPLORATION
|
||||
|
||||
access = list(access_explorer, access_research)
|
||||
minimal_access = list(access_explorer, access_research)
|
||||
outfit_type = /decl/hierarchy/outfit/job/explorer2
|
||||
job_description = "An Explorer searches for interesting things, and returns them to the station."
|
||||
|
||||
/datum/alt_title/explorer
|
||||
title = "Explorer"
|
||||
|
||||
/datum/job/sar
|
||||
title = "Field Medic"
|
||||
flag = SAR
|
||||
@@ -110,19 +116,21 @@ var/const/SAR =(1<<14)
|
||||
economic_modifier = 6
|
||||
minimal_player_age = 3
|
||||
pto_type = PTO_EXPLORATION
|
||||
|
||||
access = list(access_medical, access_medical_equip, access_eva, access_maint_tunnels, access_external_airlocks, access_sar, access_chemistry) //restoring chemistry access. FMs need it to mix meds, and they're basically just glorified EMTs - who also have chemistry access.
|
||||
minimal_access = list(access_medical, access_medical_equip, access_eva, access_sar)
|
||||
outfit_type = /decl/hierarchy/outfit/job/medical/sar
|
||||
job_description = "A Field Medic works as the field doctor of expedition teams."
|
||||
|
||||
/datum/alt_title/field_medic
|
||||
title = "Field Medic"
|
||||
|
||||
/datum/job/offduty_exploration
|
||||
title = "Off-duty Explorer"
|
||||
latejoin_only = TRUE
|
||||
timeoff_factor = -1
|
||||
total_positions = -1
|
||||
faction = "Station"
|
||||
departments = list(DEPARTMENT_PLANET)
|
||||
departments = list(DEPARTMENT_OFFDUTY)
|
||||
supervisors = "nobody! Enjoy your time off"
|
||||
selection_color = "#999440"
|
||||
access = list(access_maint_tunnels, access_external_airlocks)
|
||||
@@ -130,3 +138,6 @@ var/const/SAR =(1<<14)
|
||||
outfit_type = /decl/hierarchy/outfit/job/assistant/explorer
|
||||
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
|
||||
pto_type = PTO_EXPLORATION
|
||||
|
||||
/datum/alt_title/offduty_exp
|
||||
title = "Off-duty Explorer"
|
||||
@@ -2314,9 +2314,7 @@
|
||||
/turf/simulated/wall,
|
||||
/area/residential/lobby)
|
||||
"gY" = (
|
||||
/obj/machinery/power/smes/magical{
|
||||
output_level = 1e+006;
|
||||
output_level_max = 1e+006
|
||||
/obj/machinery/power/debug_items/infinite_generator{
|
||||
},
|
||||
/obj/structure/cable,
|
||||
/turf/simulated/floor/plating,
|
||||
|
||||
@@ -747,7 +747,6 @@
|
||||
#include "code\game\jobs\job\department_vr.dm"
|
||||
#include "code\game\jobs\job\engineering.dm"
|
||||
#include "code\game\jobs\job\engineering_vr.dm"
|
||||
#include "code\game\jobs\job\exploration_vr.dm"
|
||||
#include "code\game\jobs\job\job.dm"
|
||||
#include "code\game\jobs\job\job_vr.dm"
|
||||
#include "code\game\jobs\job\medical.dm"
|
||||
|
||||
Reference in New Issue
Block a user