mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
enable greps properly (#10454)
This commit is contained in:
@@ -23,4 +23,4 @@
|
||||
"Pill Bottle (Bliss)" = /obj/item/storage/pill_bottle/happy,
|
||||
"Pill Bottle (Aphrodisiac)" = /obj/item/storage/pill_bottle/aphrodisiac
|
||||
)
|
||||
gear_tweaks += new/datum/gear_tweak/path(medications)
|
||||
gear_tweaks += new/datum/gear_tweak/path(medications)
|
||||
|
||||
@@ -11,4 +11,4 @@
|
||||
"extra large jackboots" = /obj/item/clothing/shoes/mech_shoes/mister_x,
|
||||
"visible extra large jackboots" = /obj/item/clothing/shoes/mech_shoes/mister_x/visible
|
||||
)
|
||||
gear_tweaks += new/datum/gear_tweak/path(mechshoes)
|
||||
gear_tweaks += new/datum/gear_tweak/path(mechshoes)
|
||||
|
||||
@@ -5,4 +5,4 @@
|
||||
icon = 'modular_chomp/icons/inventory/head/mob_angel_halo.dmi'
|
||||
default_worn_icon = 'modular_chomp/icons/inventory/head/mob_angel_halo.dmi'
|
||||
icon_state = "angel_halo"
|
||||
//Angel Halo End
|
||||
//Angel Halo End
|
||||
|
||||
@@ -5,4 +5,4 @@
|
||||
usable = 0
|
||||
interface_name = "mounted phase rifle"
|
||||
interface_desc = "A forearm-mounted suit-powered phase rifle."
|
||||
gun_type = /obj/item/gun/energy/locked/phasegun/rifle/unlocked/mounted
|
||||
gun_type = /obj/item/gun/energy/locked/phasegun/rifle/unlocked/mounted
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
/obj/item/rig/ert/janitor
|
||||
req_access = null
|
||||
req_access = null
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
|
||||
/obj/item/clothing/suit/space/void
|
||||
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA, SPECIES_XENOMORPH_HYBRID)
|
||||
sprite_sheets = CH_SPECIES_SPRITE_SHEETS_SUIT_MOB
|
||||
sprite_sheets = CH_SPECIES_SPRITE_SHEETS_SUIT_MOB
|
||||
|
||||
@@ -23,4 +23,4 @@
|
||||
icon_override = 'modular_chomp/icons/mob/viper_suit_ch.dmi'
|
||||
icon_state = "viper_suit"
|
||||
armor = list(melee = 35, bullet = 35, laser = 35, energy = 35, bomb = 25, bio = 20, rad = 20)
|
||||
body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
|
||||
body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
|
||||
|
||||
@@ -20,4 +20,4 @@
|
||||
|
||||
/obj/machinery/cash_register/civilian
|
||||
req_access = list()
|
||||
req_one_access = list(access_kitchen,access_bar,access_hydroponics,access_heads)
|
||||
req_one_access = list(access_kitchen,access_bar,access_hydroponics,access_heads)
|
||||
|
||||
@@ -94,4 +94,4 @@
|
||||
|
||||
#undef DANGER_CRAB
|
||||
#undef DANGER_ICE
|
||||
#undef DANGER_RAY
|
||||
#undef DANGER_RAY
|
||||
|
||||
@@ -121,4 +121,4 @@
|
||||
#undef DANGER_ICE
|
||||
#undef DANGER_RAY
|
||||
#undef DANGER_EEL
|
||||
#undef DANGER_TURTLE
|
||||
#undef DANGER_TURTLE
|
||||
|
||||
@@ -117,4 +117,4 @@
|
||||
/obj/item/seeds/lustflower = 2,
|
||||
/obj/item/seeds/pitcherseed = 3,
|
||||
/obj/item/seeds/cinnamon = 3
|
||||
) //CHOMPEdit - Seed list altered to include extra seeds available in seed_storage_vr.dm. Added cinnamon.
|
||||
) //CHOMPEdit - Seed list altered to include extra seeds available in seed_storage_vr.dm. Added cinnamon.
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
|
||||
|
||||
/datum/material/morphium //buffed protection
|
||||
protectiveness = 65
|
||||
protectiveness = 65
|
||||
|
||||
@@ -50,4 +50,4 @@
|
||||
/datum/material/osmium //Adjusted hardness, reflective, and protection
|
||||
hardness = 65
|
||||
protectiveness = 30
|
||||
reflectivity = 0.1
|
||||
reflectivity = 0.1
|
||||
|
||||
@@ -41,4 +41,4 @@
|
||||
hardness = 40
|
||||
protectiveness = 40
|
||||
reflectivity = 0.6
|
||||
conductivity = 0.5
|
||||
conductivity = 0.5
|
||||
|
||||
@@ -20,4 +20,4 @@
|
||||
|
||||
|
||||
/obj/item/kinetic_crusher
|
||||
requires_wield = FALSE
|
||||
requires_wield = FALSE
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
say_list_type = /datum/say_list/cyber_horror/master
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/horrormaster //The final boss of every Gradius game
|
||||
|
||||
|
||||
/datum/say_list/cyber_horror/master
|
||||
threaten_sound = 'modular_chomp/sound/mob/robots/MasterSee.ogg'
|
||||
|
||||
/datum/ai_holder/simple_mob/ranged/kiting/horrormaster
|
||||
threaten = TRUE
|
||||
threaten_delay = 1 SECOND
|
||||
threaten_timeout = 30 SECONDS
|
||||
threaten_timeout = 30 SECONDS
|
||||
|
||||
@@ -150,4 +150,4 @@
|
||||
contemparies, all the while wielding expirmental frost weaponry to deadly \
|
||||
effecieny. Rare and vaulable pieces in the Eclipse's army, they are rarely seen \
|
||||
but when utilized, that area is of high priority. "
|
||||
value = CATALOGUER_REWARD_MEDIUM
|
||||
value = CATALOGUER_REWARD_MEDIUM
|
||||
|
||||
@@ -1387,4 +1387,4 @@
|
||||
uptwo_rightfour(target)
|
||||
downtwo_leftfour(target)
|
||||
downtwo_rightfour(target)
|
||||
attackcycle = next_cycle
|
||||
attackcycle = next_cycle
|
||||
|
||||
@@ -125,4 +125,4 @@
|
||||
/obj/item/seeds/jurlmah = 125,
|
||||
/obj/item/seeds/amauri = 125,
|
||||
/obj/item/seeds/gelthi = 125,
|
||||
/obj/item/seeds/vale = 125)
|
||||
/obj/item/seeds/vale = 125)
|
||||
|
||||
@@ -9,4 +9,4 @@
|
||||
/datum/ai_holder/simple_mob/melee/disbot
|
||||
threaten = TRUE
|
||||
threaten_delay = 1 SECOND
|
||||
threaten_timeout = 30 SECONDS
|
||||
threaten_timeout = 30 SECONDS
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser
|
||||
name = "laser hivebot"
|
||||
desc = "A robot with a photonic weapon integrated into itself."
|
||||
projectiletype = /obj/item/projectile/energy/mob/drone
|
||||
projectiletype = /obj/item/projectile/energy/mob/drone
|
||||
|
||||
@@ -13,4 +13,4 @@
|
||||
projectiletype = /obj/item/projectile/energy/declone
|
||||
|
||||
/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege
|
||||
projectiletype = /obj/item/projectile/arc //Polaris, don't make the same mob twice.
|
||||
projectiletype = /obj/item/projectile/arc //Polaris, don't make the same mob twice.
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
/mob/living/simple_mob/mechanical/hivebot/tank
|
||||
icon = 'modular_chomp/icons/mob/hivebot.dmi'
|
||||
icon_state = "blue"
|
||||
icon_living = "blue"
|
||||
icon_living = "blue"
|
||||
|
||||
@@ -26,4 +26,4 @@
|
||||
|
||||
/datum/ai_holder/simple_mob/ranged/kiting/threatening/drone_aerostat
|
||||
threaten_delay = 20 SECOND
|
||||
threaten_timeout = 30 SECONDS
|
||||
threaten_timeout = 30 SECONDS
|
||||
|
||||
@@ -11,4 +11,4 @@
|
||||
see_in_dark = 8
|
||||
minbodytemp = 0
|
||||
maxbodytemp = 30000
|
||||
min_oxy = 0
|
||||
min_oxy = 0
|
||||
|
||||
@@ -14,4 +14,4 @@
|
||||
melee_damage_lower = 5
|
||||
melee_damage_upper = 5
|
||||
vore_upper_transfer_chance = 75
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive // Aggressive!
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive // Aggressive!
|
||||
|
||||
@@ -50,4 +50,4 @@
|
||||
light_color = "#1F000F"
|
||||
glow_range = 5
|
||||
glow_intensity = -1
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/melee/hit_and_run
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/melee/hit_and_run
|
||||
|
||||
@@ -27,4 +27,4 @@
|
||||
|
||||
if(!istype(M))
|
||||
return
|
||||
M.Weaken(stun_duration)
|
||||
M.Weaken(stun_duration)
|
||||
|
||||
@@ -361,7 +361,7 @@
|
||||
wind_low = 4
|
||||
flight_failure_modifier = 100
|
||||
effect_message = span_warning("Extreme rain is crushing you!")
|
||||
|
||||
|
||||
imminent_transition_message = "A fatal monsoon approaches."
|
||||
|
||||
var/next_lightning_strike = 0 // world.time when lightning will strike.
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
/obj/item/gun/energy/zip/craftable
|
||||
battery_lock = 1 //makeshift gun has flaws
|
||||
battery_lock = 1 //makeshift gun has flaws
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
self_recharge = 1
|
||||
use_external_power = 1
|
||||
recharge_time = 10
|
||||
one_handed_penalty = 0
|
||||
one_handed_penalty = 0
|
||||
|
||||
@@ -10,4 +10,4 @@
|
||||
combustion = FALSE
|
||||
|
||||
modifier_type_to_apply = /datum/modifier/entangled
|
||||
modifier_duration = 0.5 MINUTE
|
||||
modifier_duration = 0.5 MINUTE
|
||||
|
||||
@@ -38,4 +38,4 @@
|
||||
/obj/item/gun/magic/firestaff/vrwizard/nuclear
|
||||
description_info = "A high powered staff that burns through energy quickly but unleashes high energy bolts."
|
||||
projectile_type = /obj/item/projectile/energy/nuclearblast
|
||||
color = "#660066"
|
||||
color = "#660066"
|
||||
|
||||
@@ -166,4 +166,4 @@
|
||||
if(isliving(hit_atom))
|
||||
var/mob/living/L = hit_atom
|
||||
L.add_modifier(/datum/modifier/mend_occult, 150) //No need to change this, it does the job
|
||||
qdel(src)
|
||||
qdel(src)
|
||||
|
||||
@@ -571,7 +571,7 @@ GLOBAL_DATUM_INIT(tickets, /datum/tickets, new)
|
||||
return
|
||||
|
||||
if(handler == key_name(usr, FALSE, TRUE))
|
||||
to_chat(span_red("You are already handling this ticket."))
|
||||
to_chat(usr, span_red("You are already handling this ticket."))
|
||||
return
|
||||
|
||||
var/msg = span_red("Your AdminHelp is being handled by [key_name(usr,FALSE,FALSE)] please be patient.")
|
||||
|
||||
@@ -9,4 +9,4 @@
|
||||
force = 35
|
||||
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
|
||||
can_cleave = TRUE
|
||||
icon_state = "scythe0"
|
||||
icon_state = "scythe0"
|
||||
|
||||
@@ -50,4 +50,4 @@
|
||||
charge_tick = 0
|
||||
can_charge = TRUE
|
||||
|
||||
projectile_type = /obj/item/projectile/beam/inversion
|
||||
projectile_type = /obj/item/projectile/beam/inversion
|
||||
|
||||
@@ -46,4 +46,4 @@
|
||||
if(H.stat != DEAD)
|
||||
return FALSE
|
||||
return TRUE
|
||||
return FALSE
|
||||
return FALSE
|
||||
|
||||
Reference in New Issue
Block a user