mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Compiler Fixes
Fixes in order: - Removes List of defines in misc_ch.dm that are no longer used - they're defined here for the casino prize dispenser, making these obsolete:  - Fixes relative pathing in mecha_parts_ch.dm - Fixes relative pathing in bodybag.dm - Fixes relative pathing in sahoc_ch.dm - Fixes relative pathing in toys_yw.dm - Fixes def_zone being defined when only the variable was needed in twohanded_ch.dm - Fixes relative pathing in trash_pile_vr_ch.dm - Fixes clip_mask being missing in misc_ch.dm - Fixes relative pathing in tesh_synth_facemask.dm - Fixes absolute path being indented in by one (typo?) - Fixes relative pathing in armor_yw.dm - Fixes unreachable parent call in audible_scream_ch.dm - Fixes VERM_LIZARDS being undefined when it wasn't defined, as VERM_LIZARDMEN was the variable being defined + used in mutants.dm - Removes two un-needed parent calls - these procs have no parent on /obj/structure - thecake_ch.dm - Fixes invalid kword nano_state in protean_blob.dm - Fixes relative pathing in drone_manufacturer_unify.dm - Fixes relative pathing in synx.dm - Removes arguments of drop_item that don't exist (port was from TG and had force_drop = 1 and src defined.) - vox.dm - Added vision_required = TRUE to fix proc argument missing - bigdragon_ch.dm - Added include_robo = TRUE to fix argument missing in demon_ch.dm - Fixes relative pathing in rakshasa_abilities.dm - Adds comment to solargrub.dm, unable to fix operator overload error yet. - Fixes relative pathing in sprite_accessories_extra_ch.dm - Fixes relative pathing in sprite_accessories_yw.dm - Fixes relative pathing in phase.dm - Fixes relative pathing in bluespacecoffee.dm - Fixes relative pathing in other_ch.dm - Fixes relative pathing and ambigious ! in living_ch.dm - Fixes relative pathing in custom_clothes_yw.dm - Fixes relative pathing in custom_rigs_yw.dm - Fixes relative pathing in MadokaSpear.dm - Comments out duplicate #includes in southern_cross.dm as vorestation.dme has them #include'd.
This commit is contained in:
Rykka
@@ -9,10 +9,3 @@
|
||||
#define MAT_CARPET_PINK "pink carpet"
|
||||
#define MAT_CARPET_PURPLE "purple carpet"
|
||||
#define MAT_CARPET_ORANGE "orange carpet"
|
||||
|
||||
//Casino prize dispenser stuff
|
||||
#define CAT_WEAPONS 1
|
||||
#define CAT_GEAR 2
|
||||
#define CAT_CLOTHING 4
|
||||
#define CAT_MISC 8
|
||||
#define CAT_DRINKS 16
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
icon = 'icons/mecha/mech_construct_ch.dmi'
|
||||
icon_state = "scarab_chassis"
|
||||
|
||||
New()
|
||||
/obj/item/mecha_parts/chassis/scarab/New()
|
||||
..()
|
||||
construct = new /datum/construction/mecha/scarab_chassis(src)
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
icon = 'icons/obj/closets/bodybag_large.dmi'
|
||||
w_class = ITEMSIZE_LARGE
|
||||
|
||||
attack_self(mob/user)
|
||||
/obj/item/bodybag/large/attack_self(mob/user)
|
||||
var/obj/structure/closet/body_bag/large/R = new /obj/structure/closet/body_bag/large(user.loc)
|
||||
R.add_fingerprint(user)
|
||||
qdel(src)
|
||||
|
||||
@@ -12,18 +12,18 @@
|
||||
var/mob/living/capsuleowner = null //taken from Capsule Code
|
||||
var/sizetouse = 0.25
|
||||
|
||||
pickup(mob/user)
|
||||
/obj/item/device/buttonofnormal/pickup(mob/user)
|
||||
if(!capsuleowner)
|
||||
capsuleowner = user
|
||||
|
||||
attack_self(mob/user)
|
||||
/obj/item/device/buttonofnormal/attack_self(mob/user)
|
||||
if(colorindex)
|
||||
nonrandom()
|
||||
sleep(10)
|
||||
capsuleowner.resize(sizetouse)
|
||||
sizetouse = rand(25,200)/100 //randmization occurs after press
|
||||
|
||||
throw_impact(atom/A, speed, mob/user)
|
||||
/obj/item/device/buttonofnormal/throw_impact(atom/A, speed, mob/user)
|
||||
..()
|
||||
if(isliving(A))
|
||||
if(colorindex)
|
||||
@@ -33,7 +33,7 @@
|
||||
capsulehit.resize(sizetouse)
|
||||
sizetouse = rand(25,200)/100 //randmization occurs after press
|
||||
|
||||
attackby(obj/item/W, mob/user)
|
||||
/obj/item/device/buttonofnormal/attackby(obj/item/W, mob/user)
|
||||
if(istype(W, /obj/item/weapon/pen))
|
||||
colorindex = (colorindex + 1) % 6
|
||||
icon_state = "mobcap[colorindex]"
|
||||
@@ -69,7 +69,7 @@
|
||||
/obj/item/weapon/reagent_containers/syringe/drugs,
|
||||
)
|
||||
|
||||
attackby(obj/item/W, mob/user)
|
||||
/obj/item/device/daredevice/attackby(obj/item/W, mob/user)
|
||||
if(istype(W, /obj/item/weapon/pen))
|
||||
colorindex += 1
|
||||
if(colorindex >= 6)
|
||||
@@ -78,7 +78,7 @@
|
||||
update_icon()
|
||||
..()
|
||||
|
||||
attack_self(mob/user)
|
||||
/obj/item/device/daredevice/attack_self(mob/user)
|
||||
var/mob/living/capsuleowner = user
|
||||
playsound(src, 'sound/effects/splat.ogg', 30, 1)
|
||||
var/item = pick(winitems)
|
||||
@@ -132,7 +132,7 @@
|
||||
"#0F0F0F",
|
||||
)
|
||||
|
||||
on_hit(var/atom/target)
|
||||
/obj/item/projectile/beam/sizelaser/chaos/on_hit(var/atom/target)
|
||||
light_color = pick(chaos_colors)
|
||||
var/chaos = rand(25,200)
|
||||
var/mob/living/M = target
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
slot_back_str = 'icons/mob/toy_worn_yw.dmi',
|
||||
slot_head_str = 'icons/mob/toy_worn_yw.dmi')
|
||||
|
||||
rename_plushie()
|
||||
/obj/item/toy/plushie/teshari/strix/rename_plushie()
|
||||
set name = "Name Plushie"
|
||||
set category = "Object"
|
||||
set desc = "Give your plushie a cute name!"
|
||||
@@ -39,7 +39,7 @@
|
||||
slot_head_str = 'icons/vore/custom_onmob_yw.dmi')
|
||||
|
||||
|
||||
rename_plushie()
|
||||
/obj/item/toy/plushie/teshari/eili/rename_plushie()
|
||||
set name = "Name Plushie"
|
||||
set category = "Object"
|
||||
set desc = "Give your plushie a cute name!"
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
G.dust()
|
||||
return
|
||||
else
|
||||
G.stun_effect_act(10 , 50,def_zone = BP_TORSO, src)
|
||||
G.stun_effect_act(10 , 50, BP_TORSO, src)
|
||||
G.take_organ_damage(10)
|
||||
G.Paralyse(20)
|
||||
playsound(src.loc, "sparks", 50, 1)
|
||||
|
||||
@@ -28,28 +28,28 @@
|
||||
var/gammaunique = 1
|
||||
|
||||
|
||||
Initialize()
|
||||
/obj/structure/trash_pile/sharkpile/Initialize()
|
||||
..()
|
||||
if(prob(destroychance))
|
||||
qdel(src)
|
||||
|
||||
//^X% chance to use our own list, otherwise default pool.
|
||||
//Here we could also add a % chance to spawn a mob for trash pandas or such,
|
||||
produce_alpha_item()
|
||||
/obj/structure/trash_pile/sharkpile/produce_alpha_item()
|
||||
if(prob(overridechancealpha))
|
||||
var/path = pick(alphapicks)
|
||||
var/obj/item/I = new path()
|
||||
return I
|
||||
return ..()
|
||||
|
||||
produce_beta_item()
|
||||
/obj/structure/trash_pile/sharkpile/produce_beta_item()
|
||||
if(prob(overridechancebeta))
|
||||
var/path = pick(betapicks)
|
||||
var/obj/item/I = new path()
|
||||
return I
|
||||
return ..()
|
||||
|
||||
produce_gamma_item()
|
||||
/obj/structure/trash_pile/sharkpile/produce_gamma_item()
|
||||
if(prob(overridechancegamma)&& gammaunique!=2)
|
||||
var/path = pick(gammapicks)
|
||||
var/obj/item/I = new path()
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
desc = "It's a hat, it flails."
|
||||
body_parts_covered = 0
|
||||
|
||||
/obj/item/clothing/head/wiggler/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer)
|
||||
/obj/item/clothing/head/wiggler/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer,var/icon/clip_mask = null)
|
||||
var/image/so_far = ..()
|
||||
so_far.pixel_y += 16
|
||||
so_far.pixel_x += 0
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
var/lstat
|
||||
var/mob/living/carbon/maskmaster
|
||||
|
||||
equipped()
|
||||
/obj/item/clothing/mask/synthfacemask/equipped()
|
||||
..()
|
||||
var/mob/living/carbon/human/H = loc
|
||||
if(istype(H) && H.wear_mask == src)
|
||||
@@ -18,17 +18,17 @@
|
||||
maskmaster = H
|
||||
START_PROCESSING(SSprocessing, src)
|
||||
|
||||
dropped()
|
||||
/obj/item/clothing/mask/synthfacemask/dropped()
|
||||
canremove = 1
|
||||
maskmaster = null
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
return ..()
|
||||
|
||||
Destroy()
|
||||
/obj/item/clothing/mask/synthfacemask/Destroy()
|
||||
. = ..()
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
|
||||
mob_can_equip(var/mob/living/carbon/human/user, var/slot)
|
||||
/obj/item/clothing/mask/synthfacemask/mob_can_equip(var/mob/living/carbon/human/user, var/slot, var/disable_warning = FALSE)
|
||||
if (!..())
|
||||
return 0
|
||||
if(istype(user))
|
||||
@@ -37,13 +37,14 @@
|
||||
return 1
|
||||
user << "<span class='warning'>You must have a compatible robotic head to install this upgrade.</span>"
|
||||
return 0
|
||||
update_icon()
|
||||
|
||||
/obj/item/clothing/mask/synthfacemask/update_icon()
|
||||
var/mob/living/carbon/human/H = loc
|
||||
if (maskmaster && maskmaster.stat == DEAD) icon_state = "synth_facemask_dead"
|
||||
else icon_state = "synth_facemask"
|
||||
if(istype(H)) H.update_inv_wear_mask()
|
||||
|
||||
process()
|
||||
/obj/item/clothing/mask/synthfacemask/process()
|
||||
if(maskmaster && lstat != maskmaster.stat)
|
||||
lstat = maskmaster.stat
|
||||
update_icon()
|
||||
|
||||
@@ -115,7 +115,7 @@
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
||||
|
||||
//Deluxe explorer suit
|
||||
/obj/item/clothing/suit/armor/pcarrier/explorer/deluxe
|
||||
/obj/item/clothing/suit/armor/pcarrier/explorer/deluxe
|
||||
name = "modular explorer suit"
|
||||
desc = "A modification of the explorer suit with a modular armor system. Requires you to insert armor plates."
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
flags_inv = HIDEHOLSTER
|
||||
open = 1
|
||||
|
||||
toggle()
|
||||
/obj/item/clothing/suit/storage/toggle/yw/secjacket/toggle()
|
||||
set name = "Toggle Coat Buttons"
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/decl/emote/audible/scream/get_emote_sound(var/atom/user)
|
||||
..()
|
||||
var/mob/living/carbon/human/H = user
|
||||
if(H.get_gender() == FEMALE)
|
||||
return list(
|
||||
@@ -10,4 +11,3 @@
|
||||
"sound" = H.species.male_scream_sound,
|
||||
"vol" = emote_volume
|
||||
)
|
||||
return ..()
|
||||
@@ -97,4 +97,4 @@
|
||||
#undef LOC_HANGAR3
|
||||
|
||||
#undef VERM_RATS
|
||||
#undef VERM_LIZARDS
|
||||
#undef VERM_LIZARDMEN
|
||||
|
||||
@@ -112,7 +112,6 @@
|
||||
result = /obj/item/weapon/thecake_layer/five
|
||||
|
||||
/obj/structure/thecake/proc/HasSliceMissing()
|
||||
..()
|
||||
if(slices < maxslices)
|
||||
if(interval >= regentime)
|
||||
interval = 0
|
||||
@@ -400,7 +399,6 @@
|
||||
layer_stage = 8
|
||||
|
||||
/obj/structure/chaoscake/proc/HasSliceMissing()
|
||||
..()
|
||||
if(slices < maxslices)
|
||||
if(interval >= regentime)
|
||||
interval = 0
|
||||
|
||||
@@ -477,7 +477,7 @@ var/global/list/disallowed_protean_accessories = list(
|
||||
if(istype(loc, /obj/item/weapon/rig/protean))
|
||||
var/obj/item/weapon/rig/protean/prig = loc
|
||||
to_chat(src, "You attempt to interface with the [prig].")
|
||||
prig.ui_interact(src, nano_state = interactive_state)
|
||||
prig.ui_interact(src, interactive_state)
|
||||
else
|
||||
to_chat(src, "You are not in RIG form.")
|
||||
//CHOMP Add end
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
"Maintenance Module" = /mob/living/silicon/robot/drone,
|
||||
) //List of drone types to choose from.//Changeable in mapping.
|
||||
|
||||
create_drone(var/client/player)
|
||||
/obj/machinery/drone_fabricator/unify/create_drone(var/client/player)
|
||||
choose_dronetype(possible_drones) //Call Drone choice before executing create_drone
|
||||
..()
|
||||
|
||||
|
||||
@@ -385,7 +385,7 @@
|
||||
if(voices && prob(speak_chance/2))
|
||||
randomspeech()
|
||||
|
||||
/mob/living/simple_mob/animal/synx/perform_the_nom() //Synx can only eat people if their organs are on the inside.
|
||||
/mob/living/simple_mob/animal/synx/perform_the_nom(mob/living/user, mob/living/prey, mob/living/pred, obj/belly/belly, delay) //Synx can only eat people if their organs are on the inside.
|
||||
if(stomach_distended)
|
||||
to_chat(src,"<span class='notice'>You can't eat people without your stomach inside of you!</span>")
|
||||
return
|
||||
@@ -701,7 +701,7 @@
|
||||
faction = "SYN"
|
||||
|
||||
|
||||
New()
|
||||
/mob/living/simple_mob/animal/synx/ai/pet/greed/synth/New()
|
||||
..()
|
||||
name = "SYN-KinC-([rand(100,999)])"
|
||||
|
||||
|
||||
@@ -122,7 +122,7 @@
|
||||
|
||||
/mob/living/simple_mob/vox/armalis/attackby(var/obj/item/O as obj, var/mob/user as mob)
|
||||
if(istype(O,/obj/item/vox/armalis_armour))
|
||||
user.drop_item(O, src, force_drop = 1)
|
||||
user.drop_item(O)
|
||||
armour = O
|
||||
movement_cooldown = 4
|
||||
maxHealth += 200
|
||||
@@ -131,7 +131,7 @@
|
||||
regenerate_icons()
|
||||
return
|
||||
if(istype(O,/obj/item/vox/armalis_amp))
|
||||
user.drop_item(O, src, force_drop = 1)
|
||||
user.drop_item(O)
|
||||
amp = O
|
||||
visible_message("<span class='notice'>[src] is quickly outfitted in [O] by [user].</span>","<span class='notice'>You quickly outfit [src] in [O].</span>")
|
||||
regenerate_icons()
|
||||
|
||||
@@ -981,7 +981,7 @@ I think I covered everything.
|
||||
holder.a_intent = I_HURT
|
||||
return 1
|
||||
|
||||
/datum/ai_holder/simple_mob/healbelly/retaliate/dragon/can_attack(atom/movable/the_target)
|
||||
/datum/ai_holder/simple_mob/healbelly/retaliate/dragon/can_attack(atom/movable/the_target, vision_required = TRUE)
|
||||
if(istype(holder,/mob/living/simple_mob/vore/bigdragon))
|
||||
var/mob/living/simple_mob/vore/bigdragon/BG = holder
|
||||
if(holder.IIsAlly(the_target))
|
||||
|
||||
@@ -147,7 +147,7 @@
|
||||
//Fire heals demons instead.
|
||||
//This should include all fire sources assuming they dont weirdly make their own damage handling.
|
||||
//Yes this also means that negative fire is bad for them...
|
||||
/mob/living/simple_mob/vore/demon/adjustFireLoss(amount)
|
||||
/mob/living/simple_mob/vore/demon/adjustFireLoss(amount,include_robo = TRUE)
|
||||
amount = 0 - amount
|
||||
src.adjustBruteLoss(amount)
|
||||
..()
|
||||
@@ -276,7 +276,7 @@
|
||||
cost = 0
|
||||
shift_mode = SHIFTED_OR_NOT
|
||||
ab_sound = 'sound/effects/stealthoff.ogg'
|
||||
obj/effect/rakshasa_ability/flicker/do_ability()
|
||||
/obj/effect/rakshasa_ability/flicker/do_ability()
|
||||
if(!..())
|
||||
return
|
||||
my_kin.rakshasa_flicker()
|
||||
|
||||
@@ -99,7 +99,7 @@ var/global/list/moth_amount = 0 // Chompstation Addition, Rykka waz here. *pawst
|
||||
PN = null
|
||||
|
||||
// CHOMPEDIT Start, Rykka waz here. *pawstamp*
|
||||
if(prob(1) && charge >= 32000 && can_evolve == 1 && moth_amount <= 1) //it's reading from the moth_amount global list to determine if it can evolve.
|
||||
if(prob(1) && charge >= 32000 && can_evolve == 1 && moth_amount <= 1) //it's reading from the moth_amount global list to determine if it can evolve. There should only ever be a maxcap of 1 existing solar moth alive at any time. TODO: make the code decrease the list after 1 has spawned this shift.
|
||||
anchored = 0
|
||||
PN = attached.powernet
|
||||
release_vore_contents()
|
||||
|
||||
@@ -1,142 +1,142 @@
|
||||
/datum/sprite_accessory/marking/ch
|
||||
icon = 'icons/mob/human_races/markings_ch.dmi'
|
||||
orca_head
|
||||
/datum/sprite_accessory/marking/ch/orca_head
|
||||
name = "Orca head"
|
||||
icon_state = "orca_head"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD)
|
||||
species_allowed = list(SPECIES_AKULA)
|
||||
|
||||
orca_body
|
||||
/datum/sprite_accessory/marking/ch/orca_body
|
||||
name = "Orca body(female)"
|
||||
icon_state = "orca_body"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_TORSO)
|
||||
species_allowed = list(SPECIES_AKULA)
|
||||
|
||||
orca_legs
|
||||
/datum/sprite_accessory/marking/ch/orca_legs
|
||||
name = "Orca legs"
|
||||
icon_state = "orca_leg"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_L_LEG,BP_R_LEG)
|
||||
species_allowed = list(SPECIES_AKULA)
|
||||
|
||||
orca_arms
|
||||
/datum/sprite_accessory/marking/ch/orca_arms
|
||||
name = "Orca arms"
|
||||
icon_state = "orca_arm"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_L_ARM,BP_R_ARM)
|
||||
species_allowed = list(SPECIES_AKULA)
|
||||
|
||||
zangoose_belly
|
||||
/datum/sprite_accessory/marking/ch/zangoose_belly
|
||||
name = "Mongoose Cat Belly Marking"
|
||||
icon_state = "test"
|
||||
body_parts = list(BP_TORSO)
|
||||
species_allowed = list(SPECIES_HUMAN, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE) //This lets all races use the default hairstyles.
|
||||
|
||||
head_paint_front
|
||||
/datum/sprite_accessory/marking/ch/head_paint_front
|
||||
name = "Head Paint Front"
|
||||
icon_state = "paintfront"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD)
|
||||
|
||||
head_paint_back
|
||||
/datum/sprite_accessory/marking/ch/head_paint_back
|
||||
name = "Head Paint"
|
||||
icon_state = "paint"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD)
|
||||
|
||||
athena_lights
|
||||
/datum/sprite_accessory/marking/ch/athena_lights
|
||||
name = "Hephaestus - Athena lights"
|
||||
icon_state = "athena"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_HEAD)
|
||||
|
||||
athena_panels
|
||||
/datum/sprite_accessory/marking/ch/athena_panels
|
||||
name = "Hephaestus - Athena FBP Panels"
|
||||
icon_state = "athena_p"
|
||||
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)
|
||||
|
||||
athena_panels_body
|
||||
/datum/sprite_accessory/marking/ch/athena_panels_body
|
||||
name = "Hephaestus - Athena FBP Panels (body)"
|
||||
icon_state = "athena_p"
|
||||
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)
|
||||
|
||||
athena_panels_head
|
||||
/datum/sprite_accessory/marking/ch/athena_panels_head
|
||||
name = "Hephaestus - Athena FBP Panels (head)"
|
||||
icon_state = "athena_p"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD)
|
||||
|
||||
rook_lights
|
||||
/datum/sprite_accessory/marking/ch/rook_lights
|
||||
name = "Bishop - Rook lights"
|
||||
icon_state = "rook-l"
|
||||
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)
|
||||
|
||||
rook_lights_body
|
||||
/datum/sprite_accessory/marking/ch/rook_lights_body
|
||||
name = "Bishop - Rook lights (body)"
|
||||
icon_state = "rook-l"
|
||||
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)
|
||||
|
||||
rook_lights_head
|
||||
/datum/sprite_accessory/marking/ch/rook_lights_head
|
||||
name = "Bishop - Rook lights (head)"
|
||||
icon_state = "rook-l"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD)
|
||||
|
||||
grointojaw
|
||||
/datum/sprite_accessory/marking/ch/grointojaw
|
||||
name = "Groin to mouth marking"
|
||||
icon_state = "grointojaw"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_TORSO, BP_HEAD, BP_GROIN)
|
||||
|
||||
vale_eyes
|
||||
/datum/sprite_accessory/marking/ch/vale_eyes
|
||||
name = "VALE Eyes"
|
||||
icon_state = "vale_eyes"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD)
|
||||
|
||||
vale_belly
|
||||
/datum/sprite_accessory/marking/ch/vale_belly
|
||||
name = "VALE Belly"
|
||||
icon_state = "vale_belly"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_TORSO, BP_GROIN)
|
||||
|
||||
vale_back
|
||||
/datum/sprite_accessory/marking/ch/vale_back
|
||||
name = "VALE Back"
|
||||
icon_state = "vale_back"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_TORSO)
|
||||
|
||||
vulp_skull
|
||||
/datum/sprite_accessory/marking/ch/vulp_skull
|
||||
name = "Vulp Skullface"
|
||||
icon_state = "vulpskull"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD)
|
||||
|
||||
manedwolf1
|
||||
/datum/sprite_accessory/marking/ch/manedwolf1
|
||||
name = "Maned Wolf Primary Markings"
|
||||
icon_state = "manedwolf1"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD,BP_TORSO,BP_R_ARM,BP_L_ARM,BP_R_HAND,BP_L_HAND,BP_R_LEG,BP_L_LEG,BP_R_FOOT,BP_L_FOOT)
|
||||
|
||||
manedwolf2
|
||||
/datum/sprite_accessory/marking/ch/manedwolf2
|
||||
name = "Maned Wolf Secondary Markings"
|
||||
icon_state = "manedwolf2"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD,BP_TORSO,BP_GROIN)
|
||||
|
||||
voxbeak2
|
||||
/datum/sprite_accessory/marking/ch/voxbeak2
|
||||
name = "Vox Beak (Normal)"
|
||||
icon_state = "vox_beak"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD)
|
||||
|
||||
voxtalons
|
||||
/datum/sprite_accessory/marking/ch/voxtalons
|
||||
name = "Vox Talons"
|
||||
icon_state = "vox_talons"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
@@ -155,12 +155,12 @@
|
||||
/datum/sprite_accessory/hair/ch
|
||||
icon = 'icons/mob/human_face_ch.dmi'
|
||||
icon_add = 'icons/mob/human_face_ch_add.dmi'
|
||||
cotton
|
||||
/datum/sprite_accessory/hair/ch/cotton
|
||||
name = "Cotton"
|
||||
icon_state = "hair_cotton"
|
||||
|
||||
|
||||
unshavenreversemohawk
|
||||
/datum/sprite_accessory/hair/ch/unshavenreversemohawk
|
||||
name = "Mohawk Reverse Unshaven"
|
||||
icon_state = "hair_unshaven_reversemohawk"
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
/datum/sprite_accessory/ears/yw
|
||||
icon = 'icons/mob/human_races/markings_yw.dmi'
|
||||
|
||||
onehorn
|
||||
/datum/sprite_accessory/ears/yw/onehorn
|
||||
name = "Colorable single horn"
|
||||
desc = ""
|
||||
icon_state = "singlehorn"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
do_colouration = 1
|
||||
|
||||
wolf_ears
|
||||
/datum/sprite_accessory/ears/yw/wolf_ears
|
||||
name = "Wolf Ears"
|
||||
desc = ""
|
||||
icon_state = "wolf_ears"
|
||||
@@ -17,63 +17,63 @@
|
||||
|
||||
/datum/sprite_accessory/marking/yw
|
||||
icon = 'icons/mob/human_races/markings_yw.dmi'
|
||||
lizardsnoutsharp
|
||||
/datum/sprite_accessory/marking/yw/lizardsnoutsharp
|
||||
name = "Lizard snout (sharp)"
|
||||
icon_state = "lizard_snout_sharp"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD)
|
||||
|
||||
lizard_snout_sharp_light
|
||||
/datum/sprite_accessory/marking/yw/lizard_snout_sharp_light
|
||||
name = "Lizard Snout (Sharp Light)"
|
||||
icon_state = "lizard_snout_sharp_light"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD)
|
||||
|
||||
lizard_snout_round
|
||||
/datum/sprite_accessory/marking/yw/lizard_snout_round
|
||||
name = "Lizard Snout (Round)"
|
||||
icon_state = "lizard_snout_round"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD)
|
||||
|
||||
lizard_snout_round_light
|
||||
/datum/sprite_accessory/marking/yw/lizard_snout_round_light
|
||||
name = "Lizard Snout (Round Light)"
|
||||
icon_state = "lizard_snout_round_light"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD)
|
||||
|
||||
wolf_snout_light_round
|
||||
/datum/sprite_accessory/marking/yw/wolf_snout_light_round
|
||||
name = "Canine Snout (Light Round)"
|
||||
icon_state = "wolf_snout_light_round"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD)
|
||||
|
||||
roundhumanoid
|
||||
/datum/sprite_accessory/marking/yw/roundhumanoid
|
||||
name = "Round (Humanoid)"
|
||||
icon_state = "preg_tummy_humanoid"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_TORSO,BP_GROIN,BP_L_HAND,BP_R_HAND,BP_L_LEG,BP_R_LEG)
|
||||
|
||||
roundteshari
|
||||
/datum/sprite_accessory/marking/yw/roundteshari
|
||||
name = "Round (Teshari)"
|
||||
icon_state = "preg_tummy_teshari"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_TORSO,BP_GROIN,BP_L_HAND,BP_R_HAND,BP_L_LEG,BP_R_LEG)
|
||||
teshari_pattern_female
|
||||
/datum/sprite_accessory/marking/yw/teshari_pattern_female
|
||||
name = "Teshari female pattern"
|
||||
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)
|
||||
teshari_pattern_male
|
||||
/datum/sprite_accessory/marking/yw/teshari_pattern_male
|
||||
name = "Teshari male pattern"
|
||||
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)
|
||||
teshari_large_eyes
|
||||
/datum/sprite_accessory/marking/yw/teshari_large_eyes
|
||||
name = "Teshari large eyes"
|
||||
icon_state = "teshlarge_eyes"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
body_parts = list(BP_HEAD)
|
||||
teshari_coat
|
||||
/datum/sprite_accessory/marking/yw/teshari_coat
|
||||
name = "Teshari coat"
|
||||
icon_state = "tesh_coat"
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
accuracy = 15
|
||||
one_handed_penalty = 30
|
||||
|
||||
obj/item/weapon/gun/energy/locked/phasegun/rifle/unlocked
|
||||
/obj/item/weapon/gun/energy/locked/phasegun/rifle/unlocked
|
||||
desc = "The RayZar EW31 Orion is a specialist energy weapon, intended for use against hostile wildlife."
|
||||
req_access = newlist() //for toggling safety
|
||||
locked = 0
|
||||
|
||||
@@ -5,11 +5,12 @@
|
||||
icon_state = "bluespace_coffee"
|
||||
center_of_mass = list("x"=15, "y"=10)
|
||||
volume = 50
|
||||
Initialize()
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bluespace_coffee/Initialize()
|
||||
..()
|
||||
reagents.add_reagent("coffee", 50)
|
||||
|
||||
//Infinite Coffee
|
||||
attack(mob/M as mob, mob/user as mob, def_zone)
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bluespace_coffee/attack(mob/M as mob, mob/user as mob, def_zone)
|
||||
..()
|
||||
src.reagents.add_reagent("coffee", 50)
|
||||
@@ -95,7 +95,7 @@
|
||||
description = "Just looking at this makes you feel odd. Whether or not this would be good to consume is likely a gamble."
|
||||
color = "#463667"
|
||||
data = list("count"=1)
|
||||
on_mob_life(var/mob/living/M as mob)
|
||||
/datum/reagent/phenethylamine/on_mob_life(var/mob/living/M as mob)
|
||||
if(!M) M = holder.my_atom
|
||||
if(data)
|
||||
switch(data["count"])
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
var/parasitic = FALSE //Digestion immunity and nutrition leeching variable
|
||||
|
||||
|
||||
mob/living/proc/check_vorefootstep(var/m_intent, var/turf/T)
|
||||
/mob/living/proc/check_vorefootstep(var/m_intent, var/turf/T)
|
||||
if(vore_footstep_volume_cooldown++ >= 5) //updating the 'dominating' belly, the one that has most liquid and is loudest.
|
||||
choose_vorefootstep()
|
||||
vore_footstep_volume_cooldown = 0
|
||||
@@ -229,7 +229,7 @@ mob/living/proc/check_vorefootstep(var/m_intent, var/turf/T)
|
||||
T = input("Choose whose belly to rub") as null| mob in view(1,src)
|
||||
if(!T)
|
||||
return FALSE
|
||||
if(!T in view(1,src))
|
||||
if(!(T in view(1,src)))
|
||||
return FALSE
|
||||
if(T.vore_selected)
|
||||
var/obj/belly/B = T.vore_selected
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
..()
|
||||
update_icon()
|
||||
|
||||
/obj/item/weapon/oldtwohanded/mob_can_equip(M as mob, slot)
|
||||
/obj/item/weapon/oldtwohanded/mob_can_equip(M as mob, slot, disable_warning = FALSE)
|
||||
//Cannot equip wielded items.
|
||||
if(wielded)
|
||||
to_chat(M, "<span class='warning'>Unwield the [initial(name)] first!</span>")
|
||||
@@ -102,10 +102,10 @@
|
||||
icon_state = "offhand"
|
||||
name = "offhand"
|
||||
|
||||
unwield()
|
||||
/obj/item/weapon/oldtwohanded/offhand/unwield()
|
||||
qdel(src)
|
||||
|
||||
wield()
|
||||
/obj/item/weapon/oldtwohanded/offhand/wield()
|
||||
qdel(src)
|
||||
|
||||
/obj/item/weapon/oldtwohanded/offhand/update_icon()
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
var/unbuttoned = 0
|
||||
|
||||
verb/toggle()
|
||||
/obj/item/clothing/suit/storage/labcoat/fluff/eioni_1/verb/toggle()
|
||||
set name = "Toggle coat buttons"
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
@@ -51,7 +51,7 @@
|
||||
/////////////////////////////TODO//////////////////////
|
||||
var/unbuttoned = 0
|
||||
|
||||
verb/toggle()
|
||||
/obj/item/clothing/suit/storage/hoodie/fluff/redax_1/verb/toggle()
|
||||
set name = "Toggle coat buttons"
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
@@ -172,7 +172,7 @@
|
||||
|
||||
var/unbuttoned = 0
|
||||
|
||||
verb/toggle()
|
||||
/obj/item/clothing/suit/storage/labcoat/fluff/zeke_vincir_3/verb/toggle()
|
||||
set name = "Toggle coat buttons"
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
@@ -853,7 +853,7 @@
|
||||
body_parts_covered = UPPER_TORSO
|
||||
var/hoodup = 1
|
||||
|
||||
verb/toggle()
|
||||
/obj/item/clothing/suit/storage/fluff/ivy/verb/toggle()
|
||||
set name = "Toggle Hood"
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
@@ -1310,8 +1310,7 @@
|
||||
icon_state = "kentauri_uniform"
|
||||
item_state = "kentauri_uniform"
|
||||
|
||||
/obj/item/clothing/suit/armor/vest/harpsong
|
||||
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
|
||||
/obj/item/clothing/suit/armor/vest/harpsong/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
|
||||
if(..())
|
||||
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse/big))
|
||||
return ..()
|
||||
@@ -1319,8 +1318,7 @@
|
||||
to_chat(H,"<span class='warning'>You need to have a kentauri half to wear this.</span>")
|
||||
return 0
|
||||
|
||||
/obj/item/clothing/suit/armor/vest/harpsong
|
||||
make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0)
|
||||
/obj/item/clothing/suit/armor/vest/harpsong/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0, var/icon/clip_mask = null)
|
||||
var/image/result = ..()
|
||||
result.pixel_x = -16
|
||||
result.layer = BODY_LAYER + 15
|
||||
|
||||
@@ -29,15 +29,13 @@
|
||||
flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER|HIDESHOES
|
||||
species_restricted = null //Species restricted since all it cares about is a taur half
|
||||
|
||||
/obj/item/clothing/suit/space/rig/fluff/sheri
|
||||
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
|
||||
/obj/item/clothing/suit/space/rig/fluff/sheri/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
|
||||
item_state = icon_state
|
||||
pixel_x = -16
|
||||
update_icon()
|
||||
return 1
|
||||
|
||||
/obj/item/clothing/suit/space/rig/fluff/sheri
|
||||
make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0)
|
||||
/obj/item/clothing/suit/space/rig/fluff/sheri/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0,var/icon/clip_mask = null)
|
||||
var/image/result = ..()
|
||||
result.pixel_x = -16
|
||||
result.layer = BODY_LAYER + 15
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#if !defined(USING_MAP_DATUM)
|
||||
|
||||
// CHOMPStation Edits Start: Disabling specific includes as vorestation.dme has them already loading via #includes there. UPDATE THIS if that changes.
|
||||
#include "southern_cross_areas.dm"
|
||||
#include "southern_cross_defines.dm"
|
||||
#include "southern_cross_elevator.dm"
|
||||
@@ -18,25 +19,28 @@
|
||||
#include "shuttles/ert.dm"
|
||||
|
||||
#include "loadout/loadout_accessories.dm"
|
||||
#include "loadout/loadout_suit.dm"
|
||||
#include "loadout/loadout_uniform.dm"
|
||||
// #include "loadout/loadout_suit.dm"
|
||||
// #include "loadout/loadout_uniform.dm"
|
||||
|
||||
#include "datums/supplypacks/munitions.dm"
|
||||
#include "items/encryptionkey_sc.dm"
|
||||
#include "items/headset_sc.dm"
|
||||
#include "items/clothing/sc_suit.dm"
|
||||
#include "items/clothing/sc_under.dm"
|
||||
#include "items/clothing/sc_accessory.dm"
|
||||
|
||||
// #include "items/encryptionkey_sc.dm"
|
||||
// #include "items/headset_sc.dm"
|
||||
// #include "items/clothing/sc_suit.dm"
|
||||
// #include "items/clothing/sc_under.dm"
|
||||
// #include "items/clothing/sc_accessory.dm"
|
||||
#include "job/outfits.dm"
|
||||
#include "structures/closets/engineering.dm"
|
||||
#include "structures/closets/medical.dm"
|
||||
#include "structures/closets/misc.dm"
|
||||
#include "structures/closets/research.dm"
|
||||
#include "structures/closets/security.dm"
|
||||
// #include "structures/closets/engineering.dm"
|
||||
// #include "structures/closets/medical.dm"
|
||||
// #include "structures/closets/misc.dm"
|
||||
// #include "structures/closets/research.dm"
|
||||
// #include "structures/closets/security.dm"
|
||||
#include "turfs/outdoors.dm"
|
||||
#include "overmap/sectors.dm"
|
||||
#include "events/wildlife_encounter.dm"
|
||||
|
||||
// CHOMPStation Edits End - Un-disable these includes if vorestation.dme ever removes them from their #includes.
|
||||
|
||||
//CHOMPStation Edit Start TFF 25/3/20 - Station level map z-levels separated into 3 distinct files to work with MapDiffBot. All other files renamed accordingly.
|
||||
#include "southern_cross-1.dmm" //Deck 1
|
||||
#include "southern_cross-2.dmm" //Deck 2
|
||||
|
||||
Reference in New Issue
Block a user