mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-07-19 04:08:55 +01:00
[MIRROR] next grep, no spaces (#10548)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
committed by
GitHub
GitHub
parent
16a213f699
commit
8d0febfbb6
@@ -1,23 +1,24 @@
|
||||
|
||||
/*
|
||||
VVVVVVVV VVVVVVVV OOOOOOOOO RRRRRRRRRRRRRRRRR EEEEEEEEEEEEEEEEEEEEEE
|
||||
V::::::V V::::::V OO:::::::::OO R::::::::::::::::R E::::::::::::::::::::E
|
||||
V::::::V V::::::V OO:::::::::::::OO R::::::RRRRRR:::::R E::::::::::::::::::::E
|
||||
V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEEEEE::::E
|
||||
V:::::V V:::::V O::::::O O::::::O R::::R R:::::R E:::::E EEEEEE
|
||||
V:::::V V:::::V O:::::O O:::::O R::::R R:::::R E:::::E
|
||||
V:::::V V:::::V O:::::O O:::::O R::::RRRRRR:::::R E::::::EEEEEEEEEE
|
||||
V:::::V V:::::V O:::::O O:::::O R:::::::::::::RR E:::::::::::::::E
|
||||
V:::::V V:::::V O:::::O O:::::O R::::RRRRRR:::::R E:::::::::::::::E
|
||||
V:::::V V:::::V O:::::O O:::::O R::::R R:::::R E::::::EEEEEEEEEE
|
||||
V:::::V:::::V O:::::O O:::::O R::::R R:::::R E:::::E
|
||||
V:::::::::V O::::::O O::::::O R::::R R:::::R E:::::E EEEEEE
|
||||
V:::::::V O:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEEEE:::::E
|
||||
V:::::V OO:::::::::::::OO R::::::R R:::::RE::::::::::::::::::::E
|
||||
V:::V OO:::::::::OO R::::::R R:::::RE::::::::::::::::::::E
|
||||
VVV OOOOOOOOO RRRRRRRR RRRRRRREEEEEEEEEEEEEEEEEEEEEE
|
||||
|
||||
-Aro <3 */
|
||||
* VVVVVVVV VVVVVVVV OOOOOOOOO RRRRRRRRRRRRRRRRR EEEEEEEEEEEEEEEEEEEEEE
|
||||
* V::::::V V::::::V OO:::::::::OO R::::::::::::::::R E::::::::::::::::::::E
|
||||
* V::::::V V::::::V OO:::::::::::::OO R::::::RRRRRR:::::R E::::::::::::::::::::E
|
||||
* V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEEEEE::::E
|
||||
* V:::::V V:::::V O::::::O O::::::O R::::R R:::::R E:::::E EEEEEE
|
||||
* V:::::V V:::::V O:::::O O:::::O R::::R R:::::R E:::::E
|
||||
* V:::::V V:::::V O:::::O O:::::O R::::RRRRRR:::::R E::::::EEEEEEEEEE
|
||||
* V:::::V V:::::V O:::::O O:::::O R:::::::::::::RR E:::::::::::::::E
|
||||
* V:::::V V:::::V O:::::O O:::::O R::::RRRRRR:::::R E:::::::::::::::E
|
||||
* V:::::V V:::::V O:::::O O:::::O R::::R R:::::R E::::::EEEEEEEEEE
|
||||
* V:::::V:::::V O:::::O O:::::O R::::R R:::::R E:::::E
|
||||
* V:::::::::V O::::::O O::::::O R::::R R:::::R E:::::E EEEEEE
|
||||
* V:::::::V O:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEEEE:::::E
|
||||
* V:::::V OO:::::::::::::OO R::::::R R:::::RE::::::::::::::::::::E
|
||||
* V:::V OO:::::::::OO R::::::R R:::::RE::::::::::::::::::::E
|
||||
* VVV OOOOOOOOO RRRRRRRR RRRRRRREEEEEEEEEEEEEEEEEEEEEE
|
||||
*
|
||||
* -Aro <3
|
||||
*/
|
||||
|
||||
//
|
||||
// Overrides/additions to stock defines go here, as well as hooks. Sort them by
|
||||
|
||||
@@ -2126,48 +2126,50 @@
|
||||
if("reset")
|
||||
var/confirm = tgui_alert(user,"This will delete any custom messages. Are you sure?","Confirmation",list("Cancel","DELETE"))
|
||||
if(confirm == "DELETE")
|
||||
host.vore_selected.digest_messages_prey = initial(host.vore_selected.digest_messages_prey)
|
||||
host.vore_selected.digest_messages_owner = initial(host.vore_selected.digest_messages_owner)
|
||||
host.vore_selected.absorb_messages_prey = initial(host.vore_selected.absorb_messages_prey)
|
||||
host.vore_selected.absorb_messages_owner = initial(host.vore_selected.absorb_messages_owner)
|
||||
host.vore_selected.unabsorb_messages_prey = initial(host.vore_selected.unabsorb_messages_prey)
|
||||
host.vore_selected.unabsorb_messages_owner = initial(host.vore_selected.unabsorb_messages_owner)
|
||||
host.vore_selected.struggle_messages_outside = initial(host.vore_selected.struggle_messages_outside)
|
||||
host.vore_selected.struggle_messages_inside = initial(host.vore_selected.struggle_messages_inside)
|
||||
host.vore_selected.absorbed_struggle_messages_outside = initial(host.vore_selected.absorbed_struggle_messages_outside)
|
||||
host.vore_selected.absorbed_struggle_messages_inside = initial(host.vore_selected.absorbed_struggle_messages_inside)
|
||||
host.vore_selected.escape_attempt_messages_owner = initial(host.vore_selected.escape_attempt_messages_owner)
|
||||
host.vore_selected.escape_attempt_messages_prey = initial(host.vore_selected.escape_attempt_messages_prey)
|
||||
host.vore_selected.escape_messages_owner = initial(host.vore_selected.escape_messages_owner)
|
||||
host.vore_selected.escape_messages_prey = initial(host.vore_selected.escape_messages_prey)
|
||||
host.vore_selected.escape_messages_outside = initial(host.vore_selected.escape_messages_outside)
|
||||
host.vore_selected.escape_item_messages_owner = initial(host.vore_selected.escape_item_messages_owner)
|
||||
host.vore_selected.escape_item_messages_prey = initial(host.vore_selected.escape_item_messages_prey)
|
||||
host.vore_selected.escape_item_messages_outside = initial(host.vore_selected.escape_item_messages_outside)
|
||||
host.vore_selected.escape_fail_messages_owner = initial(host.vore_selected.escape_fail_messages_owner)
|
||||
host.vore_selected.escape_fail_messages_prey = initial(host.vore_selected.escape_fail_messages_prey)
|
||||
host.vore_selected.escape_attempt_absorbed_messages_owner = initial(host.vore_selected.escape_attempt_absorbed_messages_owner)
|
||||
host.vore_selected.escape_attempt_absorbed_messages_prey = initial(host.vore_selected.escape_attempt_absorbed_messages_prey)
|
||||
host.vore_selected.escape_absorbed_messages_owner = initial(host.vore_selected.escape_absorbed_messages_owner)
|
||||
host.vore_selected.escape_absorbed_messages_prey = initial(host.vore_selected.escape_absorbed_messages_prey)
|
||||
host.vore_selected.escape_absorbed_messages_outside = initial(host.vore_selected.escape_absorbed_messages_outside)
|
||||
host.vore_selected.escape_fail_absorbed_messages_owner = initial(host.vore_selected.escape_fail_absorbed_messages_owner)
|
||||
host.vore_selected.escape_fail_absorbed_messages_prey = initial(host.vore_selected.escape_fail_absorbed_messages_prey)
|
||||
host.vore_selected.primary_transfer_messages_owner = initial(host.vore_selected.primary_transfer_messages_owner)
|
||||
host.vore_selected.primary_transfer_messages_prey = initial(host.vore_selected.primary_transfer_messages_prey)
|
||||
host.vore_selected.secondary_transfer_messages_owner = initial(host.vore_selected.secondary_transfer_messages_owner)
|
||||
host.vore_selected.secondary_transfer_messages_prey = initial(host.vore_selected.secondary_transfer_messages_prey)
|
||||
host.vore_selected.primary_autotransfer_messages_owner = initial(host.vore_selected.primary_autotransfer_messages_owner)
|
||||
host.vore_selected.primary_autotransfer_messages_prey = initial(host.vore_selected.primary_autotransfer_messages_prey)
|
||||
host.vore_selected.secondary_autotransfer_messages_owner = initial(host.vore_selected.secondary_autotransfer_messages_owner)
|
||||
host.vore_selected.secondary_autotransfer_messages_prey = initial(host.vore_selected.secondary_autotransfer_messages_prey)
|
||||
host.vore_selected.digest_chance_messages_owner = initial(host.vore_selected.digest_chance_messages_owner)
|
||||
host.vore_selected.digest_chance_messages_prey = initial(host.vore_selected.digest_chance_messages_prey)
|
||||
host.vore_selected.absorb_chance_messages_owner = initial(host.vore_selected.absorb_chance_messages_owner)
|
||||
host.vore_selected.absorb_chance_messages_prey = initial(host.vore_selected.absorb_chance_messages_prey)
|
||||
host.vore_selected.examine_messages = initial(host.vore_selected.examine_messages)
|
||||
host.vore_selected.examine_messages_absorbed = initial(host.vore_selected.examine_messages_absorbed)
|
||||
host.vore_selected.emote_lists = initial(host.vore_selected.emote_lists)
|
||||
var/obj/belly/default_belly = new /obj/belly(null)
|
||||
host.vore_selected.digest_messages_prey = default_belly.digest_messages_prey.Copy()
|
||||
host.vore_selected.digest_messages_owner = default_belly.digest_messages_owner.Copy()
|
||||
host.vore_selected.absorb_messages_prey = default_belly.absorb_messages_prey.Copy()
|
||||
host.vore_selected.absorb_messages_owner = default_belly.absorb_messages_owner.Copy()
|
||||
host.vore_selected.unabsorb_messages_prey = default_belly.unabsorb_messages_prey.Copy()
|
||||
host.vore_selected.unabsorb_messages_owner = default_belly.unabsorb_messages_owner.Copy()
|
||||
host.vore_selected.struggle_messages_outside = default_belly.struggle_messages_outside.Copy()
|
||||
host.vore_selected.struggle_messages_inside = default_belly.struggle_messages_inside.Copy()
|
||||
host.vore_selected.absorbed_struggle_messages_outside = default_belly.absorbed_struggle_messages_outside.Copy()
|
||||
host.vore_selected.absorbed_struggle_messages_inside = default_belly.absorbed_struggle_messages_inside.Copy()
|
||||
host.vore_selected.escape_attempt_messages_owner = default_belly.escape_attempt_messages_owner.Copy()
|
||||
host.vore_selected.escape_attempt_messages_prey = default_belly.escape_attempt_messages_prey.Copy()
|
||||
host.vore_selected.escape_messages_owner = default_belly.escape_messages_owner.Copy()
|
||||
host.vore_selected.escape_messages_prey = default_belly.escape_messages_prey.Copy()
|
||||
host.vore_selected.escape_messages_outside = default_belly.escape_messages_outside.Copy()
|
||||
host.vore_selected.escape_item_messages_owner = default_belly.escape_item_messages_owner.Copy()
|
||||
host.vore_selected.escape_item_messages_prey = default_belly.escape_item_messages_prey.Copy()
|
||||
host.vore_selected.escape_item_messages_outside = default_belly.escape_item_messages_outside.Copy()
|
||||
host.vore_selected.escape_fail_messages_owner = default_belly.escape_fail_messages_owner.Copy()
|
||||
host.vore_selected.escape_fail_messages_prey = default_belly.escape_fail_messages_prey.Copy()
|
||||
host.vore_selected.escape_attempt_absorbed_messages_owner = default_belly.escape_attempt_absorbed_messages_owner.Copy()
|
||||
host.vore_selected.escape_attempt_absorbed_messages_prey = default_belly.escape_attempt_absorbed_messages_prey.Copy()
|
||||
host.vore_selected.escape_absorbed_messages_owner = default_belly.escape_absorbed_messages_owner.Copy()
|
||||
host.vore_selected.escape_absorbed_messages_prey = default_belly.escape_absorbed_messages_prey.Copy()
|
||||
host.vore_selected.escape_absorbed_messages_outside = default_belly.escape_absorbed_messages_outside.Copy()
|
||||
host.vore_selected.escape_fail_absorbed_messages_owner = default_belly.escape_fail_absorbed_messages_owner.Copy()
|
||||
host.vore_selected.escape_fail_absorbed_messages_prey = default_belly.escape_fail_absorbed_messages_prey.Copy()
|
||||
host.vore_selected.primary_transfer_messages_owner = default_belly.primary_transfer_messages_owner.Copy()
|
||||
host.vore_selected.primary_transfer_messages_prey = default_belly.primary_transfer_messages_prey.Copy()
|
||||
host.vore_selected.secondary_transfer_messages_owner = default_belly.secondary_transfer_messages_owner.Copy()
|
||||
host.vore_selected.secondary_transfer_messages_prey = default_belly.secondary_transfer_messages_prey.Copy()
|
||||
host.vore_selected.primary_autotransfer_messages_owner = default_belly.primary_autotransfer_messages_owner.Copy()
|
||||
host.vore_selected.primary_autotransfer_messages_prey = default_belly.primary_autotransfer_messages_prey.Copy()
|
||||
host.vore_selected.secondary_autotransfer_messages_owner = default_belly.secondary_autotransfer_messages_owner.Copy()
|
||||
host.vore_selected.secondary_autotransfer_messages_prey = default_belly.secondary_autotransfer_messages_prey.Copy()
|
||||
host.vore_selected.digest_chance_messages_owner = default_belly.digest_chance_messages_owner.Copy()
|
||||
host.vore_selected.digest_chance_messages_prey = default_belly.digest_chance_messages_prey.Copy()
|
||||
host.vore_selected.absorb_chance_messages_owner = default_belly.absorb_chance_messages_owner.Copy()
|
||||
host.vore_selected.absorb_chance_messages_prey = default_belly.absorb_chance_messages_prey.Copy()
|
||||
host.vore_selected.examine_messages = default_belly.examine_messages.Copy()
|
||||
host.vore_selected.examine_messages_absorbed = default_belly.examine_messages_absorbed.Copy()
|
||||
host.vore_selected.emote_lists = default_belly.emote_lists.Copy()
|
||||
qdel(default_belly)
|
||||
. = TRUE
|
||||
if("b_verb")
|
||||
var/new_verb = html_encode(tgui_input_text(user,"New verb when eating (infinitive tense, e.g. nom or swallow):","New Verb"))
|
||||
|
||||
@@ -704,22 +704,22 @@
|
||||
//Aurora Goldtail
|
||||
|
||||
/obj/item/clothing/glasses/omnihud/prescription/aurora
|
||||
name = "Round glasses"
|
||||
desc = "A pair of circular shaped prescription glasses. They seem fit for a avian head and will most likely make anyone wearing these look like a big nerd. It seems they are outfitted with a augmented reality module."
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "aurora_glasses"
|
||||
icon_override = 'icons/vore/custom_onmob_yw.dmi'
|
||||
item_state = "aurora_glasses"
|
||||
name = "Round glasses"
|
||||
desc = "A pair of circular shaped prescription glasses. They seem fit for a avian head and will most likely make anyone wearing these look like a big nerd. It seems they are outfitted with a augmented reality module."
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "aurora_glasses"
|
||||
icon_override = 'icons/vore/custom_onmob_yw.dmi'
|
||||
item_state = "aurora_glasses"
|
||||
|
||||
//Strix Hades
|
||||
//Strix Hades
|
||||
|
||||
/obj/item/clothing/suit/storage/teshari/cloak/fluff/strix
|
||||
name = JOB_ALT_COLONY_DIRECTOR + " Coat"
|
||||
desc = "It drapes over a Avali's shoulders and closes at the neck with pockets convienently placed inside. It bears the " + JOB_ALT_COLONY_DIRECTOR + "'s colors. The name 'Strix Hades' is embroilled in gold lettering around a golden embroilled outline on the neck collar."
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "tesh_cloak_cd"
|
||||
icon_override = 'icons/vore/custom_clothes_yw.dmi'
|
||||
item_state = "tesh_cloak_cd"
|
||||
name = JOB_ALT_COLONY_DIRECTOR + " Coat"
|
||||
desc = "It drapes over a Avali's shoulders and closes at the neck with pockets convienently placed inside. It bears the " + JOB_ALT_COLONY_DIRECTOR + "'s colors. The name 'Strix Hades' is embroilled in gold lettering around a golden embroilled outline on the neck collar."
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "tesh_cloak_cd"
|
||||
icon_override = 'icons/vore/custom_clothes_yw.dmi'
|
||||
item_state = "tesh_cloak_cd"
|
||||
|
||||
/obj/item/clothing/under/teshari/undercoat/fluff/strix
|
||||
name = JOB_ALT_COLONY_DIRECTOR + " Undercoat"
|
||||
@@ -733,12 +733,12 @@
|
||||
)
|
||||
|
||||
/obj/item/clothing/suit/storage/teshari/cloak/fluff/strix_cco
|
||||
name = "Central Command Cloak"
|
||||
desc = "It drapes over a Avali's shoulders and closes at the neck with pockets convienently placed inside. It bears the Central Command's colors. The name 'Strix Hades' is embroilled in gold lettering around a golden embroilled outline on the neck collar."
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "tesh_cloak_cco"
|
||||
icon_override = 'icons/vore/custom_clothes_yw.dmi'
|
||||
item_state = "tesh_cloak_cco"
|
||||
name = "Central Command Cloak"
|
||||
desc = "It drapes over a Avali's shoulders and closes at the neck with pockets convienently placed inside. It bears the Central Command's colors. The name 'Strix Hades' is embroilled in gold lettering around a golden embroilled outline on the neck collar."
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "tesh_cloak_cco"
|
||||
icon_override = 'icons/vore/custom_clothes_yw.dmi'
|
||||
item_state = "tesh_cloak_cco"
|
||||
|
||||
/obj/item/clothing/under/teshari/undercoat/fluff/strix_cco
|
||||
name = "Central Command Undercoat"
|
||||
@@ -877,12 +877,12 @@
|
||||
//Kita
|
||||
|
||||
/obj/item/clothing/suit/storage/teshari/cloak/fluff/kita
|
||||
name = "Magical Cloak"
|
||||
desc = "It drapes over a Teshari's shoulders and closes at the neck with pockets convienently placed inside. It bears magical colors."
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "tesh_cloak_kita"
|
||||
icon_override = 'icons/vore/custom_clothes_yw.dmi'
|
||||
item_state = "tesh_cloak_kita"
|
||||
name = "Magical Cloak"
|
||||
desc = "It drapes over a Teshari's shoulders and closes at the neck with pockets convienently placed inside. It bears magical colors."
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "tesh_cloak_kita"
|
||||
icon_override = 'icons/vore/custom_clothes_yw.dmi'
|
||||
item_state = "tesh_cloak_kita"
|
||||
|
||||
// ********
|
||||
// lukevale
|
||||
@@ -1088,12 +1088,12 @@
|
||||
//Saroth
|
||||
|
||||
/obj/item/clothing/suit/storage/teshari/cloak/fluff/Saroth
|
||||
name = "Research Director cloak"
|
||||
desc = "It drapes over a Teshari's shoulders and closes at the neck with pockets conveniently placed inside. This one bears the colors of the science department with additional trimming to designate it as the research director's. It has 'operty of Saroth' sewed in on the inside at the neck. The pockets seem slightly bigger on the inside than they appear on the outside."
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "tesh_cloak_saroth"
|
||||
icon_override = 'icons/vore/custom_clothes_yw.dmi'
|
||||
item_state = "tesh_cloak_saroth"
|
||||
name = "Research Director cloak"
|
||||
desc = "It drapes over a Teshari's shoulders and closes at the neck with pockets conveniently placed inside. This one bears the colors of the science department with additional trimming to designate it as the research director's. It has 'operty of Saroth' sewed in on the inside at the neck. The pockets seem slightly bigger on the inside than they appear on the outside."
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "tesh_cloak_saroth"
|
||||
icon_override = 'icons/vore/custom_clothes_yw.dmi'
|
||||
item_state = "tesh_cloak_saroth"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/cloak/fluff/Jaree
|
||||
name = "plain cloak"
|
||||
|
||||
Reference in New Issue
Block a user