Merge pull request #8293 from VOREStation/master

U
This commit is contained in:
Aronai Sieyes
2020-06-16 00:58:13 -04:00
committed by GitHub
21 changed files with 3771 additions and 1959 deletions

View File

@@ -187,6 +187,8 @@ SUBSYSTEM_DEF(supply)
var/list/clear_turfs = get_clear_turfs()
var/shopping_log = "SUPPLY_BUY: "
for(var/datum/supply_order/SO in shoppinglist)
if(!clear_turfs.len)
break
@@ -197,6 +199,7 @@ SUBSYSTEM_DEF(supply)
SO.status = SUP_ORDER_SHIPPED
var/datum/supply_pack/SP = SO.object
shopping_log += "[SP.name];"
var/obj/A = new SP.containertype(pickedloc)
A.name = "[SP.containername] [SO.comment ? "([SO.comment])":"" ]"
@@ -251,6 +254,7 @@ SUBSYSTEM_DEF(supply)
slip.info += "</ul><br>"
slip.info += "CHECK CONTENTS AND STAMP BELOW THE LINE TO CONFIRM RECEIPT OF GOODS<hr>"
log_game(shopping_log)
return
// Will attempt to purchase the specified order, returning TRUE on success, FALSE on failure

View File

@@ -242,7 +242,7 @@ Class Procs:
return 1
if(user.lying || user.stat)
return 1
if(!(istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon)))
if(!user.IsAdvancedToolUser()) //Vorestation edit
to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
return 1
if(ishuman(user))

View File

@@ -50,3 +50,20 @@
display_name = "sleek modern coat (long), detective"
path = /obj/item/clothing/suit/storage/det_trench/alt2
allowed_roles = list("Head of Security", "Detective")
//Emergency Responder jackets for Parameds & EMTs, but also general Medical Staff
/datum/gear/suit/roles/medical/ems_jacket
display_name = "first responder jacket"
path = /obj/item/clothing/suit/storage/toggle/fr_jacket
allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor")
//imo-superior 'martian' style jacket with the star-of-life design
/datum/gear/suit/roles/medical/ems_jacket/alt
display_name = "first responder jacket, alt."
path = /obj/item/clothing/suit/storage/toggle/fr_jacket/ems
//paramedic vest
/datum/gear/suit/roles/medical/paramedic_vest
display_name = "paramedic vest"
path = /obj/item/clothing/suit/storage/toggle/paramedic
allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor")

View File

@@ -0,0 +1,44 @@
/mob/living/simple_mob/mobs_monsters/clowns/big
tt_desc = "E Homo sapiens corydon horrificus" //this clown is stronk
faction = "clown"
maxHealth = 200
health = 200
see_in_dark = 8
melee_damage_lower = 15
melee_damage_upper = 25
attack_armor_pen = 5
attack_sharp = FALSE
attack_edge = FALSE
melee_attack_delay = 1 SECOND
attacktext = list("clowned")
ai_holder_type = /datum/ai_holder/simple_mob/melee/angryclowns
loot_list = list(/obj/item/weapon/bikehorn = 100)
/mob/living/simple_mob/mobs_monsters/clowns/big
min_oxy = 0
max_oxy = 500
min_tox = 0
max_tox = 500
min_co2 = 0
max_co2 = 500
min_n2 = 0
max_n2 = 500
minbodytemp = 0
maxbodytemp = 700
/datum/ai_holder/simple_mob/melee/angryclowns
can_breakthrough = TRUE
violent_breakthrough = FALSE
hostile = TRUE // The majority of simplemobs are hostile, gaslamps are nice.
cooperative = FALSE
retaliate = TRUE //so the monster can attack back
returns_home = FALSE
can_flee = FALSE
speak_chance = 3
wander = TRUE
base_wander_delay = 9

View File

