Merge branch 'master' into economy-update-junk

This commit is contained in:
Dahlular
2022-07-06 16:28:45 -06:00
committed by GitHub
196 changed files with 865 additions and 721 deletions
+1 -1
View File
@@ -216,7 +216,7 @@
/obj/effect/vr_clean_master // Will keep VR areas that have this relatively clean.
icon = 'icons/mob/screen_gen.dmi'
icon_state = "x2"
color = "#00FF00"
color = COLOR_GREEN
invisibility = INVISIBILITY_ABSTRACT
var/area/vr_area
+1 -1
View File
@@ -660,7 +660,7 @@
"playersonly" = list("desc" = "Only spawn ghost-controlled mobs", "type" = "boolean", "value" = "No"),
"ghostpoll" = list("desc" = "Ghost poll question", "type" = "string", "value" = "Do you want to play as %TYPE% portal invader?"),
"delay" = list("desc" = "Time between portals, in deciseconds", "type" = "number", "value" = 50),
"color" = list("desc" = "Portal color", "type" = "color", "value" = "#00FF00"),
"color" = list("desc" = "Portal color", "type" = "color", "value" = COLOR_GREEN),
"playlightning" = list("desc" = "Play lightning sounds on announcement", "type" = "boolean", "value" = "Yes"),
"announce_players" = list("desc" = "Make an announcement", "type" = "boolean", "value" = "Yes"),
"announcement" = list("desc" = "Announcement", "type" = "string", "value" = "Massive bluespace anomaly detected en route to %STATION%. Brace for impact."),
@@ -36,7 +36,7 @@
if(overmind)
H.color = overmind.blob_reagent_datum.complementary_color
else
H.color = "#000000"
H.color = COLOR_BLACK
adjustHealth(-maxHealth*0.0125)
/mob/living/simple_animal/hostile/blob/fire_act(exposed_temperature, exposed_volume)
@@ -240,14 +240,14 @@
if(overmind)
H.color = overmind.blob_reagent_datum.complementary_color
else
H.color = "#000000"
H.color = COLOR_BLACK
if(locate(/obj/structure/blob/node) in blobs_in_area)
adjustHealth(-maxHealth*0.05)
var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(src))
if(overmind)
H.color = overmind.blob_reagent_datum.complementary_color
else
H.color = "#000000"
H.color = COLOR_BLACK
if(damagesources)
for(var/i in 1 to damagesources)
adjustHealth(maxHealth*0.025) //take 2.5% of max health as damage when not near the blob or if the naut has no factory, 5% if both
@@ -721,7 +721,7 @@ datum/antagonist/bloodsucker/proc/SpendRank()
// Update Rank Counter
if(owner.current.hud_used.vamprank_display)
var/valuecolor = vamplevel_unspent ? "#FFFF00" : "#FF0000"
var/valuecolor = vamplevel_unspent ? COLOR_YELLOW : COLOR_RED
owner.current.hud_used.vamprank_display.update_counter(vamplevel, valuecolor)
if(updateRank) // Only change icon on special request.
owner.current.hud_used.vamprank_display.icon_state = (vamplevel_unspent > 0) ? "rank_up" : "rank"
+2 -2
View File
@@ -503,7 +503,7 @@
name = "Binding Aura"
desc = "Allows you to bind a victim and temporarily silence them."
invocation = "In'totum Lig'abis."
color = "#000000" // black
color = COLOR_BLACK
/obj/item/melee/blood_magic/shackles/afterattack(atom/target, mob/living/carbon/user, proximity)
if(iscultist(user) && iscarbon(target) && proximity)
@@ -553,7 +553,7 @@
name = "Corrupting Aura"
desc = "Corrupts metal and plasteel into more sinister forms."
invocation = "Ethra p'ni dedol."
color = "#000000" // black
color = COLOR_BLACK
/obj/item/melee/blood_magic/construction/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
if(proximity_flag && iscultist(user))
+5 -5
View File
@@ -110,7 +110,7 @@
throw_speed = 1
throw_range = 3
sharpness = IS_SHARP
light_color = "#ff0000"
light_color = COLOR_RED
attack_verb = list("cleaved", "slashed", "torn", "hacked", "ripped", "diced", "carved")
icon_state = "cultbastard"
item_state = "cultbastard"
@@ -625,7 +625,7 @@
brightness_on = 1
icon_state = "torch"
item_state = "torch"
color = "#ff0000"
color = COLOR_RED
on_damage = 15
slot_flags = null
on = TRUE
@@ -783,7 +783,7 @@
/obj/item/gun/ballistic/shotgun/boltaction/enchanted/arcane_barrage/blood
name = "blood bolt barrage"
desc = "Blood for blood."
color = "#ff0000"
color = COLOR_RED
guns_left = 24
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/enchanted/arcane_barrage/blood
fire_sound = 'sound/magic/wand_teleport.ogg'
@@ -872,9 +872,9 @@
if(i > 1)
sleep(15)
if(i < 4)
O = new /obj/effect/temp_visual/cult/rune_spawn/rune1/inner(user.loc, 30, "#ff0000")
O = new /obj/effect/temp_visual/cult/rune_spawn/rune1/inner(user.loc, 30, COLOR_RED)
else
O = new /obj/effect/temp_visual/cult/rune_spawn/rune5(user.loc, 30, "#ff0000")
O = new /obj/effect/temp_visual/cult/rune_spawn/rune5(user.loc, 30, COLOR_RED)
new /obj/effect/temp_visual/dir_setting/cult/phase/out(user.loc, user.dir)
if(O)
qdel(O)
@@ -12,8 +12,8 @@
visible_message("<span class='danger'>[src] fades away.</span>")
invisibility = INVISIBILITY_OBSERVER
alpha = 100 //To help ghosts distinguish hidden runes
light_range = 0
light_power = 0
set_light_range(0)
set_light_range(0)
update_light()
STOP_PROCESSING(SSfastprocess, src)
@@ -22,8 +22,8 @@
invisibility = 0
visible_message("<span class='danger'>[src] suddenly appears!</span>")
alpha = initial(alpha)
light_range = initial(light_range)
light_power = initial(light_power)
set_light_range(initial(light_range))
set_light_power(initial(light_power))
update_light()
START_PROCESSING(SSfastprocess, src)
@@ -180,7 +180,7 @@
desc = "A floating crystal that slowly heals those faithful to Nar'Sie."
icon_state = "pylon"
light_range = 1.5
light_color = LIGHT_COLOR_RED
light_color = COLOR_SOFT_RED
break_sound = 'sound/effects/glassbr2.ogg'
break_message = "<span class='warning'>The blood-red crystal falls to the floor and shatters!</span>"
var/heal_delay = 25
+4 -4
View File
@@ -428,14 +428,14 @@ structure_check() searches for nearby cultist structures required for the invoca
playsound(T, pick('sound/effects/sparks1.ogg', 'sound/effects/sparks2.ogg', 'sound/effects/sparks3.ogg', 'sound/effects/sparks4.ogg'), 100, TRUE, 14)
inner_portal = new /obj/effect/temp_visual/cult/portal(T)
if(portal_type == "space")
light_color = color
set_light_color(color)
desc += "<br><b>A tear in reality reveals a black void interspersed with dots of light... something recently teleported here from space.<br><u>The void feels like it's trying to pull you to the [dir2text(get_dir(T, origin))]!</u></b>"
else
inner_portal.icon_state = "lava"
light_color = LIGHT_COLOR_FIRE
set_light_color(LIGHT_COLOR_FIRE)
desc += "<br><b>A tear in reality reveals a coursing river of lava... something recently teleported here from the Lavaland Mines!</b>"
outer_portal = new(T, 600, color)
light_range = 4
set_light_range(4)
update_light()
addtimer(CALLBACK(src, .proc/close_portal), 600, TIMER_UNIQUE)
@@ -443,7 +443,7 @@ structure_check() searches for nearby cultist structures required for the invoca
qdel(inner_portal)
qdel(outer_portal)
desc = initial(desc)
light_range = 0
set_light_range(0)
update_light()
//Ritual of Dimensional Rending: Calls forth the avatar of Nar'Sie upon the station.
@@ -707,7 +707,7 @@ This is here to make the tiles around the station mininuke change when it's arme
user.visible_message("<span class='suicide'>[user] is going delta! It looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(src, 'sound/machines/alarm.ogg', 50, -1, 1)
for(var/i in 1 to 100)
addtimer(CALLBACK(user, /atom/proc/add_atom_colour, (i % 2)? "#00FF00" : "#FF0000", ADMIN_COLOUR_PRIORITY), i)
addtimer(CALLBACK(user, /atom/proc/add_atom_colour, (i % 2)? COLOR_GREEN : COLOR_RED, ADMIN_COLOUR_PRIORITY), i)
addtimer(CALLBACK(src, .proc/manual_suicide, user), 101)
return MANUAL_SUICIDE
-1
View File
@@ -10,7 +10,6 @@
w_class = WEIGHT_CLASS_TINY
materials = list(MAT_METAL = 300, MAT_GLASS = 300)
crit_fail = FALSE //Is the flash burnt out?
light_color = LIGHT_COLOR_WHITE
light_power = FLASH_LIGHT_POWER
var/flashing_overlay = "flash-f"
var/times_used = 0 //Number of times it's been used.
@@ -652,17 +652,17 @@
if(0)
add_overlay(AALARM_OVERLAY_GREEN)
overlay_state = AALARM_OVERLAY_GREEN
light_color = LIGHT_COLOR_GREEN
set_light_color(LIGHT_COLOR_GREEN)
set_light(brightness_on)
if(1)
add_overlay(AALARM_OVERLAY_WARN)
overlay_state = AALARM_OVERLAY_WARN
light_color = LIGHT_COLOR_LAVA
set_light_color(LIGHT_COLOR_LAVA)
set_light(brightness_on)
if(2)
add_overlay(AALARM_OVERLAY_DANGER)
overlay_state = AALARM_OVERLAY_DANGER
light_color = LIGHT_COLOR_RED
set_light_color(COLOR_SOFT_RED)
set_light(brightness_on)
SSvis_overlays.add_vis_overlay(src, icon, overlay_state, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
@@ -158,7 +158,7 @@
/obj/machinery/atmospherics/miner/toxins
name = "\improper Plasma Gas Miner"
overlay_color = "#FF0000"
overlay_color = COLOR_RED
spawn_id = /datum/gas/plasma
/obj/machinery/atmospherics/miner/carbon_dioxide
+1 -1
View File
@@ -7,7 +7,7 @@
desc = "Used to check and claim bounties offered by Kinaris"
icon_screen = "bounty"
circuit = /obj/item/circuitboard/computer/bounty
light_color = "#E2853D"//orange
light_color = COLOR_BRIGHT_ORANGE
var/printer_ready = 0 //cooldown var
/obj/machinery/computer/bounty/Initialize()
+1 -2
View File
@@ -3,6 +3,7 @@
desc = "Used to order supplies, approve requests, and control the shuttle."
icon_screen = "supply"
circuit = /obj/item/circuitboard/computer/cargo
light_color = COLOR_BRIGHT_ORANGE
ui_x = 780
ui_y = 750
@@ -18,8 +19,6 @@
/// var that tracks message cooldown
var/message_cooldown
light_color = "#E2853D"//orange
/obj/machinery/computer/cargo/request
name = "supply request console"
desc = "Used to request supplies from cargo."
+24 -24
View File
@@ -65,7 +65,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/allow_midround_antag = 1
var/preferred_map = null
var/pda_style = MONO
var/pda_color = "#808000"
var/pda_color = COLOR_OLIVE
var/pda_skin = PDA_SKIN_ALT
var/list/alt_titles_preferences = list()
@@ -2012,11 +2012,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
//Now that we changed our species, we must verify that the mutant colour is still allowed.
var/temp_hsv = RGBtoHSV(features["mcolor"])
if(features["mcolor"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
if(features["mcolor"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV(COLOR_NEARLY_BLACK)[3]))
features["mcolor"] = pref_species.default_color
if(features["mcolor2"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
if(features["mcolor2"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV(COLOR_NEARLY_BLACK)[3]))
features["mcolor2"] = pref_species.default_color
if(features["mcolor3"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
if(features["mcolor3"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV(COLOR_NEARLY_BLACK)[3]))
features["mcolor3"] = pref_species.default_color
if("custom_species")
@@ -2030,10 +2030,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/new_mutantcolor = input(user, "Choose your character's alien/mutant color:", "Character Preference","#"+features["mcolor"]) as color|null
if(new_mutantcolor)
var/temp_hsv = RGBtoHSV(new_mutantcolor)
if(new_mutantcolor == "#000000")
if(new_mutantcolor == COLOR_BLACK)
features["mcolor"] = pref_species.default_color
update_preview_icon()
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(COLOR_NEARLY_BLACK)[3]) // mutantcolors must be bright, but only if they affect the skin
features["mcolor"] = sanitize_hexcolor(new_mutantcolor)
update_preview_icon()
else
@@ -2043,10 +2043,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/new_mutantcolor = input(user, "Choose your character's secondary alien/mutant color:", "Character Preference") as color|null
if(new_mutantcolor)
var/temp_hsv = RGBtoHSV(new_mutantcolor)
if(new_mutantcolor == "#000000")
if(new_mutantcolor == COLOR_BLACK)
features["mcolor2"] = pref_species.default_color
update_preview_icon()
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(COLOR_NEARLY_BLACK)[3]) // mutantcolors must be bright, but only if they affect the skin
features["mcolor2"] = sanitize_hexcolor(new_mutantcolor)
update_preview_icon()
else
@@ -2056,10 +2056,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/new_mutantcolor = input(user, "Choose your character's tertiary alien/mutant color:", "Character Preference") as color|null
if(new_mutantcolor)
var/temp_hsv = RGBtoHSV(new_mutantcolor)
if(new_mutantcolor == "#000000")
if(new_mutantcolor == COLOR_BLACK)
features["mcolor3"] = pref_species.default_color
update_preview_icon()
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(COLOR_NEARLY_BLACK)[3]) // mutantcolors must be bright, but only if they affect the skin
features["mcolor3"] = sanitize_hexcolor(new_mutantcolor)
update_preview_icon()
else
@@ -2186,7 +2186,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("wings_color")
var/new_wing_color = input(user, "Choose your character's wing colour:", "Character Preference","#"+wing_color) as color|null
if(new_wing_color)
if (new_wing_color == "#000000")
if (new_wing_color == COLOR_BLACK)
wing_color = "#FFFFFF"
else
wing_color = sanitize_hexcolor(new_wing_color)
@@ -2422,9 +2422,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/new_cockcolor = input(user, "Penis color:", "Character Preference") as color|null
if(new_cockcolor)
var/temp_hsv = RGBtoHSV(new_cockcolor)
if(new_cockcolor == "#000000")
if(new_cockcolor == COLOR_BLACK)
features["cock_color"] = pref_species.default_color
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(COLOR_NEARLY_BLACK)[3])
features["cock_color"] = sanitize_hexcolor(new_cockcolor)
else
to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
@@ -2454,9 +2454,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/new_ballscolor = input(user, "Testicle Color:", "Character Preference") as color|null
if(new_ballscolor)
var/temp_hsv = RGBtoHSV(new_ballscolor)
if(new_ballscolor == "#000000")
if(new_ballscolor == COLOR_BLACK)
features["balls_color"] = pref_species.default_color
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(COLOR_NEARLY_BLACK)[3])
features["balls_color"] = sanitize_hexcolor(new_ballscolor)
else
to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
@@ -2465,9 +2465,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/new_bellycolor = input(user, "Belly Color:", "Character Preference") as color|null
if(new_bellycolor)
var/temp_hsv = RGBtoHSV(new_bellycolor)
if(new_bellycolor == "#000000")
if(new_bellycolor == COLOR_BLACK)
features["belly_color"] = pref_species.default_color
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(COLOR_NEARLY_BLACK)[3])
features["belly_color"] = sanitize_hexcolor(new_bellycolor)
else
to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
@@ -2476,9 +2476,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/new_buttcolor = input(user, "Butt Color:", "Character Preference") as color|null
if(new_buttcolor)
var/temp_hsv = RGBtoHSV(new_buttcolor)
if(new_buttcolor == "#000000")
if(new_buttcolor == COLOR_BLACK)
features["butt_color"] = pref_species.default_color
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(COLOR_NEARLY_BLACK)[3])
features["butt_color"] = sanitize_hexcolor(new_buttcolor)
else
to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
@@ -2515,7 +2515,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/new_egg_color = input(user, "Egg Color:", "Character Preference") as color|null
if(new_egg_color)
var/temp_hsv = RGBtoHSV(new_egg_color)
if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
if(ReadHSV(temp_hsv)[3] >= ReadHSV(COLOR_NEARLY_BLACK)[3])
features["eggsack_egg_color"] = sanitize_hexcolor(new_egg_color)
else
to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
@@ -2551,9 +2551,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/new_breasts_color = input(user, "Breast Color:", "Character Preference") as color|null
if(new_breasts_color)
var/temp_hsv = RGBtoHSV(new_breasts_color)
if(new_breasts_color == "#000000")
if(new_breasts_color == COLOR_BLACK)
features["breasts_color"] = pref_species.default_color
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(COLOR_NEARLY_BLACK)[3])
features["breasts_color"] = sanitize_hexcolor(new_breasts_color)
else
to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
@@ -2579,9 +2579,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/new_vagcolor = input(user, "Vagina color:", "Character Preference") as color|null
if(new_vagcolor)
var/temp_hsv = RGBtoHSV(new_vagcolor)
if(new_vagcolor == "#000000")
if(new_vagcolor == COLOR_BLACK)
features["vag_color"] = pref_species.default_color
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(COLOR_NEARLY_BLACK)[3])
features["vag_color"] = sanitize_hexcolor(new_vagcolor)
else
to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
+1 -1
View File
@@ -52,7 +52,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(current_version < 19)
pda_style = "mono"
if(current_version < 20)
pda_color = "#808000"
pda_color = COLOR_OLIVE
if(current_version < 22)
if(features["balls_fluid"])
features["balls_fluid"] = /datum/reagent/consumable/semen
+8 -8
View File
@@ -3,16 +3,16 @@
desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight."
icon_state = "hardhat0_yellow"
item_state = "hardhat0_yellow"
var/brightness_on = 4 //luminosity when on
light_color = "#FFCC66"
var/power_on = 0.8
var/on = FALSE
light_color = COLOR_CREAMY_ORANGE
item_color = "yellow" //Determines used sprites: hardhat[on]_[item_color] and hardhat[on]_[item_color]2 (lying down sprite)
armor = list("melee" = 15, "bullet" = 5, "laser" = 20,"energy" = 10, "bomb" = 20, "bio" = 10, "rad" = 20, "fire" = 100, "acid" = 50)
flags_inv = 0
actions_types = list(/datum/action/item_action/toggle_helmet_light)
resistance_flags = FIRE_PROOF
dynamic_hair_suffix = "+generic"
light_on = FALSE
var/brightness_on = 4 //luminosity when on
var/power_on = 0.8
dog_fashion = /datum/dog_fashion/head
@@ -20,16 +20,16 @@
toggle_helmet_light(user)
/obj/item/clothing/head/hardhat/proc/toggle_helmet_light(mob/living/user)
on = !on
if(on)
set_light_on(!light_on)
if(light_on)
turn_on(user)
else
turn_off(user)
update_icon()
/obj/item/clothing/head/hardhat/update_icon()
icon_state = "hardhat[on]_[item_color]"
item_state = "hardhat[on]_[item_color]"
icon_state = "hardhat[light_on]_[item_color]"
item_state = "hardhat[light_on]_[item_color]"
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
H.update_inv_head()
+1 -1
View File
@@ -77,7 +77,7 @@
STOP_PROCESSING(SSobj, src)
/obj/item/clothing/head/hardhat/cakehat/is_hot()
return on * heat
return light_on * heat
/*
* Ushanka
*/
+2 -3
View File
@@ -939,9 +939,8 @@
var/energy_color = "#35FFF0"
/obj/item/clothing/suit/space/hardsuit/lavaknight/Initialize()
..()
light_color = energy_color
set_light(1)
. = ..()
set_light(l_range=1, l_color = energy_color)
update_icon()
/obj/item/clothing/suit/space/hardsuit/lavaknight/update_icon()
@@ -48,7 +48,7 @@
var/brightness_on = 4 //luminosity when the light is on
var/on = FALSE
var/smile = FALSE
var/smile_color = "#FF0000"
var/smile_color = COLOR_RED
var/visor_icon = "envisor"
var/smile_state = "envirohelm_smile"
actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_welding_screen/plasmaman)
@@ -28,46 +28,6 @@
allowed = list (/obj/item/gun/energy/laser/redtag)
resistance_flags = NONE
/*
* Posshim's Corpus atire
*/
/obj/item/clothing/suit/hooded/corpus/
name = "Standard Voidsuit"
desc = "Standard issue voidsuit in the name of Grofit!"
icon_state = "corpus"
item_state = "armor"
body_parts_covered = CHEST|GROIN|LEGS|ARMS|FEET|HANDS
hoodtype = /obj/item/clothing/head/hooded/corpus
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT //"Hide shoes" but digi shoes dont get hidden, too bad!
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
mutantrace_variation = NO_MUTANTRACE_VARIATION //There is no need for a digi variant, it's a costume
/obj/item/clothing/suit/hooded/corpus/s //sec
name = "Enforcer Voidsuit"
desc = "Delux issue grofit voidsuit. Let the middle class know You're in charge."
icon_state = "corpuss"
hoodtype = /obj/item/clothing/head/hooded/corpus/s //Enjoy this nice red outfit Kinaris! There is NO NEED for a pink one! xoxo -VivI Fanteriso
/obj/item/clothing/suit/hooded/corpus/c //command
name = "Commander Voidsuit"
desc = "Premium issue correctional worker attire. Grease the gears of production."
icon_state = "corpusc"
hoodtype = /obj/item/clothing/head/hooded/corpus/c
/obj/item/clothing/head/hooded/corpus
name = "Voidsuit helmet"
desc = "galvanized reinforced helm to protect against the elements"
icon_state = "corpus"
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK|HIDESNOUT|HIDENECK //hide your ugly face with this one simple trick!
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
/obj/item/clothing/head/hooded/corpus/s //sec
icon_state = "corpuss"
/obj/item/clothing/head/hooded/corpus/c //command
icon_state = "corpusc"
/*
* Costume
*/
+1 -1
View File
@@ -14,7 +14,7 @@
announceWhen = 30
startWhen = 1
endWhen = 115
var/list/aurora_colors = list("#ffc8bc", "#ed927f", "#d5745f", "#bf3a1d", "#c71414", "#FF3131", "#ee0808", "#ff0000")
var/list/aurora_colors = list("#ffc8bc", "#ed927f", "#d5745f", "#bf3a1d", "#c71414", "#FF3131", "#ee0808", COLOR_RED)
var/aurora_progress = 0 //this cycles from 1 to 8, slowly grading towards a bright red
var/list/areasToFlicker = list(/area/hallway,
/area/security,
+1 -1
View File
@@ -15,7 +15,7 @@
announceWhen = 1
startWhen = 8 //Delayed with sleep()
endWhen = 50
var/list/aurora_colors = list("#ffd980", "#eaff80", "#eaff80", "#ffd980", "#eaff80", "#A2FFC7", "#9400D3", "#FFC0CB")
var/list/aurora_colors = list("#ffd980", "#eaff80", "#eaff80", "#ffd980", "#eaff80", "#A2FFC7", "#9400D3", COLOR_PINK)
var/aurora_progress = 0 //this cycles from 1 to 8, slowly changing colors from gentle green to gentle blue
var/list/applicable_areas = list()
+1 -1
View File
@@ -178,7 +178,7 @@
shuttleId = "pirateship"
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
light_color = LIGHT_COLOR_RED
light_color = COLOR_SOFT_RED
possible_destinations = "pirateship_away;pirateship_home;pirateship_custom"
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate
+1 -1
View File
@@ -64,7 +64,7 @@
/datum/round_event/portal_storm/setup()
storm = mutable_appearance('icons/obj/tesla_engine/energy_ball.dmi', "energy_ball_fast", FLY_LAYER)
storm.color = "#00FF00"
storm.color = COLOR_GREEN
number_of_bosses = 0
for(var/boss in boss_types)
+4 -4
View File
@@ -74,7 +74,7 @@
/datum/spacevine_mutation/light
name = "light"
hue = "#ffff00"
hue = COLOR_YELLOW
quality = POSITIVE
severity = 4
@@ -84,7 +84,7 @@
/datum/spacevine_mutation/toxicity
name = "toxic"
hue = "#ff00ff"
hue = COLOR_MAGENTA
severity = 10
quality = NEGATIVE
@@ -101,7 +101,7 @@
/datum/spacevine_mutation/explosive //OH SHIT IT CAN CHAINREACT RUN!!!
name = "explosive"
hue = "#ff0000"
hue = COLOR_RED
quality = NEGATIVE
severity = 2
@@ -192,7 +192,7 @@
/datum/spacevine_mutation/carbondioxide_eater
name = "CO2 consuming"
hue = "#00ffff"
hue = COLOR_CYAN
severity = 3
quality = POSITIVE
+4 -4
View File
@@ -47,14 +47,14 @@
last_holder = user
if(!(user in color_altered_mobs))
color_altered_mobs += user
user.add_atom_colour("#00FF00", ADMIN_COLOUR_PRIORITY)
user.add_atom_colour(COLOR_GREEN, ADMIN_COLOUR_PRIORITY)
START_PROCESSING(SSobj, src)
..()
/obj/item/greentext/dropped(mob/living/user as mob)
if(user in color_altered_mobs)
to_chat(user, "<span class='warning'>A sudden wave of failure washes over you...</span>")
user.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY) //ya blew it
user.add_atom_colour(COLOR_RED, ADMIN_COLOUR_PRIORITY) //ya blew it
last_holder = null
new_holder = null
STOP_PROCESSING(SSobj, src)
@@ -75,7 +75,7 @@
/obj/item/greentext/process()
if(last_holder && last_holder != new_holder) //Somehow it was swiped without ever getting dropped
to_chat(last_holder, "<span class='warning'>A sudden wave of failure washes over you...</span>")
last_holder.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY)
last_holder.add_atom_colour(COLOR_RED, ADMIN_COLOUR_PRIORITY)
last_holder = new_holder //long live the king
/obj/item/greentext/Destroy(force)
@@ -89,7 +89,7 @@
var/message = "<span class='warning'>A dark temptation has passed from this world"
if(M in color_altered_mobs)
message += " and you're finally able to forgive yourself"
if(M.color == "#FF0000" || M.color == "#00FF00")
if(M.color == COLOR_RED || M.color == COLOR_GREEN)
M.remove_atom_colour(ADMIN_COLOUR_PRIORITY)
message += "...</span>"
// can't skip the mob check as it also does the decolouring
+1 -1
View File
@@ -47,7 +47,7 @@
/mob/living/simple_animal/hostile/carp/ranged/chaos
name = "chaos magicarp"
desc = "50% carp, 100% magic, 150% horrible."
color = "#00FFFF"
color = COLOR_CYAN
maxHealth = 75
health = 75
@@ -103,8 +103,8 @@
/obj/item/reagent_containers/food/snacks/customizable/update_snack_overlays(obj/item/reagent_containers/food/snacks/S)
var/mutable_appearance/filling = mutable_appearance(icon, "[initial(icon_state)]_filling")
if(S.filling_color == "#FFFFFF")
filling.color = pick("#FF0000","#0000FF","#008000","#FFFF00")
if(S.filling_color == COLOR_WHITE)
filling.color = pick(COLOR_RED, COLOR_BLUE, COLOR_DARK_GREEN, COLOR_YELLOW)
else
filling.color = S.filling_color
+1 -1
View File
@@ -273,7 +273,7 @@ All foods are distributed among various categories. Use common sense.
cut_overlays()
var/mutable_appearance/filling = mutable_appearance(icon, "[initial(icon_state)]_filling")
if(S.filling_color == "#FFFFFF")
filling.color = pick("#FF0000","#0000FF","#008000","#FFFF00")
filling.color = pick(COLOR_RED, COLOR_BLUE, COLOR_DARK_GREEN, COLOR_YELLOW)
else
filling.color = S.filling_color
@@ -12,7 +12,7 @@
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/plain
slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain
slices_num = 3
filling_color = "#FF0000"
filling_color = COLOR_RED
tastes = list("meat" = 1)
foodtype = MEAT | RAW
@@ -90,7 +90,7 @@
icon_state = "slimemeat"
desc = "Because jello wasn't offensive enough to vegans."
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin/slimejelly = 3)
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("slime" = 1, "jelly" = 1)
foodtype = MEAT | RAW | TOXIC
@@ -125,7 +125,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
icon_state = "shadowmeat"
desc = "Ow, the edge."
filling_color = "#202020"
filling_color = COLOR_NEARLY_BLACK
tastes = list("darkness" = 1, "meat" = 1)
foodtype = MEAT | RAW
@@ -147,7 +147,7 @@
name = "bone"
icon_state = "skeletonmeat"
desc = "There's a point where this needs to stop, and clearly we have passed it."
filling_color = "#F0F0F0"
filling_color = COLOR_VERY_VERY_LIGHT_GRAY
tastes = list("bone" = 1)
slice_path = null //can't slice a bone into cutlets
foodtype = GROSS
@@ -167,7 +167,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
icon_state = "ipcmeat"
desc = "Gross robot meat."
filling_color = "#000000"
filling_color = COLOR_BLACK
tastes = list("metal" = 1)
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/avian
@@ -218,7 +218,7 @@
desc = "A slice from a huge tomato."
icon_state = "tomatomeat"
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
filling_color = "#FF0000"
filling_color = COLOR_RED
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/killertomato
slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/killertomato
tastes = list("tomato" = 1)
@@ -241,7 +241,7 @@
icon_state = "xenomeat"
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
bitesize = 4
filling_color = "#32CD32"
filling_color = COLOR_LIME
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/xeno
slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/xeno
tastes = list("meat" = 1, "acid" = 1)
@@ -72,7 +72,7 @@
name = "xenomeatbread slice"
desc = "A slice of delicious meatbread. Extra Heretical."
icon_state = "xenobreadslice"
filling_color = "#32CD32"
filling_color = COLOR_LIME
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | MEAT
@@ -125,7 +125,7 @@
name = "lime cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon_state = "limecake_slice"
filling_color = "#00FF00"
filling_color = COLOR_GREEN
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR | ANTITOXIC
@@ -222,7 +222,7 @@
name = "slime cake slice"
desc = "A slice of slime cake."
icon_state = "slimecake_slice"
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1)
foodtype = GRAIN | DAIRY | SUGAR
@@ -290,7 +290,7 @@
name = "angel food cake slice"
desc = "A slice of heavenly cake."
icon_state = "holy_cake_slice"
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
foodtype = GRAIN | DAIRY | SUGAR
@@ -308,7 +308,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
name = "pound cake slice"
desc = "A slice of condensed cake made for filling people up quickly."
icon_state = "pound_cake_slice"
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1)
foodtype = GRAIN | DAIRY | SUGAR | JUNKFOOD
@@ -325,7 +325,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
name = "hardware cake slice"
desc = "A slice of electronic boards and some acid."
icon_state = "hardware_cake_slice"
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("acid" = 1, "metal" = 1, "regret" = 10)
foodtype = GRAIN | GROSS
@@ -342,7 +342,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
name = "vanilla cake slice"
desc = "A slice of vanilla frosted cake."
icon_state = "vanillacake_slice"
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10)
foodtype = GRAIN | SUGAR | DAIRY
@@ -359,7 +359,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
name = "clown cake slice"
desc = "A slice of bad jokes, and silly props."
icon_state = "clowncake_slice"
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("cake" = 1, "sugar" = 1, "joy" = 10)
foodtype = GRAIN | SUGAR | DAIRY
@@ -376,7 +376,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
name = "peach cake slice"
desc = "A slice of peach cake."
icon_state = "peach_slice"
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("cake" = 1, "sugar" = 1, "peachjuice" = 10)
foodtype = GRAIN | SUGAR | DAIRY
@@ -108,7 +108,7 @@
icon_state = "spiderleg"
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin = 2)
cooked_type = /obj/item/reagent_containers/food/snacks/boiledspiderleg
filling_color = "#000000"
filling_color = COLOR_BLACK
tastes = list("cobwebs" = 1)
foodtype = MEAT | TOXIC
@@ -137,7 +137,7 @@
desc = "A ball of meat."
icon_state = "meatball"
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#800000"
filling_color = COLOR_RED
tastes = list("meat" = 1)
foodtype = MEAT
@@ -207,7 +207,7 @@
icon_state = "khinkali"
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2)
bitesize = 3
filling_color = "#F0F0F0"
filling_color = COLOR_VERY_VERY_LIGHT_GRAY
tastes = list("meat" = 1, "onions" = 1, "garlic" = 1)
foodtype = MEAT
@@ -274,7 +274,7 @@
trash = /obj/item/trash/plate
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/capsaicin = 2)
filling_color = "#000000"
filling_color = COLOR_BLACK
tastes = list("hot peppers" = 1, "cobwebs" = 1)
foodtype = MEAT
@@ -320,7 +320,7 @@
icon_state = "pigblanket"
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#800000"
filling_color = COLOR_RED
tastes = list("meat" = 1, "butter" = 1)
/obj/item/reagent_containers/food/snacks/kebab/rat
@@ -176,7 +176,7 @@
bitesize = 1
trash = /obj/item/trash/plate
list_reagents = list(/datum/reagent/toxin/minttoxin = 2)
filling_color = "#800000"
filling_color = COLOR_RED
foodtype = TOXIC | SUGAR
/obj/item/reagent_containers/food/snacks/eggwrap
@@ -204,7 +204,7 @@
desc = "A cluster of juicy spider eggs. A great side dish for when you care not for your health."
icon_state = "spidereggs"
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin = 2)
filling_color = "#008000"
filling_color = COLOR_DARK_GREEN
tastes = list("cobwebs" = 1)
foodtype = MEAT | TOXIC
@@ -232,7 +232,7 @@
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "sushie_egg"
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#FF3333" // R225 G051 B051
filling_color = COLOR_RED_LIGHT // R225 G051 B051
tastes = list("seaweed" = 1, "cobwebs" = 1, "salty" = 2)
foodtype = MEAT | VEGETABLES
@@ -580,7 +580,7 @@
desc = "The food of choice for the seasoned botanist."
icon_state = "dankpocket"
list_reagents = list(/datum/reagent/toxin/lipolicide = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4)
filling_color = "#00FF00"
filling_color = COLOR_GREEN
tastes = list("meat" = 2, "dough" = 2)
foodtype = GRAIN | VEGETABLES
@@ -71,7 +71,7 @@
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "sushie_egg"
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#FF3333" // R225 G051 B051
filling_color = COLOR_RED_LIGHT // R225 G051 B051
tastes = list("seaweed" = 1, "salty" = 2)
foodtype = MEAT | VEGETABLES
@@ -358,7 +358,7 @@ datum/crafting_recipe/food/donut/meat
desc = "The food of choice for the seasoned botanist."
icon_state = "dankpocket"
list_reagents = list(/datum/reagent/toxin/lipolicide = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4)
filling_color = "#00FF00"
filling_color = COLOR_GREEN
tastes = list("meat" = 2, "dough" = 2)
foodtype = GRAIN | VEGETABLES
+12 -11
View File
@@ -48,17 +48,18 @@
var/active = TRUE //Turn this to false to keep normal mob behavour
var/cached_z
var/static/blacklisted_items = typecacheof(list(
/obj/singularity,
/obj/structure/destructible/clockwork/massive/ratvar,
/obj/item/projectile,
/obj/item/gun,
/obj/item/antag_spawner,
/obj/effect,
/obj/belly,
/obj/decal,
/obj/docking_port,
/obj/shapeshift_holder,
/obj/screen))
/obj/singularity,
/obj/structure/destructible/clockwork/massive/ratvar,
/obj/item/projectile,
/obj/item/gun,
/obj/item/antag_spawner,
/obj/effect,
/obj/belly,
/obj/decal,
/obj/docking_port,
/obj/shapeshift_holder,
/obj/screen,
))
/mob/living/simple_animal/jacq/Initialize()
..()
+1 -1
View File
@@ -5,7 +5,7 @@
desc = "This is a plant."
icon_state = "ambrosiavulgaris"
slot_flags = ITEM_SLOT_HEAD
filling_color = "#008000"
filling_color = COLOR_DARK_GREEN
bitesize_mod = 2
foodtype = VEGETABLES
tastes = list("ambrosia" = 1)
+2 -2
View File
@@ -21,7 +21,7 @@
icon_state = "banana"
item_state = "banana"
trash = /obj/item/grown/bananapeel
filling_color = "#FFFF00"
filling_color = COLOR_YELLOW
bitesize = 5
foodtype = FRUIT
juice_results = list(/datum/reagent/consumable/banana = 0)
@@ -115,7 +115,7 @@
icon_state = "banana_blue"
item_state = "bluespace_peel"
trash = /obj/item/grown/bananapeel/bluespace
filling_color = "#0000FF"
filling_color = COLOR_BLUE
tastes = list("banana" = 1)
wine_power = 60
wine_flavor = "slippery hypercubes"
+3 -3
View File
@@ -23,7 +23,7 @@
desc = "Nutritious!"
icon_state = "berrypile"
gender = PLURAL
filling_color = "#FF00FF"
filling_color = COLOR_MAGENTA
bitesize_mod = 2
foodtype = FRUIT
juice_results = list(/datum/reagent/consumable/berryjuice = 0)
@@ -132,7 +132,7 @@
desc = "Great for toppings!"
icon_state = "cherry"
gender = PLURAL
filling_color = "#FF0000"
filling_color = COLOR_RED
bitesize_mod = 2
foodtype = FRUIT
grind_results = list(/datum/reagent/consumable/cherryjelly = 0)
@@ -181,7 +181,7 @@
name = "cherry bulbs"
desc = "They're like little Space Christmas lights!"
icon_state = "cherry_bulb"
filling_color = "#FF0000"
filling_color = COLOR_RED
bitesize_mod = 2
foodtype = FRUIT
grind_results = list(/datum/reagent/consumable/cherryjelly = 0)
+1 -1
View File
@@ -86,7 +86,7 @@
name = "cannabis leaf"
desc = "Recently legalized in most galaxies."
icon_state = "cannabis"
filling_color = "#00FF00"
filling_color = COLOR_GREEN
bitesize_mod = 2
foodtype = VEGETABLES //i dont really know what else weed could be to be honest
tastes = list("cannabis" = 1)
+1 -1
View File
@@ -23,7 +23,7 @@
name = "chili"
desc = "It's spicy! Wait... IT'S BURNING ME!!"
icon_state = "chilipepper"
filling_color = "#FF0000"
filling_color = COLOR_RED
bitesize_mod = 2
foodtype = FRUIT
wine_power = 20
+1 -1
View File
@@ -31,7 +31,7 @@
desc = "It's so sour, your face will twist."
foodtype = FRUIT | ANTITOXIC
icon_state = "lime"
filling_color = "#00FF00"
filling_color = COLOR_GREEN
juice_results = list(/datum/reagent/consumable/limejuice = 0)
// Orange
+1 -1
View File
@@ -21,7 +21,7 @@
desc = "Needs some butter!"
icon_state = "corn"
cooked_type = /obj/item/reagent_containers/food/snacks/popcorn
filling_color = "#FFFF00"
filling_color = COLOR_YELLOW
trash = /obj/item/grown/corncob
bitesize_mod = 2
foodtype = VEGETABLES
+1 -1
View File
@@ -20,7 +20,7 @@
name = "eggplant"
desc = "Maybe there's a chicken inside?"
icon_state = "eggplant"
filling_color = "#800080"
filling_color = COLOR_PURPLE
bitesize_mod = 2
foodtype = FRUIT
wine_power = 20
@@ -23,7 +23,7 @@
name = "grass"
desc = "Green and lush."
icon_state = "grassclump"
filling_color = "#32CD32"
filling_color = COLOR_LIME
bitesize_mod = 2
var/stacktype = /obj/item/stack/tile/grass
var/tile_coefficient = 0.02 // 1/50
+1 -1
View File
@@ -30,7 +30,7 @@
slices_num = 5
dried_type = null
w_class = WEIGHT_CLASS_NORMAL
filling_color = "#008000"
filling_color = COLOR_DARK_GREEN
bitesize_mod = 3
foodtype = FRUIT
juice_results = list(/datum/reagent/consumable/watermelonjuice = 0)
+1 -2
View File
@@ -380,8 +380,7 @@
icon_state = "coconut_grenade_active"
desc = "RUN!"
if(!seed.get_gene(/datum/plant_gene/trait/glow))
light_color = "#FFCC66" //for the fuse
set_light(3, 0.8)
set_light(3, 0.8, COLOR_CREAMY_ORANGE)
return
//ADDING A FUSE, NADE LOGIC
+1 -1
View File
@@ -86,7 +86,7 @@
name = "fly amanita"
desc = "<I>Amanita Muscaria</I>: Learn poisonous mushrooms by heart. Only pick mushrooms you know."
icon_state = "amanita"
filling_color = "#FF0000"
filling_color = COLOR_RED
// Destroying Angel
/obj/item/seeds/angel
+1 -1
View File
@@ -21,7 +21,7 @@
name = "Tea Aspera tips"
desc = "These aromatic tips of the tea plant can be dried to make tea."
icon_state = "tea_aspera_leaves"
filling_color = "#008000"
filling_color = COLOR_DARK_GREEN
grind_results = list(/datum/reagent/toxin/teapowder = 0)
dry_grind = TRUE
can_distill = FALSE
+1 -1
View File
@@ -20,7 +20,7 @@
name = "tobacco leaves"
desc = "Dry them out to make some smokes."
icon_state = "tobacco_leaves"
filling_color = "#008000"
filling_color = COLOR_DARK_GREEN
distill_reagent = /datum/reagent/consumable/ethanol/creme_de_menthe //Menthol, I guess.
// Space Tobacco
+3 -3
View File
@@ -45,7 +45,7 @@
desc = "So bloody...so...very...bloody....AHHHH!!!!"
icon_state = "bloodtomato"
splat_type = /obj/effect/gibspawner/generic
filling_color = "#FF0000"
filling_color = COLOR_RED
foodtype = FRUIT | GROSS
grind_results = list(/datum/reagent/consumable/ketchup = 0, /datum/reagent/blood/tomato = 0)
distill_reagent = /datum/reagent/consumable/ethanol/bloody_mary
@@ -71,7 +71,7 @@
desc = "I say blue-mah-to, you say blue-mae-to."
icon_state = "bluetomato"
splat_type = /obj/effect/decal/cleanable/oil
filling_color = "#0000FF"
filling_color = COLOR_BLUE
distill_reagent = /datum/reagent/consumable/laughter
// Bluespace Tomato
@@ -119,7 +119,7 @@
desc = "I say to-mah-to, you say tom-mae-to... OH GOD IT'S EATING MY LEGS!!"
icon_state = "killertomato"
var/awakening = 0
filling_color = "#FF0000"
filling_color = COLOR_RED
distill_reagent = /datum/reagent/consumable/ethanol/demonsblood
/obj/item/reagent_containers/food/snacks/grown/tomato/killer/attack(mob/M, mob/user, def_zone)
+1 -1
View File
@@ -329,7 +329,7 @@ datum/plant_gene/trait/glow/white
/datum/plant_gene/trait/glow/red
name = "Red Bioluminescence"
glow_color = "#FF3333"
glow_color = COLOR_RED_LIGHT
/datum/plant_gene/trait/glow/yellow
//not the disgusting glowshroom yellow hopefully
@@ -298,11 +298,11 @@
outputs = list()
activators = list()
inputs_default = list(
"2" = "#FF0000"
"2" = COLOR_RED
)
power_draw_idle = 0 // Raises to 1 when lit.
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
var/led_color = "#FF0000"
var/led_color = COLOR_RED
/obj/item/integrated_circuit/output/led/on_data_written()
power_draw_idle = get_pin_data(IC_INPUT, 1) ? 1 : 0
+1 -3
View File
@@ -152,9 +152,7 @@
var/hash = md5(hidden_message)
var/newcolor = copytext_char(hash, 1, 7)
add_atom_colour("#[newcolor]", FIXED_COLOUR_PRIORITY)
light_color = "#[newcolor]"
light_power = 0.3
set_light(1)
set_light(1, 0.3, "#[newcolor]")
/obj/structure/chisel_message/proc/pack()
var/list/data = list()
+37 -18
View File
@@ -1,26 +1,16 @@
/atom
var/light_power = 1 // Intensity of the light.
var/light_range = 0 // Range in tiles of the light.
var/light_color // Hexadecimal RGB string representing the colour of the light.
var/tmp/datum/light_source/light // Our light source. Don't fuck with this directly unless you have a good reason!
var/tmp/list/light_sources // Any light sources that are "inside" of us, for example, if src here was a mob that's carrying a flashlight, that flashlight's light source would be part of this list.
// The proc you should always use to set the light of this atom.
// Nonesensical value for l_color default, so we can detect if it gets set to null.
#define NONSENSICAL_VALUE -99999
/atom/proc/set_light(var/l_range, var/l_power, var/l_color = NONSENSICAL_VALUE)
if(l_range > 0 && l_range < MINIMUM_USEFUL_LIGHT_RANGE)
l_range = MINIMUM_USEFUL_LIGHT_RANGE //Brings the range up to 1.4, which is just barely brighter than the soft lighting that surrounds players.
l_range = max(l_range, MINIMUM_USEFUL_LIGHT_RANGE) //Brings the range up to 1.4, which is just barely brighter than the soft lighting that surrounds players.
if (l_power != null)
light_power = l_power
set_light_power(l_power)
if (l_range != null)
light_range = l_range
set_light_range(l_range)
if (l_color != NONSENSICAL_VALUE)
light_color = l_color
set_light_color(l_color)
SEND_SIGNAL(src, COMSIG_ATOM_SET_LIGHT, l_range, l_power, l_color)
@@ -107,15 +97,15 @@
return ..()
/atom/proc/flash_lighting_fx(_range = FLASH_LIGHT_RANGE, _power = FLASH_LIGHT_POWER, _color = LIGHT_COLOR_WHITE, _duration = FLASH_LIGHT_DURATION, _reset_lighting = TRUE)
/atom/proc/flash_lighting_fx(_range = FLASH_LIGHT_RANGE, _power = FLASH_LIGHT_POWER, _color = COLOR_WHITE, _duration = FLASH_LIGHT_DURATION, _reset_lighting = TRUE)
return
/turf/flash_lighting_fx(_range = FLASH_LIGHT_RANGE, _power = FLASH_LIGHT_POWER, _color = LIGHT_COLOR_WHITE, _duration = FLASH_LIGHT_DURATION, _reset_lighting = TRUE)
/turf/flash_lighting_fx(_range = FLASH_LIGHT_RANGE, _power = FLASH_LIGHT_POWER, _color = COLOR_WHITE, _duration = FLASH_LIGHT_DURATION, _reset_lighting = TRUE)
if(!_duration)
stack_trace("Lighting FX obj created on a turf without a duration")
new /obj/effect/dummy/lighting_obj (src, _color, _range, _power, _duration)
/obj/flash_lighting_fx(_range = FLASH_LIGHT_RANGE, _power = FLASH_LIGHT_POWER, _color = LIGHT_COLOR_WHITE, _duration = FLASH_LIGHT_DURATION, _reset_lighting = TRUE)
/obj/flash_lighting_fx(_range = FLASH_LIGHT_RANGE, _power = FLASH_LIGHT_POWER, _color = COLOR_WHITE, _duration = FLASH_LIGHT_DURATION, _reset_lighting = TRUE)
var/temp_color
var/temp_power
var/temp_range
@@ -126,9 +116,38 @@
set_light(_range, _power, _color)
addtimer(CALLBACK(src, /atom/proc/set_light, _reset_lighting ? initial(light_range) : temp_range, _reset_lighting ? initial(light_power) : temp_power, _reset_lighting ? initial(light_color) : temp_color), _duration, TIMER_OVERRIDE|TIMER_UNIQUE)
/mob/living/flash_lighting_fx(_range = FLASH_LIGHT_RANGE, _power = FLASH_LIGHT_POWER, _color = LIGHT_COLOR_WHITE, _duration = FLASH_LIGHT_DURATION, _reset_lighting = TRUE)
/mob/living/flash_lighting_fx(_range = FLASH_LIGHT_RANGE, _power = FLASH_LIGHT_POWER, _color = COLOR_WHITE, _duration = FLASH_LIGHT_DURATION, _reset_lighting = TRUE)
mob_light(_color, _range, _power, _duration)
/mob/living/proc/mob_light(_color, _range, _power, _duration)
var/obj/effect/dummy/lighting_obj/moblight/mob_light_obj = new (src, _color, _range, _power, _duration)
return mob_light_obj
/atom/proc/set_light_range(new_range)
if(new_range == light_range)
return
SEND_SIGNAL(src, COMSIG_ATOM_SET_LIGHT_RANGE, new_range)
. = light_range
light_range = new_range
/atom/proc/set_light_power(new_power)
if(new_power == light_power)
return
SEND_SIGNAL(src, COMSIG_ATOM_SET_LIGHT_POWER, new_power)
. = light_power
light_power = new_power
/atom/proc/set_light_color(new_color)
if(new_color == light_color)
return
SEND_SIGNAL(src, COMSIG_ATOM_SET_LIGHT_COLOR, new_color)
. = light_color
light_color = new_color
/atom/proc/set_light_on(new_value)
if(new_value == light_on)
return
SEND_SIGNAL(src, COMSIG_ATOM_SET_LIGHT_ON, new_value)
. = light_on
light_on = new_value
@@ -7,7 +7,7 @@
name = "power line autobuilder"
icon_state = "powerlinebuilder"
color = "#ff0000"
color = COLOR_RED
/// Whether or not we forcefully make a knot
var/knot = NO_KNOT
@@ -82,7 +82,7 @@
// Red
/obj/effect/mapping_helpers/network_builder/power_cable/red
color = "#ff0000"
color = COLOR_RED
cable_color = "red"
/obj/effect/mapping_helpers/network_builder/power_cable/red/knot
@@ -108,7 +108,7 @@
// Cyan
/obj/effect/mapping_helpers/network_builder/power_cable/cyan
color = "#00ffff"
color = COLOR_CYAN
cable_color = "cyan"
/obj/effect/mapping_helpers/network_builder/power_cable/cyan/knot
@@ -173,7 +173,7 @@
// Yellow
/obj/effect/mapping_helpers/network_builder/power_cable/yellow
color = "#ffff00"
color = COLOR_YELLOW
cable_color = "yellow"
/obj/effect/mapping_helpers/network_builder/power_cable/yellow/knot
+3 -3
View File
@@ -53,15 +53,15 @@
meta_icon.DrawBox(meta_color, img_x, img_y)
if(istype(T, /turf/closed/wall))
map_icon.DrawBox("#000000", img_x, img_y)
map_icon.DrawBox(COLOR_BLACK, img_x, img_y)
else if(!istype(A, /area/space))
var/color = A.minimap_color || "#FF00FF"
var/color = A.minimap_color || COLOR_MAGENTA
if(locate(/obj/machinery/power/solar) in T)
color = "#02026a"
if((locate(/obj/effect/spawner/structure/window) in T) || (locate(/obj/structure/grille) in T))
color = BlendRGB(color, "#000000", 0.5)
color = BlendRGB(color, COLOR_BLACK, 0.5)
map_icon.DrawBox(color, img_x, img_y)
map_icon.Crop(crop_x1, crop_y1, crop_x2, crop_y2)
+6 -8
View File
@@ -29,11 +29,14 @@
/obj/machinery/computer/camera_advanced/base_construction
name = "base construction console"
desc = "An industrial computer integrated with a camera-assisted rapid construction drone."
icon_screen = "mining"
icon_keyboard = "rd_key"
networks = list("ss13")
var/obj/item/construction/rcd/internal/RCD //Internal RCD. The computer passes user commands to this in order to avoid massive copypaste.
circuit = /obj/item/circuitboard/computer/base_construction
off_action = new/datum/action/innate/camera_off/base_construction
jump_action = null
off_action = new/datum/action/innate/camera_off/base_construction
circuit = /obj/item/circuitboard/computer/base_construction
light_color = LIGHT_COLOR_PINK
var/obj/item/construction/rcd/internal/RCD //Internal RCD. The computer passes user commands to this in order to avoid massive copypaste.
var/datum/action/innate/aux_base/switch_mode/switch_mode_action = new //Action for switching the RCD's build modes
var/datum/action/innate/aux_base/build/build_action = new //Action for using the RCD
var/datum/action/innate/aux_base/airlock_type/airlock_mode_action = new //Action for setting the airlock type
@@ -44,11 +47,6 @@
var/turret_stock = 0 //Turrets in stock
var/obj/machinery/computer/auxillary_base/found_aux_console //Tracker for the Aux base console, so the eye can always find it.
icon_screen = "mining"
icon_keyboard = "rd_key"
light_color = LIGHT_COLOR_PINK
/obj/machinery/computer/camera_advanced/base_construction/Initialize()
. = ..()
RCD = new(src)
@@ -23,12 +23,12 @@
attack_verb = list("smashed", "crushed", "cleaved", "chopped", "pulped")
sharpness = IS_SHARP
actions_types = list(/datum/action/item_action/toggle_light)
light_on = FALSE
var/list/trophies = list()
var/charged = TRUE
var/charge_time = 15
var/detonation_damage = 50
var/backstab_bonus = 30
var/light_on = FALSE
var/brightness_on = 5 //same light as a lit seclite on a PKA
/obj/item/twohanded/kinetic_crusher/Initialize()
@@ -185,12 +185,12 @@
desc = "A heated storage unit."
icon_state = "donkvendor"
icon = 'icons/obj/lavaland/donkvendor.dmi'
pixel_y = -4
max_n_of_items = 10
flags_1 = NODECONSTRUCT_1
light_range = 5
light_power = 1.2
light_color = "#DDFFD3"
max_n_of_items = 10
pixel_y = -4
flags_1 = NODECONSTRUCT_1
light_color = COLOR_VERY_PALE_LIME_GREEN
var/empty = FALSE
/obj/machinery/smartfridge/survival_pod/update_icon()
@@ -991,7 +991,7 @@
name = "blood contract"
icon = 'icons/obj/wizard.dmi'
icon_state = "scroll2"
color = "#FF0000"
color = COLOR_RED
desc = "Mark your target for death."
var/used = FALSE
@@ -1030,7 +1030,7 @@
L.mind.objectives += survive
log_combat(user, L, "took out a blood contract on", src)
to_chat(L, "<span class='userdanger'>You've been marked for death! Don't let the demons get you! KILL THEM ALL!</span>")
L.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY)
L.add_atom_colour(COLOR_RED, ADMIN_COLOUR_PRIORITY)
var/obj/effect/mine/pickup/bloodbath/B = new(L)
INVOKE_ASYNC(B, /obj/effect/mine/pickup/bloodbath/.proc/mineEffect, L)
+1 -1
View File
@@ -34,8 +34,8 @@
healable = 0
loot = list(/obj/effect/decal/cleanable/robot_debris)
del_on_death = TRUE
light_on = FALSE
var/mode = MINEDRONE_COLLECT
var/light_on = 0
var/obj/item/gun/energy/kinetic_accelerator/minebot/stored_gun
/mob/living/simple_animal/hostile/mining_drone/Initialize()
+9 -2
View File
@@ -43,7 +43,14 @@
S.cd = "/"
var/slot
S["default_slot"] >> slot
var/differing_version_notification = 0
if(slot)
S.cd = "/character[slot]"
if(S["version"] < SAVEFILE_VERSION_MAX)
to_chat(src, "<span class='redtext'>Your characters are outdated from recent updates. Please make sure if everything is within reasonable levels.</span>")
var/slot_version = 0
S["version"] >> slot_version
if(slot_version && slot_version < SAVEFILE_VERSION_MAX)
S.cd = "/"
S["new_differences_notification"] >> differing_version_notification
if(!differing_version_notification || differing_version_notification <= slot_version)
S["new_differences_notification"] << slot_version
to_chat(src, "<span class='danger'><B>There were recent changes with characters, and your savefiles are outdated. Your characters may not look the same depending on what changed.</B></span>")
@@ -708,7 +708,7 @@
/mob/living/carbon/human/proc/electrocution_animation(anim_duration)
//Handle mutant parts if possible
if(dna && dna.species)
add_atom_colour("#000000", TEMPORARY_COLOUR_PRIORITY)
add_atom_colour(COLOR_BLACK, TEMPORARY_COLOUR_PRIORITY)
var/static/mutable_appearance/electrocution_skeleton_anim
if(!electrocution_skeleton_anim)
electrocution_skeleton_anim = mutable_appearance(icon, "electrocuted_base")
@@ -720,7 +720,7 @@
flick_overlay_view(image(icon,src,"electrocuted_generic",ABOVE_MOB_LAYER), src, anim_duration)
/mob/living/carbon/human/proc/end_electrocution_animation(mutable_appearance/MA)
remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, "#000000")
remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, COLOR_BLACK)
cut_overlay(MA)
//medical scan animation
@@ -449,7 +449,7 @@
name = "luminescent glow"
desc = "Tell a coder if you're seeing this."
icon_state = "nothing"
light_color = "#FFFFFF"
light_color = COLOR_WHITE
light_range = LUMINESCENT_DEFAULT_GLOW
/obj/effect/dummy/luminescent_glow/Initialize()
@@ -71,7 +71,7 @@
var/lamp_max = 10 //Maximum brightness of a borg lamp. Set as a var for easy adjusting.
var/lamp_intensity = 0 //Luminosity of the headlamp. 0 is off. Higher settings than the minimum require power.
light_color = "#FFCC66"
light_color = COLOR_CREAMY_ORANGE
light_power = 0.8
var/lamp_cooldown = 0 //Flag for if the lamp is on cooldown after being forcibly disabled.
@@ -21,7 +21,7 @@
window_name = "Automatic Security Unit v2.6"
allow_pai = 0
data_hud_type = DATA_HUD_SECURITY_ADVANCED
path_image_color = "#FF0000"
path_image_color = COLOR_RED
var/lastfired = 0
var/shot_delay = 15
@@ -19,7 +19,7 @@
window_name = "Automatic Security Unit v1.6"
allow_pai = 0
data_hud_type = DATA_HUD_SECURITY_ADVANCED
path_image_color = "#FF0000"
path_image_color = COLOR_RED
var/baton_type = /obj/item/melee/baton
var/mob/living/carbon/target
@@ -55,7 +55,7 @@
/datum/guardianname/carp/aqua
suffixcolour = "Aqua"
colour = "#00FFFF"
colour = COLOR_CYAN
/datum/guardianname/carp/paleaqua
suffixcolour = "Pale Aqua"
@@ -29,7 +29,7 @@ Difficulty: Medium
icon_living = "miner"
icon = 'icons/mob/broadMobs.dmi'
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
light_color = "#E4C7C5"
light_color = COLOR_LIGHT_GRAYISH_RED
movement_type = GROUND
speak_emote = list("roars")
speed = 1
@@ -144,7 +144,7 @@ Difficulty: Hard
walk(src, 0)
setDir(get_dir(src, T))
var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(loc,src)
animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 5)
animate(D, alpha = 0, color = COLOR_RED, transform = matrix()*2, time = 5)
sleep(5)
throw_at(T, get_dist(src, T), 1, src, 0)
charging = 0
@@ -338,7 +338,7 @@ Difficulty: Medium
layer = BELOW_MOB_LAYER
pixel_x = -32
pixel_y = -32
color = "#FF0000"
color = COLOR_RED
duration = 5
/obj/effect/temp_visual/dragon_flight
@@ -11,7 +11,7 @@
/obj/effect/light_emitter/red_energy_sword //used so there's a combination of both their head light and light coming off the energy sword
set_luminosity = 2
set_cap = 2.5
light_color = LIGHT_COLOR_RED
light_color = COLOR_SOFT_RED
/mob/living/simple_animal/hostile/syndicate
@@ -115,7 +115,7 @@
attacktext = "slashes"
attack_sound = 'sound/weapons/blade1.ogg'
armour_penetration = 35
light_color = LIGHT_COLOR_RED
light_color = COLOR_SOFT_RED
status_flags = 0
var/obj/effect/light_emitter/red_energy_sword/sord
@@ -4,6 +4,12 @@
/obj/item/modular_computer
name = "modular microcomputer"
desc = "A small portable microcomputer."
icon = 'icons/obj/computer.dmi'
icon_state = "laptop-open"
light_on = FALSE
integrity_failure = 50
max_integrity = 100
armor = list("melee" = 0, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0)
var/enabled = 0 // Whether the computer is turned on.
var/screen_on = 1 // Whether the computer is active/opened/it's screen is on.
@@ -21,18 +27,12 @@
// must have it's own DMI file. Icon states must be called exactly the same in all files, but may look differently
// If you create a program which is limited to Laptops and Consoles you don't have to add it's icon_state overlay for Tablets too, for example.
icon = 'icons/obj/computer.dmi'
icon_state = "laptop-open"
var/icon_state_unpowered = null // Icon state when the computer is turned off.
var/icon_state_powered = null // Icon state when the computer is turned on.
var/icon_state_menu = "menu" // Icon state overlay when the computer is turned on, but no program is loaded that would override the screen.
var/max_hardware_size = 0 // Maximal hardware w_class. Tablets/PDAs have 1, laptops 2, consoles 4.
var/steel_sheet_cost = 5 // Amount of steel sheets refunded when disassembling an empty frame of this computer.
integrity_failure = 50
max_integrity = 100
armor = list("melee" = 0, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0)
// Important hardware (must be installed for computer to work)
// Optional hardware (improves functionality, but is not critical for computer to work)
@@ -42,7 +42,6 @@
var/list/idle_threads // Idle programs on background. They still receive process calls but can't be interacted with.
var/obj/physical = null // Object that represents our computer. It's used for Adjacent() and UI visibility checks.
var/has_light = FALSE //If the computer has a flashlight/LED light/what-have-you installed
var/light_on = FALSE //If that light is enabled
var/comp_light_luminosity = 3 //The brightness of that light
var/comp_light_color //The color of that light
@@ -155,7 +155,7 @@
to_chat(user, "<span class='warning'>That color is too dark! Choose a lighter one.</span>")
new_color = null
comp_light_color = new_color
light_color = new_color
set_light_color(new_color)
update_light()
return TRUE
else
+1 -1
View File
@@ -9,7 +9,7 @@
item_state = "camera"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
light_color = LIGHT_COLOR_WHITE
light_color = COLOR_WHITE
light_power = FLASH_LIGHT_POWER
w_class = WEIGHT_CLASS_SMALL
flags_1 = CONDUCT_1
+1 -1
View File
@@ -6,7 +6,7 @@
name = "pool noodle"
desc = "A strange, bulky, bendable toy that can annoy people."
force = 0
color = "#000000"
color = COLOR_BLACK
w_class = WEIGHT_CLASS_SMALL
throwforce = 1
throw_speed = 10 //weeee
+5 -6
View File
@@ -333,16 +333,15 @@
switch(charging)
if(APC_NOT_CHARGING)
light_color = LIGHT_COLOR_RED
set_light_color(COLOR_SOFT_RED)
if(APC_CHARGING)
light_color = LIGHT_COLOR_BLUE
set_light_color(LIGHT_COLOR_BLUE)
if(APC_FULLY_CHARGED)
light_color = LIGHT_COLOR_GREEN
set_light(lon_range)
set_light_color(LIGHT_COLOR_GREEN)
set_light(l_range=lon_range)
lighteffect.color = light_color
else if(update_state & UPSTATE_BLUESCREEN)
light_color = LIGHT_COLOR_BLUE
set_light(lon_range)
set_light(l_range=lon_range, l_color=LIGHT_COLOR_BLUE)
else
set_light(0)
+12 -12
View File
@@ -1,12 +1,12 @@
GLOBAL_LIST_INIT(cable_colors, list(
"yellow" = "#ffff00",
"yellow" = COLOR_YELLOW,
"green" = "#00aa00",
"blue" = "#1919c8",
"pink" = "#ff3cc8",
"orange" = "#ff8000",
"cyan" = "#00ffff",
"cyan" = COLOR_CYAN,
"white" = "#ffffff",
"red" = "#ff0000"
"red" = COLOR_RED
))
///////////////////////////////
@@ -48,11 +48,11 @@ By design, d1 is the smallest direction and d2 is the highest
var/obj/item/stack/cable_coil/stored
var/cable_color = "red"
color = "#ff0000"
color = COLOR_RED
/obj/structure/cable/yellow
cable_color = "yellow"
color = "#ffff00"
color = COLOR_YELLOW
/obj/structure/cable/green
cable_color = "green"
@@ -72,7 +72,7 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/structure/cable/cyan
cable_color = "cyan"
color = "#00ffff"
color = COLOR_CYAN
/obj/structure/cable/white
cable_color = "white"
@@ -770,11 +770,11 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/red
item_color = "red"
color = "#ff0000"
color = COLOR_RED
/obj/item/stack/cable_coil/yellow
item_color = "yellow"
color = "#ffff00"
color = COLOR_YELLOW
/obj/item/stack/cable_coil/blue
item_color = "blue"
@@ -794,7 +794,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/cyan
item_color = "cyan"
color = "#00ffff"
color = COLOR_CYAN
/obj/item/stack/cable_coil/white
item_color = "white"
@@ -821,11 +821,11 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/cut/red
item_color = "red"
color = "#ff0000"
color = COLOR_RED
/obj/item/stack/cable_coil/cut/yellow
item_color = "yellow"
color = "#ffff00"
color = COLOR_YELLOW
/obj/item/stack/cable_coil/cut/blue
item_color = "blue"
@@ -845,7 +845,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/cut/cyan
item_color = "cyan"
color = "#00ffff"
color = COLOR_CYAN
/obj/item/stack/cable_coil/cut/white
item_color = "white"
+1 -1
View File
@@ -219,7 +219,7 @@
var/emergency_mode = FALSE // if true, the light is in emergency mode
var/no_emergency = FALSE // if true, this light cannot ever have an emergency mode
var/bulb_emergency_brightness_mul = 0.6 // multiplier for this light's base brightness in emergency power mode
var/bulb_emergency_colour = "#FF3232" // determines the colour of the light while it's in emergency mode
var/bulb_emergency_colour = COLOR_VIVID_RED // determines the colour of the light while it's in emergency mode
var/bulb_emergency_pow_mul = 0.75 // the multiplier for determining the light's power in emergency mode
var/bulb_emergency_pow_min = 0.5 // the minimum value for the light's power in emergency mode
+1 -1
View File
@@ -121,7 +121,7 @@
/obj/item/firing_pin/clown
name = "hilarious firing pin"
desc = "Advanced clowntech that can convert any firearm into a far more useful object."
color = "#FFFF00"
color = COLOR_YELLOW
fail_message = "<span class='warning'>HONK!</span>"
force_replace = TRUE
+3 -3
View File
@@ -10,7 +10,7 @@
flag = "laser"
eyeblur = 2
impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
light_color = LIGHT_COLOR_RED
light_color = COLOR_SOFT_RED
ricochets_max = 50 //Honk!
ricochet_chance = 80
is_reflectable = TRUE
@@ -143,7 +143,7 @@
icon_state = "laser"
suit_types = list(/obj/item/clothing/suit/bluetag)
impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
light_color = LIGHT_COLOR_RED
light_color = COLOR_SOFT_RED
tracer_type = /obj/effect/projectile/tracer/laser
muzzle_type = /obj/effect/projectile/muzzle/laser
impact_type = /obj/effect/projectile/impact/laser
@@ -182,7 +182,7 @@
/obj/item/projectile/beam/instakill/red
icon_state = "red_laser"
impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
light_color = LIGHT_COLOR_RED
light_color = COLOR_SOFT_RED
/obj/item/projectile/beam/instakill/on_hit(atom/target)
. = ..()
@@ -24,7 +24,7 @@
jitter = 20
range = 7
icon_state = "spark"
color = "#FFFF00"
color = COLOR_YELLOW
/obj/item/projectile/bullet/shotgun_meteorslug
name = "meteorslug"
@@ -12,7 +12,7 @@
/obj/item/projectile/energy/electrode
name = "electrode"
icon_state = "spark"
color = "#FFFF00"
color = COLOR_YELLOW
nodamage = 1
knockdown = 100
stutter = 5
@@ -9,12 +9,12 @@
hitsound = 'sound/weapons/emitter2.ogg'
impact_type = /obj/effect/projectile/impact/xray
var/static/list/particle_colors = list(
"red" = "#FF0000",
"blue" = "#00FF00",
"green" = "#0000FF",
"yellow" = "#FFFF00",
"cyan" = "#00FFFF",
"purple" = "#FF00FF"
"red" = COLOR_RED,
"blue" = COLOR_GREEN,
"green" = COLOR_BLUE,
"yellow" = COLOR_YELLOW,
"cyan" = COLOR_CYAN,
"purple" = COLOR_MAGENTA
)
/obj/item/projectile/energy/nuclear_particle/Initialize()
@@ -1,7 +1,7 @@
/obj/item/projectile/energy/electrode
name = "electrode"
icon_state = "spark"
color = "#FFFF00"
color = COLOR_YELLOW
nodamage = 1
knockdown = 60
knockdown_stamoverride = 36
@@ -6,7 +6,7 @@
damage = 0
damage_type = BRUTE
nodamage = 1
color = "#33CCFF"
color = COLOR_BLUE_LIGHT
var/turf/T
var/power = 4
var/list/thrown_items = list()
@@ -158,7 +158,7 @@
name = "electrode"
damage_type = BURN
hal_icon_state = "spark"
color = "#FFFF00"
color = COLOR_YELLOW
hal_fire_sound = 'sound/weapons/taser.ogg'
hal_hitsound = 'sound/weapons/taserhit.ogg'
hal_hitsound_wall = null
@@ -6,7 +6,7 @@
nodamage = TRUE
pass_flags = PASSGLASS | PASSTABLE | PASSGRILLE | PASSMOB
var/obj/item/gun/energy/wormhole_projector/gun
color = "#33CCFF"
color = COLOR_BLUE_LIGHT
tracer_type = /obj/effect/projectile/tracer/wormhole
impact_type = /obj/effect/projectile/impact/wormhole
muzzle_type = /obj/effect/projectile/muzzle/wormhole
+1 -1
View File
@@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
var/list/data
var/current_cycle = 0
var/volume = 0 //pretend this is moles
var/color = "#000000" // rgb: 0, 0, 0
var/color = COLOR_BLACK
var/can_synth = TRUE // can this reagent be synthesized? (for example: odysseus syringe gun)
var/metabolization_rate = REAGENTS_METABOLISM //how fast the reagent is metabolized by the mob
var/overrides_metab = 0
@@ -1514,7 +1514,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
/datum/reagent/consumable/ethanol/triple_sec
name = "Triple Sec"
description = "A sweet and vibrant orange liqueur."
color = "#ffcc66"
color = COLOR_CREAMY_ORANGE
boozepwr = 30
taste_description = "a warm flowery orange taste which recalls the ocean air and summer wind of the caribbean"
glass_icon_state = "glass_orange"
@@ -1576,7 +1576,7 @@ datum/reagent/consumable/ethanol/creme_de_coconut
/datum/reagent/consumable/ethanol/quintuple_sec
name = "Quintuple Sec"
description = "Law, Order, Alcohol, and Police Brutality distilled into one single elixir of JUSTICE."
color = "#ff3300"
color = COLOR_MOSTLY_PURE_RED
boozepwr = 80
quality = DRINK_FANTASTIC
taste_description = "THE LAW"
@@ -1622,7 +1622,7 @@ datum/reagent/consumable/ethanol/creme_de_coconut
/datum/reagent/consumable/ethanol/bastion_bourbon
name = "Bastion Bourbon"
description = "Soothing hot herbal brew with restorative properties. Hints of citrus and berry flavors."
color = "#00FFFF"
color = COLOR_CYAN
boozepwr = 30
quality = DRINK_FANTASTIC
taste_description = "hot herbal brew with a hint of fruit"
@@ -1661,7 +1661,7 @@ datum/reagent/consumable/ethanol/creme_de_coconut
/datum/reagent/consumable/ethanol/squirt_cider
name = "Squirt Cider"
description = "Fermented squirt extract with a nose of stale bread and ocean water. Whatever a squirt is."
color = "#FF0000"
color = COLOR_RED
boozepwr = 40
taste_description = "stale bread with a staler aftertaste"
nutriment_factor = 2 * REAGENTS_METABOLISM
@@ -4,7 +4,7 @@
description = "shouldn't exist and you should adminhelp immediately."
color = "#FFFFFF"
taste_description = "bad code and slime"
var/complementary_color = "#000000" //a color that's complementary to the normal blob color
var/complementary_color = COLOR_BLACK //a color that's complementary to the normal blob color
var/shortdesc = null //just damage and on_mob effects, doesn't include special, blob-tile only effects
var/effectdesc = null //any long, blob-tile specific effects
var/analyzerdescdamage = "Unknown. Report this bug to a coder, or just adminhelp."
@@ -481,7 +481,7 @@
/datum/reagent/consumable/space_up
name = "Space-Up"
description = "Tastes like a hull breach in your mouth."
color = "#00FF00" // rgb: 0, 255, 0
color = COLOR_GREEN // rgb: 0, 255, 0
taste_description = "cherry soda"
glass_icon_state = "space-up_glass"
glass_name = "glass of Space-Up"
@@ -679,7 +679,7 @@
/datum/reagent/consumable/chocolatepudding
name = "Chocolate Pudding"
description = "A great dessert for chocolate lovers."
color = "#800000"
color = COLOR_RED
quality = DRINK_VERYGOOD
nutriment_factor = 4 * REAGENTS_METABOLISM
taste_description = "sweet chocolate"
@@ -428,7 +428,7 @@
name = "Sprinkles"
value = 3
description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops."
color = "#FF00FF" // rgb: 255, 0, 255
color = COLOR_MAGENTA // rgb: 255, 0, 255
taste_description = "childhood whimsy"
/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/carbon/M)
@@ -82,7 +82,7 @@
/datum/reagent/medicine/synaptizine
name = "Synaptizine"
description = "Increases resistance to stuns as well as reducing drowsiness and hallucinations."
color = "#FF00FF"
color = COLOR_MAGENTA
pH = 4
/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/carbon/M)
@@ -458,7 +458,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
name = "Charcoal"
description = "Heals toxin damage as well as slowly removing any other chemicals the patient has in their bloodstream."
reagent_state = LIQUID
color = "#000000"
color = COLOR_BLACK
metabolization_rate = 0.5 * REAGENTS_METABOLISM
taste_description = "ash"
pH = 5
@@ -598,7 +598,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
name = "Salbutamol"
description = "Rapidly restores oxygen deprivation as well as preventing more of it to an extent."
reagent_state = LIQUID
color = "#00FFFF"
color = COLOR_CYAN
metabolization_rate = 0.25 * REAGENTS_METABOLISM
pH = 2
@@ -786,7 +786,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
name = "Atropine"
description = "If a patient is in critical condition, rapidly heals all damage types as well as regulating oxygen in the body. Excellent for stabilizing wounded patients."
reagent_state = LIQUID
color = "#000000"
color = COLOR_BLACK
metabolization_rate = 0.25 * REAGENTS_METABOLISM
overdose_threshold = 35
pH = 12
@@ -1584,7 +1584,7 @@
/datum/reagent/plantnutriment
name = "Generic nutriment"
description = "Some kind of nutriment. You can't really tell what it is. You should probably report it, along with how you obtained it."
color = "#000000" // RBG: 0, 0, 0
color = COLOR_BLACK
var/tox_prob = 0
taste_description = "plant food"
pH = 3
@@ -1694,7 +1694,7 @@
name = "Colorful Reagent"
description = "Thoroughly sample the rainbow."
reagent_state = LIQUID
color = "#FFFF00"
color = COLOR_YELLOW
var/list/random_color_list = list("#00aedb","#a200ff","#f47835","#d41243","#d11141","#00b159","#00aedb","#f37735","#ffc425","#008744","#0057e7","#d62d20","#ffa700")
taste_description = "rainbows"
var/no_mob_color = FALSE
@@ -2020,7 +2020,7 @@
/datum/reagent/growthserum //neutered to use as a chemical base for sizecode shit
name = "Growth Serum"
description = "A commercial chemical designed to help older men in the bedroom."//not really it just makes you a giant
color = "#ff0000"//strong red. rgb 255, 0, 0
color = COLOR_RED//strong red. rgb 255, 0, 0
taste_description = "bitterness" // apparently what viagra tastes like
/datum/reagent/plastic_polymers
@@ -2176,7 +2176,7 @@
name = "UNKNOWN"
description = "404: Chemical not found."
metabolization_rate = REAGENTS_METABOLISM
color = "#0000FF"
color = COLOR_BLUE
can_synth = FALSE
var/datum/dna/original_dna
var/reagent_ticks = 0
@@ -26,7 +26,7 @@
name = "Stabilizing Agent"
description = "Keeps unstable chemicals stable. This does not work on everything."
reagent_state = LIQUID
color = "#FFFF00"
color = COLOR_YELLOW
value = 3
taste_description = "metal"
@@ -92,7 +92,7 @@
name = "Black Powder"
description = "Explodes. Violently."
reagent_state = LIQUID
color = "#000000"
color = COLOR_BLACK
value = 5
metabolization_rate = 0.05
taste_description = "salt"

Some files were not shown because too many files have changed in this diff Show More