diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index e28708a81e6..13f7777d386 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -1,40 +1,87 @@ #define COLOR_INPUT_DISABLED "#F0F0F0" #define COLOR_INPUT_ENABLED "#D3B5B5" -#define COLOR_WHITE "#EEEEEE" -#define COLOR_SILVER "#C0C0C0" -#define COLOR_GRAY "#808080" -#define COLOR_FLOORTILE_GRAY "#8D8B8B" -#define COLOR_ALMOST_BLACK "#333333" +#define COLOR_RED "#FF0000" +#define COLOR_GREEN "#00FF00" +#define COLOR_BLUE "#0000FF" +#define COLOR_CYAN "#00FFFF" +#define COLOR_PINK "#FF00FF" +#define COLOR_YELLOW "#FFFF00" +#define COLOR_ORANGE "#FF9900" +#define COLOR_WHITE "#FFFFFF" +#define COLOR_GRAY "#808080" #define COLOR_BLACK "#000000" -#define COLOR_RED "#FF0000" -#define COLOR_RED_LIGHT "#FF3333" +#define COLOR_NAVY_BLUE "#000080" +#define COLOR_LIGHT_GREEN "#008000" +#define COLOR_DARK_GRAY "#404040" #define COLOR_MAROON "#800000" -#define COLOR_YELLOW "#FFFF00" -#define COLOR_OLIVE "#808000" -#define COLOR_LIME "#32CD32" -#define COLOR_GREEN "#008000" -#define COLOR_CYAN "#00FFFF" -#define COLOR_TEAL "#008080" -#define COLOR_BLUE "#0000FF" -#define COLOR_BLUE_LIGHT "#33CCFF" -#define COLOR_NAVY "#000080" -#define COLOR_PINK "#FFC0CB" -#define COLOR_MAGENTA "#FF00FF" #define COLOR_PURPLE "#800080" -#define COLOR_ORANGE "#FF9900" -#define COLOR_BEIGE "#CEB689" -#define COLOR_BLUE_GRAY "#75A2BB" -#define COLOR_BROWN "#BA9F6D" -#define COLOR_DARK_BROWN "#997C4F" -#define COLOR_DARK_ORANGE "#C3630C" -#define COLOR_GREEN_GRAY "#99BB76" -#define COLOR_RED_GRAY "#B4696A" -#define COLOR_PALE_BLUE_GRAY "#98C5DF" -#define COLOR_PALE_GREEN_GRAY "#B7D993" -#define COLOR_PALE_RED_GRAY "#D59998" -#define COLOR_PALE_PURPLE_GRAY "#CBB1CA" -#define COLOR_PURPLE_GRAY "#AE8CA8" +#define COLOR_VIOLET "#9933ff" +#define COLOR_OLIVE "#808000" +#define COLOR_BROWN_ORANGE "#824b28" +#define COLOR_DARK_ORANGE "#b95a00" +#define COLOR_GRAY40 "#666666" +#define COLOR_GRAY20 "#333333" +#define COLOR_GRAY15 "#151515" +#define COLOR_SEDONA "#cc6600" +#define COLOR_DARK_BROWN "#917448" +#define COLOR_DEEP_SKY_BLUE "#00e1ff" +#define COLOR_LIME "#00ff00" +#define COLOR_TEAL "#33cccc" +#define COLOR_PALE_PINK "#bf89ba" +#define COLOR_YELLOW_GRAY "#c9a344" +#define COLOR_PALE_YELLOW "#c1bb7a" +#define COLOR_WARM_YELLOW "#b3863c" +#define COLOR_RED_GRAY "#aa5f61" +#define COLOR_BROWN "#b19664" +#define COLOR_GREEN_GRAY "#8daf6a" +#define COLOR_DARK_GREEN_GRAY "#54654c" +#define COLOR_BLUE_GRAY "#6a97b0" +#define COLOR_DARK_BLUE_GRAY "#3e4855" +#define COLOR_SUN "#ec8b2f" +#define COLOR_PURPLE_GRAY "#a2819e" +#define COLOR_BLUE_LIGHT "#33ccff" +#define COLOR_RED_LIGHT "#ff3333" +#define COLOR_BEIGE "#ceb689" +#define COLOR_BABY_BLUE "#89cff0" +#define COLOR_PALE_GREEN_GRAY "#aed18b" +#define COLOR_PALE_RED_GRAY "#cc9090" +#define COLOR_PALE_PURPLE_GRAY "#bda2ba" +#define COLOR_PALE_BLUE_GRAY "#8bbbd5" +#define COLOR_LUMINOL "#66ffff" +#define COLOR_SILVER "#c0c0c0" +#define COLOR_GRAY80 "#cccccc" +#define COLOR_OFF_WHITE "#eeeeee" +#define COLOR_GOLD "#6d6133" +#define COLOR_NT_RED "#9d2300" +#define COLOR_BOTTLE_GREEN "#1f6b4f" +#define COLOR_PALE_BTL_GREEN "#57967f" +#define COLOR_GUNMETAL "#545c68" +#define COLOR_WALL_GUNMETAL "#353a42" +#define COLOR_STEEL "#a8b0b2" +#define COLOR_MUZZLE_FLASH "#ffffb2" +#define COLOR_CHESTNUT "#996633" +#define COLOR_BEASTY_BROWN "#663300" +#define COLOR_WHEAT "#ffff99" +#define COLOR_CYAN_BLUE "#3366cc" +#define COLOR_LIGHT_CYAN "#66ccff" +#define COLOR_PAKISTAN_GREEN "#006600" +#define COLOR_HULL "#436b8e" +#define COLOR_AMBER "#ffbf00" +#define COLOR_COMMAND_BLUE "#46698c" +#define COLOR_SKY_BLUE "#5ca1cc" +#define COLOR_PALE_ORANGE "#b88a3b" +#define COLOR_CIVIE_GREEN "#b7f27d" +#define COLOR_TITANIUM "#d1e6e3" +#define COLOR_DARK_GUNMETAL "#4c535b" +#define COLOR_BRONZE "#8c7853" +#define COLOR_BRASS "#b99d71" +#define COLOR_INDIGO "#4b0082" +#define COLOR_ALUMINIUM "#bbbbbb" +#define COLOR_CRYSTAL "#00c8a5" +#define COLOR_ASTEROID_ROCK "#735555" +#define COLOR_NULLGLASS "#ff6088" +#define COLOR_DIAMOND "#d8d4ea" //Color defines used by the assembly detailer. #define COLOR_ASSEMBLY_BLACK "#545454" diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 6e961d8482d..a9e43b7c3a0 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -52,89 +52,6 @@ #define MAX_STACK_AMOUNT_GLASS 50 #define MAX_STACK_AMOUNT_RODS 60 -//Colors -#define COLOR_RED "#FF0000" -#define COLOR_GREEN "#00FF00" -#define COLOR_BLUE "#0000FF" -#define COLOR_CYAN "#00FFFF" -#define COLOR_PINK "#FF00FF" -#define COLOR_YELLOW "#FFFF00" -#define COLOR_ORANGE "#FF9900" -#define COLOR_WHITE "#FFFFFF" -#define COLOR_GRAY "#808080" -#define COLOR_BLACK "#000000" -#define COLOR_NAVY_BLUE "#000080" -#define COLOR_LIGHT_GREEN "#008000" -#define COLOR_DARK_GRAY "#404040" -#define COLOR_MAROON "#800000" -#define COLOR_PURPLE "#800080" -#define COLOR_VIOLET "#9933ff" -#define COLOR_OLIVE "#808000" -#define COLOR_BROWN_ORANGE "#824b28" -#define COLOR_DARK_ORANGE "#b95a00" -#define COLOR_GRAY40 "#666666" -#define COLOR_GRAY20 "#333333" -#define COLOR_GRAY15 "#151515" -#define COLOR_SEDONA "#cc6600" -#define COLOR_DARK_BROWN "#917448" -#define COLOR_DEEP_SKY_BLUE "#00e1ff" -#define COLOR_LIME "#00ff00" -#define COLOR_TEAL "#33cccc" -#define COLOR_PALE_PINK "#bf89ba" -#define COLOR_YELLOW_GRAY "#c9a344" -#define COLOR_PALE_YELLOW "#c1bb7a" -#define COLOR_WARM_YELLOW "#b3863c" -#define COLOR_RED_GRAY "#aa5f61" -#define COLOR_BROWN "#b19664" -#define COLOR_GREEN_GRAY "#8daf6a" -#define COLOR_DARK_GREEN_GRAY "#54654c" -#define COLOR_BLUE_GRAY "#6a97b0" -#define COLOR_DARK_BLUE_GRAY "#3e4855" -#define COLOR_SUN "#ec8b2f" -#define COLOR_PURPLE_GRAY "#a2819e" -#define COLOR_BLUE_LIGHT "#33ccff" -#define COLOR_RED_LIGHT "#ff3333" -#define COLOR_BEIGE "#ceb689" -#define COLOR_BABY_BLUE "#89cff0" -#define COLOR_PALE_GREEN_GRAY "#aed18b" -#define COLOR_PALE_RED_GRAY "#cc9090" -#define COLOR_PALE_PURPLE_GRAY "#bda2ba" -#define COLOR_PALE_BLUE_GRAY "#8bbbd5" -#define COLOR_LUMINOL "#66ffff" -#define COLOR_SILVER "#c0c0c0" -#define COLOR_GRAY80 "#cccccc" -#define COLOR_OFF_WHITE "#eeeeee" -#define COLOR_GOLD "#6d6133" -#define COLOR_NT_RED "#9d2300" -#define COLOR_BOTTLE_GREEN "#1f6b4f" -#define COLOR_PALE_BTL_GREEN "#57967f" -#define COLOR_GUNMETAL "#545c68" -#define COLOR_WALL_GUNMETAL "#353a42" -#define COLOR_STEEL "#a8b0b2" -#define COLOR_MUZZLE_FLASH "#ffffb2" -#define COLOR_CHESTNUT "#996633" -#define COLOR_BEASTY_BROWN "#663300" -#define COLOR_WHEAT "#ffff99" -#define COLOR_CYAN_BLUE "#3366cc" -#define COLOR_LIGHT_CYAN "#66ccff" -#define COLOR_PAKISTAN_GREEN "#006600" -#define COLOR_HULL "#436b8e" -#define COLOR_AMBER "#ffbf00" -#define COLOR_COMMAND_BLUE "#46698c" -#define COLOR_SKY_BLUE "#5ca1cc" -#define COLOR_PALE_ORANGE "#b88a3b" -#define COLOR_CIVIE_GREEN "#b7f27d" -#define COLOR_TITANIUM "#d1e6e3" -#define COLOR_DARK_GUNMETAL "#4c535b" -#define COLOR_BRONZE "#8c7853" -#define COLOR_BRASS "#b99d71" -#define COLOR_INDIGO "#4b0082" -#define COLOR_ALUMINIUM "#bbbbbb" -#define COLOR_CRYSTAL "#00c8a5" -#define COLOR_ASTEROID_ROCK "#735555" -#define COLOR_NULLGLASS "#ff6088" -#define COLOR_DIAMOND "#d8d4ea" - //FONTS: // Used by Paper and PhotoCopier (and PaperBin once a year). // Used by PDA's Notekeeper. diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm index e60200b967a..429344e6142 100644 --- a/code/_onclick/hud/parallax.dm +++ b/code/_onclick/hud/parallax.dm @@ -310,10 +310,4 @@ 1, 1, 1, 1, 0, 0, 0, 0 ) - screen_loc = "CENTER-7,CENTER-7" - - -#undef LOOP_NONE -#undef LOOP_NORMAL -#undef LOOP_REVERSE -#undef LOOP_TIME \ No newline at end of file + screen_loc = "CENTER-7,CENTER-7" \ No newline at end of file diff --git a/code/datums/spells/charge.dm b/code/datums/spells/charge.dm index 46cdbff7f94..78d5d41c793 100644 --- a/code/datums/spells/charge.dm +++ b/code/datums/spells/charge.dm @@ -11,7 +11,7 @@ include_user = 1 action_icon_state = "charge" -/obj/effect/proc_holder/spell/targeted/charge/cast(list/targets,mob/user = usr) +/obj/effect/proc_holder/spell/targeted/charge/cast(list/targets, mob/user = usr) for(var/mob/living/L in targets) var/list/hand_items = list(L.get_active_hand(),L.get_inactive_hand()) var/charged_item = null diff --git a/code/game/gamemodes/devil/true_devil/_true_devil.dm b/code/game/gamemodes/devil/true_devil/_true_devil.dm index a6c04c5dcc0..93b307f0105 100644 --- a/code/game/gamemodes/devil/true_devil/_true_devil.dm +++ b/code/game/gamemodes/devil/true_devil/_true_devil.dm @@ -102,7 +102,7 @@ /mob/living/carbon/true_devil/assess_threat() return 666 -/mob/living/carbon/true_devil/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0) +/mob/living/carbon/true_devil/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0) if(mind && has_bane(BANE_LIGHT)) mind.disrupt_spells(-500) return ..() //flashes don't stop devils UNLESS it's their bane. diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index 4a8f215ee47..1f525e93076 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -137,7 +137,7 @@ action_background_icon_state = "bg_cult" panel = "Demon" -/obj/effect/proc_holder/spell/targeted/sense_victims/cast(list/targets) +/obj/effect/proc_holder/spell/targeted/sense_victims/cast(list/targets, mob/user) var/list/victims = targets for(var/mob/living/L in GLOB.living_mob_list) if(!L.stat && !iscultist(L) && L.key && L != usr) diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index 7e7f1642e3a..37109669390 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -66,7 +66,7 @@ /obj/item/gun/energy/chrono_gun/update_icon() return -/obj/item/gun/energy/chrono_gun/process_fire() +/obj/item/gun/energy/chrono_gun/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override, bonus_spread = 0) if(field) field_disconnect(field) ..() diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 97de014cbf8..a155cd5c053 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -1,5 +1,4 @@ #define TANK_MAX_RELEASE_PRESSURE (3*ONE_ATMOSPHERE) -#define TANK_DEFAULT_RELEASE_PRESSURE 24 /obj/item/tank name = "tank" diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 270a6bd6179..32355cd17fd 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -220,7 +220,7 @@ to_chat(src, "Error: Private-Message: You are unable to use PM-s (muted).") return - var/msg = clean_input("Message:", "Private message to admins on IRC / 400 character limit", , src) as text|null + var/msg = clean_input("Message:", "Private message to admins on IRC / 400 character limit", , src) if(!msg) return diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index a7f9feb1c16..58579a893e2 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -137,7 +137,7 @@ if(prob(50)) ChangeTurf(baseturf) -/turf/simulated/floor/vines/ChangeTurf(turf/simulated/floor/T) +/turf/simulated/floor/vines/ChangeTurf(turf/simulated/floor/T, defer_change = FALSE, keep_icon = TRUE, ignore_air = FALSE) . = ..() //Do this *after* the turf has changed as qdel in spacevines will call changeturf again if it hasn't for(var/obj/structure/spacevine/SV in src) diff --git a/code/modules/mob/living/carbon/alien/larva/inventory.dm b/code/modules/mob/living/carbon/alien/larva/inventory.dm index 99298e50bbe..0119add7d71 100644 --- a/code/modules/mob/living/carbon/alien/larva/inventory.dm +++ b/code/modules/mob/living/carbon/alien/larva/inventory.dm @@ -1,3 +1,3 @@ //can't unequip since it can't equip anything -/mob/living/carbon/alien/larva/unEquip(obj/item/W as obj) +/mob/living/carbon/alien/larva/unEquip(obj/item/W as obj, force) return \ No newline at end of file diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 406bff81136..5ca13a616c1 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -610,7 +610,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, return -/mob/living/carbon/unEquip(obj/item/I) //THIS PROC DID NOT CALL ..() +/mob/living/carbon/unEquip(obj/item/I, force) //THIS PROC DID NOT CALL ..() . = ..() //Sets the default return value to what the parent returns. if(!. || !I) //We don't want to set anything to null if the parent returned 0. return diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index c4ceb829fff..380d2bcf236 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -74,7 +74,7 @@ if(istype(O) && O.owner == src) . = 0 // keep a good grip on your heart -/mob/living/carbon/human/unEquip(obj/item/I) +/mob/living/carbon/human/unEquip(obj/item/I, force) . = ..() //See mob.dm for an explanation on this and some rage about people copypasting instead of calling ..() like they should. if(!. || !I) return @@ -572,5 +572,3 @@ /mob/living/carbon/human/proc/delete_equipment() for(var/slot in get_all_slots())//order matters, dependant slots go first qdel(slot) - for(var/obj/item/I in l_hand, r_hand) - qdel(I) diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm index 4cba9bb5a12..89e6393cd09 100644 --- a/code/modules/mob/living/carbon/slime/slime.dm +++ b/code/modules/mob/living/carbon/slime/slime.dm @@ -235,7 +235,7 @@ Feedon(Food) ..() -/mob/living/carbon/slime/unEquip(obj/item/W as obj) +/mob/living/carbon/slime/unEquip(obj/item/W as obj, force) return /mob/living/carbon/slime/attack_ui(slot) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 3985bfce50e..0f3422f237a 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -348,6 +348,6 @@ return density = 0 //this is reset every canmove update otherwise -/mob/living/simple_animal/drone/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0) +/mob/living/simple_animal/drone/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0) if(affect_silicon) return ..() diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index 7695145300e..da0732c5ecd 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -242,7 +242,7 @@ return -/mob/living/silicon/robot/unEquip(obj/item/I) +/mob/living/silicon/robot/unEquip(obj/item/I, force) if(I == module_active) uneq_active(I) return ..() diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index bac58d8f124..cdd593a84c5 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -114,7 +114,7 @@ return 2 -/mob/living/silicon/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0) +/mob/living/silicon/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0, var/negate_armor = 0) return 0//The only effect that can hit them atm is flashes and they still directly edit so this works for now /* if(!effect || (blocked >= 2)) return 0 diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 30d74c07b7f..354359fee29 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -298,7 +298,7 @@ /obj/item/ammo_casing/caseless desc = "A caseless bullet casing." -/obj/item/ammo_casing/caseless/fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, params, distro, quiet) +/obj/item/ammo_casing/caseless/fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, params, distro, quiet, zone_override = "", spread) if(..()) loc = null return 1 diff --git a/code/modules/surgery/organs/subtypes/standard.dm b/code/modules/surgery/organs/subtypes/standard.dm index 831f80331d4..4c122ffe04b 100644 --- a/code/modules/surgery/organs/subtypes/standard.dm +++ b/code/modules/surgery/organs/subtypes/standard.dm @@ -204,8 +204,8 @@ name = limb_name ..() -/obj/item/organ/external/head/receive_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE) - ..(brute, burn, sharp, used_weapon, forbidden_limbs, ignore_resists) +/obj/item/organ/external/head/receive_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE, updating_health = TRUE) + ..() if(!disfigured) if(brute_dam + burn_dam > 50) disfigure()