@@ -0,0 +1,45 @@
/mob/living/simple_mob/mobs_monsters/clowns/
tt_desc = "E Homo sapiens corydon" //this is a clown
faction = "clown"
movement_sound = 'sound/effects/clownstep2.ogg'
attack_sound = 'sound/effects/Whipcrack.ogg'
faction = "clown"
maxHealth = 100
health = 100
see_in_dark = 8
has_hands = TRUE
humanoid_hands = TRUE
melee_damage_lower = 5
melee_damage_upper = 30
ai_holder_type = /datum/ai_holder/simple_mob/melee/clowns
loot_list = list(/obj/item/weapon/bikehorn = 100)
min_oxy = 0
max_oxy = 0
min_tox = 0
max_tox = 0
min_co2 = 0
max_co2 = 0
min_n2 = 0
max_n2 = 0
minbodytemp = 0
maxbodytemp = 700
/datum/ai_holder/simple_mob/melee/clowns
can_breakthrough = FALSE
violent_breakthrough = FALSE
hostile = FALSE // The majority of simplemobs are hostile, gaslamps are nice.
cooperative = FALSE
retaliate = TRUE //so the monster can attack back
returns_home = FALSE
can_flee = FALSE
speak_chance = 3
wander = TRUE
base_wander_delay = 9

View File

@@ -0,0 +1,379 @@
/mob/living/simple_mob/mobs_monsters/clowns/big/normal
name = "Clown"
desc = "A regular, every tuesday Clown."
tt_desc = "E Homo sapiens corydon" //this is a clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_normal"
icon_living = "c_normal"
icon_dead = "clown_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/honkmunculus
name = "A Clown?"
desc = "That clown has some interesting proportions."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/TGClowns.dmi'
icon_state = "honkmunculus"
icon_living = "honkmunculus"
icon_dead = "honkmunculus_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/cluwne
name = "A Clown?"
desc = "Oh no not that thing."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "cluwne"
icon_living = "cluwne"
icon_dead = "cluwne_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/tunnelclown
name = "A Clown?"
desc = "Have you heard about our lord and savior, Honkus Chrust?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "tunnel_new"
icon_living = "tunnel_new"
icon_dead = "tunnel_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/sentinel
name = "A Clown?"
desc = "This guy means business..."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "sentinel_new"
icon_living = "sentinel_new"
icon_dead = "sentinel_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/punished
name = "A Clown?"
desc = "A clown at peak performance."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_punished"
icon_living = "c_punished"
icon_dead = "punished_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/thicc
name = "A Clown..."
desc = "I mean, you see it don't you?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_thicc"
icon_living = "c_thicc"
icon_dead = "thicc_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/perm
name = "A Clown?"
desc = "That clown really needs to get that hair under control."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_perm"
icon_living = "c_perm"
icon_dead = "perm_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/wide
name = "A Clown?"
desc = "He looks good from some angles!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_wide"
icon_living = "c_wide"
icon_dead = "wide_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/thin
name = "A Clown?"
desc = "Is he eating enough?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_thin"
icon_living = "c_thin"
icon_dead = "thin_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/hulk
name = "A Clown?"
desc = "Just look at those muscles."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "honkhulk"
icon_living = "honkhulk"
icon_dead = "hulk_dead"
icon_gib = "generic_gib"
vis_height = 64
health = 350
maxHealth = 350
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/longface
name = "A Clown?"
desc = "Why the long face?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "long face"
icon_living = "long face"
icon_dead = "long_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/giggles
name = "A Giggles?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "giggles"
icon_living = "giggles"
icon_dead = "giggles_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/destroyer
name = "A Clown?"
desc = "That clown looks like he means business."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "destroyer"
icon_living = "destroyer"
icon_dead = "destroyer_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
movement_cooldown = 10
movement_sound = 'sound/weapons/heavysmash.ogg'
movement_shake_radius = 5
armor = list(
"melee" = 40,
"bullet" = 20,
"laser" = 10,
"energy" = 0,
"bomb" = 0,
"bio" = 0,
"rad" = 0
)
armor_soak = list(
"melee" = 10,
"bullet" = 5,
"laser" = 0,
"energy" = 0,
"bomb" = 0,
"bio" = 0,
"rad" = 0
)
/mob/living/simple_mob/mobs_monsters/clowns/big/chlown
name = "A Clown?"
desc = "No."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "chlown"
icon_living = "chlown"
icon_dead = "chlown_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/scary
name = "A Clown?"
desc = "Hey that clown looks familiar!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "scary_clown"
icon_living = "scary_clown"
icon_dead = "scary_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/flesh
name = "A Clown?"
desc = "WOOOOO STREAKING WOOOO!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "fleshclown"
icon_living = "fleshclown"
icon_dead = "flesh_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/clowns
name = "Definitely a singular clown"
desc = "Is it one clown, or many clowns in not a trenchcoat?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "clowns"
icon_living = "clowns"
icon_dead = "clowns_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/mutant
name = "A Clown?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "mutant"
icon_living = "mutant"
icon_dead = "mutant_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/blob
name = "A Clown?"
desc = "Go to a gym fatty!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "blob"
icon_living = "blob"
icon_dead = "blob_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/mayor
name = "A clown?"
desc = "One speaks in riddles..."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/giantclowns.dmi'
icon_state = "c_mayor"
icon_living = "c_mayor"
icon_dead = "mayor_dead"
icon_gib = "generic_gib"
vis_height = 96
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/honkling
name = "A Clown?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "honkling"
icon_living = "honkling"
icon_dead = "honkling_dead"
icon_gib = "generic_gib"
vis_height = 32
//template
///mob/living/simple_mob/mobs_monsters/clowns/big/
// name = "A Clown?"
// desc = "Oh sweet space christ."
// tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
// icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
// icon_state = ""
// icon_living = ""
// icon_dead = "_dead"
// icon_gib = "generic_gib"
// vis_height = 64

View File

@@ -0,0 +1,7 @@
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
faction = "clown"
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/New()
..()
verbs += /mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/proc/phase_shift

View File

@@ -0,0 +1,365 @@
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/anormal
name = "Clown"
desc = "A regular, every tuesday Clown."
tt_desc = "E Homo sapiens corydon" //this is a clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_normal"
icon_living = "c_normal"
icon_dead = "clown_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/honkmunculus
name = "A Clown?"
desc = "That clown has some interesting proportions."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/TGClowns.dmi'
icon_state = "honkmunculus"
icon_living = "honkmunculus"
icon_dead = "honkmunculus_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/cluwne
name = "A Clown?"
desc = "Oh no not that thing."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "cluwne"
icon_living = "cluwne"
icon_dead = "cluwne_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/tunnelclown
name = "A Clown?"
desc = "Have you heard about our lord and savior, Honkus Chrust?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "tunnel_new"
icon_living = "tunnel_new"
icon_dead = "tunnel_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/sentinel
name = "A Clown?"
desc = "This guy means business..."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "sentinel_new"
icon_living = "sentinel_new"
icon_dead = "sentinel_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/punished
name = "A Clown?"
desc = "A clown at peak performance."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_punished"
icon_living = "c_punished"
icon_dead = "punished_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/thicc
name = "A Clown..."
desc = "I mean, you see it don't you?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_thicc"
icon_living = "c_thicc"
icon_dead = "thicc_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/perm
name = "A Clown?"
desc = "That clown really needs to get that hair under control."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_perm"
icon_living = "c_perm"
icon_dead = "perm_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/wide
name = "A Clown?"
desc = "He looks good from some angles!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_wide"
icon_living = "c_wide"
icon_dead = "wide_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/thin
name = "A Clown?"
desc = "Is he eating enough?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_thin"
icon_living = "c_thin"
icon_dead = "thin_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/hulk
name = "A Clown?"
desc = "Just look at those muscles."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "honkhulk"
icon_living = "honkhulk"
icon_dead = "hulk_dead"
icon_gib = "generic_gib"
vis_height = 64
health = 350
maxHealth = 350
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/longface
name = "A Clown?"
desc = "Why the long face?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "long face"
icon_living = "long face"
icon_dead = "long_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/giggles
name = "A Giggles?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "giggles"
icon_living = "giggles"
icon_dead = "giggles_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/destroyer
name = "A Clown?"
desc = "That clown looks like he means business."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "destroyer"
icon_living = "destroyer"
icon_dead = "destroyer_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
movement_cooldown = 10
movement_sound = 'sound/weapons/heavysmash.ogg'
movement_shake_radius = 5
armor = list(
"melee" = 40,
"bullet" = 20,
"laser" = 10,
"energy" = 0,
"bomb" = 0,
"bio" = 0,
"rad" = 0
)
armor_soak = list(
"melee" = 10,
"bullet" = 5,
"laser" = 0,
"energy" = 0,
"bomb" = 0,
"bio" = 0,
"rad" = 0
)
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/chlown
name = "A Clown?"
desc = "No."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "chlown"
icon_living = "chlown"
icon_dead = "chlown_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/scary
name = "A Clown?"
desc = "Hey that clown looks familiar!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "scary_clown"
icon_living = "scary_clown"
icon_dead = "scary_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/flesh
name = "A Clown?"
desc = "WOOOOO STREAKING WOOOO!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "fleshclown"
icon_living = "fleshclown"
icon_dead = "flesh_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/clowns
name = "Definitely a singular clown"
desc = "Is it one clown, or many clowns in not a trenchcoat?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "clowns"
icon_living = "clowns"
icon_dead = "clowns_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/mutant
name = "A Clown?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "mutant"
icon_living = "mutant"
icon_dead = "mutant_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/blob
name = "A Clown?"
desc = "Go to a gym fatty!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "blob"
icon_living = "blob"
icon_dead = "blob_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/mayor
name = "A clown?"
desc = "One speaks in riddles..."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/giantclowns.dmi'
icon_state = "c_mayor"
icon_living = "c_mayor"
icon_dead = "mayor_dead"
icon_gib = "generic_gib"
vis_height = 96
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/honkling
name = "A Clown?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "honkling"
icon_living = "honkling"
icon_dead = "honkling_dead"
icon_gib = "generic_gib"
vis_height = 32

View File

@@ -0,0 +1,95 @@
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift
var/ability_flags = 0 //Flags for active abilities
// Phase shifting procs (and related procs)
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/proc/phase_shift()
var/turf/T = get_turf(src)
if(!T.CanPass(src,T) || loc != T)
to_chat(src,"<span class='warning'>You can't use that here!</span>")
return FALSE
forceMove(T)
var/original_canmove = canmove
SetStunned(0)
SetWeakened(0)
if(buckled)
buckled.unbuckle_mob()
if(pulledby)
pulledby.stop_pulling()
stop_pulling()
canmove = FALSE
//Shifting in
if(ability_flags & AB_PHASE_SHIFTED)
ability_flags &= ~AB_PHASE_SHIFTED
mouse_opacity = 2
name = real_name
overlays.Cut()
alpha = initial(alpha)
invisibility = initial(invisibility)
see_invisible = initial(see_invisible)
incorporeal_move = initial(incorporeal_move)
density = initial(density)
force_max_speed = initial(force_max_speed)
//Cosmetics mostly
flick("tp_in",src)
custom_emote(1,"phases in!")
sleep(5) //The duration of the TP animation
canmove = original_canmove
// Do this after the potential vore, so we get the belly
update_icon()
//Affect nearby lights
for(var/obj/machinery/light/L in machines)
if(L.z != z || get_dist(src,L) > 10)
continue
L.flicker(10)
//Shifting out
else
ability_flags |= AB_PHASE_SHIFTED
mouse_opacity = 0
custom_emote(1,"phases out!")
real_name = name
name = "Something"
overlays.Cut()
flick("tp_out",src)
sleep(5)
invisibility = INVISIBILITY_LEVEL_TWO
see_invisible = INVISIBILITY_LEVEL_TWO
update_icon()
alpha = 127
canmove = original_canmove
incorporeal_move = TRUE
density = FALSE
force_max_speed = TRUE
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/UnarmedAttack()
if(ability_flags & AB_PHASE_SHIFTED)
return FALSE //Nope.
. = ..()
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/can_fall()
if(ability_flags & AB_PHASE_SHIFTED)
return FALSE //Nope!
return ..()
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/zMove(direction)
if(ability_flags & AB_PHASE_SHIFTED)
var/turf/destination = (direction == UP) ? GetAbove(src) : GetBelow(src)
if(destination)
forceMove(destination)
return TRUE
return ..()

View File

@@ -0,0 +1,30 @@
// These are used to spawn a specific mob when triggered, with the mob controlled by a player pulled from the ghost pool, hense its name.
/obj/structure/ghost_pod/manual/clegg
name = "Clown Egg?"
desc = "Why does this have to be what this is?"
icon = 'icons/mob/mobs_monsters/giantclowns.dmi'
icon_state = "c_egg"
icon_state_opened = "c_egg_opened" // Icon to switch to when 'used'.
ghost_query_type = /datum/ghost_query/hellclown
/datum/ghost_query/hellclown
role_name = "egg clown"
question = "THE HONKMOTHER REQUESTS SUBJECTS. REPORT TO THE ELEMENTAL TO JOIN THE HONKENING."
cutoff_number = 1
/obj/structure/ghost_pod/manual/clegg/trigger()
..("<span class='warning'>\The [usr] places their hand on the egg!</span>", "is attempting to make a mistake!")
/obj/structure/ghost_pod/manual/clegg/create_occupant(var/mob/M)
lightning_strike(get_turf(src), cosmetic = TRUE)
var/list/choices = list(/mob/living/simple_mob/mobs_monsters/clowns/normal, /mob/living/simple_mob/mobs_monsters/clowns/honkling, /mob/living/simple_mob/mobs_monsters/clowns/mayor, /mob/living/simple_mob/mobs_monsters/clowns/blob, /mob/living/simple_mob/mobs_monsters/clowns/mutant, /mob/living/simple_mob/mobs_monsters/clowns/clowns, /mob/living/simple_mob/mobs_monsters/clowns/flesh, /mob/living/simple_mob/mobs_monsters/clowns/scary, /mob/living/simple_mob/mobs_monsters/clowns/chlown, /mob/living/simple_mob/mobs_monsters/clowns/destroyer, /mob/living/simple_mob/mobs_monsters/clowns/giggles, /mob/living/simple_mob/mobs_monsters/clowns/longface, /mob/living/simple_mob/mobs_monsters/clowns/hulk, /mob/living/simple_mob/mobs_monsters/clowns/thin, /mob/living/simple_mob/mobs_monsters/clowns/wide, /mob/living/simple_mob/mobs_monsters/clowns/perm, /mob/living/simple_mob/mobs_monsters/clowns/thicc, /mob/living/simple_mob/mobs_monsters/clowns/punished, /mob/living/simple_mob/mobs_monsters/clowns/sentinel, /mob/living/simple_mob/mobs_monsters/clowns/tunnelclown, /mob/living/simple_mob/mobs_monsters/clowns/cluwne, /mob/living/simple_mob/mobs_monsters/clowns/honkmunculus)
var/chosen_clown = input(M, "Redspace clowns like themes, what's yours?") in choices
density = FALSE
var/mob/living/simple_mob/R = new chosen_clown(get_turf(src))
if(M.mind)
M.mind.transfer_to(R)
to_chat(M, "<span class='notice'>You are a <b>Clown!</b>! HONK!</span>")
R.ckey = M.ckey
visible_message("<span class='warning'>With a bright flash of light, \the [src] disappears, and in its place you see a... Clown?</span>")
log_and_message_admins("successfully touched \a [src] and summoned a mistake!")
..()

View File

@@ -0,0 +1,35 @@
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/honkelemental
name = "Honk Elemental"
desc = "That thing can't be real, right?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/giantclowns.dmi'
icon_state = "honk_elemental"
icon_living = "honk_elemental"
icon_dead = "he_dead"
icon_gib = "generic_gib"
vis_height = 96
faction = "clown"
loot_list = list(/obj/item/weapon/bikehorn = 100)
response_help = "pokes"
response_disarm = "gently pushes aside"
response_harm = "hits"
say_list_type = /datum/say_list/clown
/datum/say_list/clown
speak = list("HONK", "Honk!", "Henk!")
emote_see = list("honks")
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/honkelemental/verb/spawn_egg()
set category = "Abilities"
set name = "Spawn Clown Egg"
set desc = "Spawns an egg that a player can touch, which will call on ghosts to spawn as clowns."
if(is_dead())
return
new /obj/structure/ghost_pod/manual/clegg(get_turf(src))
flick("he_lay",src)

View File

@@ -0,0 +1,362 @@
/mob/living/simple_mob/mobs_monsters/clowns/
response_help = "pokes"
response_disarm = "gently pushes aside"
response_harm = "hits"
say_list_type = /datum/say_list/clown
/datum/say_list/clown
speak = list("HONK", "Honk!", "Henk!")
emote_see = list("honks")
/mob/living/simple_mob/mobs_monsters/clowns/honkmunculus
name = "A Clown?"
desc = "That clown has some interesting proportions."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/TGClowns.dmi'
icon_state = "honkmunculus"
icon_living = "honkmunculus"
icon_dead = "honkmunculus_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/cluwne
name = "A Clown?"
desc = "Oh no not that thing."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "cluwne"
icon_living = "cluwne"
icon_dead = "cluwne_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/tunnelclown
name = "A Clown?"
desc = "Have you heard about our lord and savior, Honkus Chrust?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "tunnel_new"
icon_living = "tunnel_new"
icon_dead = "tunnel_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/sentinel
name = "A Clown?"
desc = "This guy means business..."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "sentinel_new"
icon_living = "sentinel_new"
icon_dead = "sentinel_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/punished
name = "A Clown?"
desc = "A clown at peak performance."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_punished"
icon_living = "c_punished"
icon_dead = "punished_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/thicc
name = "A Clown..."
desc = "I mean, you see it don't you?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_thicc"
icon_living = "c_thicc"
icon_dead = "thicc_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/perm
name = "A Clown?"
desc = "That clown really needs to get that hair under control."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_perm"
icon_living = "c_perm"
icon_dead = "perm_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/wide
name = "A Clown?"
desc = "He looks good from some angles!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_wide"
icon_living = "c_wide"
icon_dead = "wide_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/thin
name = "A Clown?"
desc = "Is he eating enough?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_thin"
icon_living = "c_thin"
icon_dead = "thin_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/hulk
name = "A Clown?"
desc = "Just look at those muscles."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "honkhulk"
icon_living = "honkhulk"
icon_dead = "hulk_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/longface
name = "A Clown?"
desc = "Why the long face?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "long face"
icon_living = "long face"
icon_dead = "long_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/giggles
name = "A Giggles?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "giggles"
icon_living = "giggles"
icon_dead = "giggles_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/destroyer
name = "A Clown?"
desc = "That clown looks like he means business."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "destroyer"
icon_living = "destroyer"
icon_dead = "destroyer_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/chlown
name = "A Clown?"
desc = "No."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "chlown"
icon_living = "chlown"
icon_dead = "chlown_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/scary
name = "A Clown?"
desc = "Hey that clown looks familiar!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "scary_clown"
icon_living = "scary_clown"
icon_dead = "scary_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/flesh
name = "A Clown?"
desc = "WOOOOO STREAKING WOOOO!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "fleshclown"
icon_living = "fleshclown"
icon_dead = "flesh_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/clowns
name = "Definitely a singular clown"
desc = "Is it one clown, or many clowns in not a trenchcoat?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "clowns"
icon_living = "clowns"
icon_dead = "clowns_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/mutant
name = "A Clown?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "mutant"
icon_living = "mutant"
icon_dead = "mutant_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/blob
name = "A Clown?"
desc = "Go to a gym fatty!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "blob"
icon_living = "blob"
icon_dead = "blob_dead"
icon_gib = "generic_gib"
vis_height = 64
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/mayor
name = "A clown?"
desc = "One speaks in riddles..."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/giantclowns.dmi'
icon_state = "c_mayor"
icon_living = "c_mayor"
icon_dead = "mayor_dead"
icon_gib = "generic_gib"
vis_height = 96
old_x = -16
old_y = 0
default_pixel_x = -16
pixel_x = -16
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/honkling
name = "A Clown?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
icon = 'icons/mob/mobs_monsters/tgclowns.dmi'
icon_state = "honkling"
icon_living = "honkling"
icon_dead = "honkling_dead"
icon_gib = "generic_gib"
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/normal
name = "Clown"
desc = "A regular, every tuesday Clown."
tt_desc = "E Homo sapiens corydon" //this is a clown
icon = 'icons/mob/mobs_monsters/newclowns.dmi'
icon_state = "c_normal"
icon_living = "c_normal"
icon_dead = "clown_dead"
icon_gib = "generic_gib"
vis_height = 32
faction = "clown"
loot_list = list(/obj/item/weapon/bikehorn = 100)
response_help = "pokes"
response_disarm = "gently pushes aside"
response_harm = "hits"

View File

@@ -0,0 +1,6 @@
/mob/living/simple_mob/default_can_use_topic(var/src_object)
. = shared_nano_interaction(src_object)
if(. != STATUS_CLOSE)
. = min(., shared_living_nano_distance(src_object))
//Allows simple mobs to interact with nanoui as long as they have "has_hands = TRUE"

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +0,0 @@
copy css\* "%USERPROFILE%\Documents\BYOND\cache" /y
copy images\* "%USERPROFILE%\Documents\BYOND\cache" /y
copy js\* "%USERPROFILE%\Documents\BYOND\cache" /y
copy templates\* "%USERPROFILE%\Documents\BYOND\cache" /y

View File

@@ -0,0 +1,53 @@
#!/usr/bin/python3
# Setup
import os, json, shutil, glob, platform
if(platform.system() != "Windows"):
print("Error: This script doesn't work on anything but Windows. How are you even planning to develop BYOND off windows?")
exit()
cdir = (os.getcwd())
if(cdir[-4:] != "nano"):
print("This script must be run from the nano directory.")
exit()
def find_cache():
target = os.path.join(os.path.expanduser("~"), "Documents", "BYOND", "cache")
for root, dirs, files in os.walk(target):
if "nano_templates_bundle.js" in files:
return root
cache = find_cache()
if cache == None:
print("Failed to find BYOND Cache.")
exit()
# Send all of the random files to the cache
def send_to_cache(arrayOfFiles):
for file in arrayOfFiles:
target = os.path.join(cache, os.path.split(file)[1])
shutil.copyfile(file, target)
send_to_cache([os.path.join(cdir, "css", f) for f in os.listdir(os.path.join(cdir, "css")) if os.path.isfile(os.path.join(cdir, "css", f))])
send_to_cache([os.path.join(cdir, "images", f) for f in os.listdir(os.path.join(cdir, "images")) if os.path.isfile(os.path.join(cdir, "images", f))])
send_to_cache([os.path.join(cdir, "js", f) for f in os.listdir(os.path.join(cdir, "js")) if os.path.isfile(os.path.join(cdir, "js", f))])
# Handle creating the tmpl bundle
arrOfFiles = glob.glob(os.path.join(cdir, "templates", "*.tmpl"))
tmpl_bundle_header = "function nanouiTemplateBundle(){return "
tmpl_bundle_footer = ";}"
big_json_array = {}
for file in arrOfFiles:
tmpl_name = os.path.split(file)[1]
with open(file, 'r') as tmpl:
big_json_array[tmpl_name] = tmpl.read()
tmpl_bundle = tmpl_bundle_header + json.dumps(big_json_array) + tmpl_bundle_footer
# Send the tmpl bundle to the cache
with open(os.path.join(cache, "nano_templates_bundle.js"), "w") as templateBundleFile:
templateBundleFile.write(tmpl_bundle)
templateBundleFile.close()

BIN
sound/effects/Whipcrack.ogg Normal file

Binary file not shown.

View File

@@ -1647,9 +1647,9 @@
#include "code\modules\ai\ai_holder_targeting_vr.dm"
#include "code\modules\ai\interfaces.dm"
#include "code\modules\ai\say_list.dm"
#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm"
#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm"
#include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm"
#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm"
#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai_vr.dm"
#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm"
#include "code\modules\alarm\alarm.dm"
#include "code\modules\alarm\alarm_handler.dm"
#include "code\modules\alarm\atmosphere_alarm.dm"
@@ -2778,6 +2778,15 @@
#include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_abilities.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_subtypes.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\demon\~defines.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\Big.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\bigclowns.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\bus.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\busclowns.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\c_shift.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\Clowns.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\hespawner.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\honkelemental.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\regularclowns.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\morph\morph.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\_defines.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\ability_objects.dm"
@@ -2885,6 +2894,7 @@
#include "code\modules\nano\interaction\conscious.dm"
#include "code\modules\nano\interaction\contained.dm"
#include "code\modules\nano\interaction\default.dm"
#include "code\modules\nano\interaction\default_vr.dm"
#include "code\modules\nano\interaction\interactive.dm"
#include "code\modules\nano\interaction\inventory.dm"
#include "code\modules\nano\interaction\inventory_deep.dm"