diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 68e9ee8ec0..82bfb49e38 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -53,6 +53,16 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/space/nearstation) +"aah" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/security/main) "aai" = ( /turf/closed/wall/r_wall, /area/security/prison) @@ -1541,6 +1551,18 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/port/fore) +"adB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/main) "adC" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -2665,6 +2687,20 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/brig) +"afo" = ( +/obj/structure/noticeboard{ + dir = 1; + pixel_y = -27 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/main) "afp" = ( /obj/docking_port/stationary{ dir = 4; @@ -3143,6 +3179,20 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"agl" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/chair/sofa/right{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/security/main) "agm" = ( /obj/machinery/light{ dir = 8 @@ -3321,6 +3371,15 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/security/main) +"agD" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "agE" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box{ @@ -3332,6 +3391,13 @@ }, /turf/open/floor/plasteel, /area/security/main) +"agF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) "agG" = ( /obj/machinery/airalarm{ dir = 8; @@ -3436,6 +3502,10 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"agN" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/security/courtroom) "agO" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig Infirmary"; @@ -3467,6 +3537,19 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"agQ" = ( +/obj/machinery/light_switch{ + pixel_y = 28 + }, +/obj/structure/closet/secure_closet/courtroom, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/sign/warning/securearea{ + pixel_x = -32 + }, +/obj/item/gavelhammer, +/obj/machinery/atmospherics/pipe/simple/scrubbers, +/turf/open/floor/plasteel, +/area/security/courtroom) "agR" = ( /obj/effect/turf_decal/loading_area{ dir = 4; @@ -3888,16 +3971,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) -"ahC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/security/main) "ahD" = ( /obj/structure/chair, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -4202,21 +4275,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/showroomfloor, /area/security/brig) -"aia" = ( -/obj/structure/noticeboard{ - dir = 1; - pixel_y = -27 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/main) "aib" = ( /obj/structure/cable{ icon_state = "2-8" @@ -4556,19 +4614,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"aiB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/chair/sofa/right{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/main) "aiC" = ( /obj/structure/cable{ icon_state = "1-4" @@ -4729,10 +4774,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/plasteel/dark, /area/security/brig) -"aiP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall/r_wall, -/area/security/main) "aiQ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -4847,18 +4888,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/security/brig) -"ajh" = ( -/obj/machinery/light_switch{ - pixel_y = 28 - }, -/obj/structure/closet/secure_closet/courtroom, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/sign/warning/securearea{ - pixel_x = -32 - }, -/obj/item/gavelhammer, -/turf/open/floor/plasteel, -/area/security/courtroom) "aji" = ( /obj/structure/chair{ name = "Judge" @@ -5126,12 +5155,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/security/brig) -"ajM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/courtroom) "ajN" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5286,16 +5309,6 @@ }, /turf/open/floor/plating, /area/construction/mining/aux_base) -"aka" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/security/brig) "akb" = ( /obj/machinery/light{ dir = 8 @@ -5609,11 +5622,6 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel, /area/security/brig) -"akE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/security/brig) "akF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/red, @@ -91862,11 +91870,11 @@ adl aet agy aha -ahC -aia -aiP -aka -akE +aah +afo +adR +agD +agF gyr alq amd @@ -92633,11 +92641,11 @@ aff aeU ajA akd -ahF -aiB -abp -ajh -ajM +adB +agl +uHp +agQ +agN akw alb alG diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm index 01355173d2..174b44c6fc 100644 --- a/code/__DEFINES/citadel_defines.dm +++ b/code/__DEFINES/citadel_defines.dm @@ -2,18 +2,6 @@ //Be sure to update the min/max of these if you do change them. //Measurements are in imperial units. Inches, feet, yards, miles. Tsp, tbsp, cups, quarts, gallons, etc -//HUD stuff -#define ui_arousal "EAST-1:28,CENTER-4:8"//Below the health doll -#define ui_stamina "EAST-1:28,CENTER:17" // replacing internals button -#define ui_overridden_resist "EAST-3:24,SOUTH+1:7" -#define ui_combat_toggle "EAST-4:22,SOUTH:5" - -//1:1 HUD layout stuff -#define ui_boxcraft "EAST-4:22,SOUTH+1:6" -#define ui_boxarea "EAST-4:6,SOUTH+1:6" -#define ui_boxlang "EAST-5:22,SOUTH+1:6" -#define ui_boxvore "EAST-5:22,SOUTH+1:6" - //Filters #define CIT_FILTER_STAMINACRIT filter(type="drop_shadow", x=0, y=0, size=-3, color="#04080F") @@ -35,6 +23,8 @@ #define MASTURBATE_LINKED_ORGAN (1<<6) //used to pass our mission to the linked organ #define CAN_CLIMAX_WITH (1<<7) #define GENITAL_CAN_AROUSE (1<<8) +#define GENITAL_UNDIES_HIDDEN (1<<9) +#define UPDATE_OWNER_APPEARANCE (1<<10) #define DEF_VAGINA_SHAPE "Human" @@ -71,6 +61,12 @@ #define MILK_RATE_MULT 1 #define MILK_EFFICIENCY 1 +//visibility toggles defines to avoid errors typos code errors. +#define GEN_VISIBLE_ALWAYS "Always visible" +#define GEN_VISIBLE_NO_CLOTHES "Hidden by clothes" +#define GEN_VISIBLE_NO_UNDIES "Hidden by underwear" +#define GEN_VISIBLE_NEVER "Always hidden" + //Individual logging define #define INDIVIDUAL_LOOC_LOG "LOOC log" diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index c750119701..be0a4d0f59 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -82,6 +82,7 @@ #define CANUNCONSCIOUS (1<<2) #define CANPUSH (1<<3) #define GODMODE (1<<4) +#define CANSTAGGER (1<<5) //Health Defines #define HEALTH_THRESHOLD_CRIT 0 diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index 3d76390ce1..bd77e374aa 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -175,6 +175,7 @@ #define SPEECH_LANGUAGE 5 // #define SPEECH_IGNORE_SPAM 6 // #define SPEECH_FORCED 7 +#define COMSIG_MOB_ANTAG_ON_GAIN "mob_antag_on_gain" //from base of /datum/antagonist/on_gain(): (antag_datum) // /mob/living signals #define COMSIG_LIVING_REGENERATE_LIMBS "living_regenerate_limbs" //from base of /mob/living/regenerate_limbs(): (noheal, excluded_limbs) @@ -185,6 +186,7 @@ #define COMSIG_LIVING_MINOR_SHOCK "living_minor_shock" //sent by stuff like stunbatons and tasers: () #define COMSIG_LIVING_REVIVE "living_revive" //from base of mob/living/revive() (full_heal, admin_revive) #define COMSIG_MOB_CLIENT_LOGIN "comsig_mob_client_login" //sent when a mob/login() finishes: (client) +#define COMSIG_MOB_CLIENT_MOVE "comsig_mob_client_move" //sent when client/Move() finishes with no early returns: (client, direction, n, oldloc) #define COMSIG_LIVING_GUN_PROCESS_FIRE "living_gun_process_fire" //from base of /obj/item/gun/proc/process_fire(): (atom/target, params, zone_override) #define COMSIG_LIVING_COMBAT_ENABLED "combatmode_enabled" //from base of mob/living/enable_combat_mode() (was_forced) #define COMSIG_LIVING_COMBAT_DISABLED "combatmode_disabled" //from base of mob/living/disable_combat_mode() (was_forced) diff --git a/code/__DEFINES/dynamic.dm b/code/__DEFINES/dynamic.dm index 0d57961f48..ae5b031c8b 100644 --- a/code/__DEFINES/dynamic.dm +++ b/code/__DEFINES/dynamic.dm @@ -6,6 +6,7 @@ #define NO_ASSASSIN (1<<0) #define WAROPS_ALWAYS_ALLOWED (1<<1) #define USE_PREF_WEIGHTS (1<<2) +#define FORCE_IF_WON (1<<3) #define ONLY_RULESET (1<<0) #define HIGHLANDER_RULESET (1<<1) diff --git a/code/__DEFINES/maths.dm b/code/__DEFINES/maths.dm index 6d263473b0..f37efd694c 100644 --- a/code/__DEFINES/maths.dm +++ b/code/__DEFINES/maths.dm @@ -30,7 +30,7 @@ #define FLOOR(x, y) ( round((x) / (y)) * (y) ) // Similar to clamp but the bottom rolls around to the top and vice versa. min is inclusive, max is exclusive -#define WRAP(val, min, max) ( min == max ? min : (val) - (round(((val) - (min))/((max) - (min))) * ((max) - (min))) ) +#define WRAP(val, min, max) CLAMP(( min == max ? min : (val) - (round(((val) - (min))/((max) - (min))) * ((max) - (min))) ),min,max-1) // Real modulus that handles decimals #define MODULUS(x, y) ( (x) - (y) * round((x) / (y)) ) @@ -203,5 +203,7 @@ #define MANHATTAN_DISTANCE(a, b) (abs(a.x - b.x) + abs(a.y - b.y)) +#define LOGISTIC_FUNCTION(L,k,x,x_0) (L/(1+(NUM_E**(-k*(x-x_0))))) + /// Make sure something is a boolean TRUE/FALSE 1/0 value, since things like bitfield & bitflag doesn't always give 1s and 0s. #define FORCE_BOOLEAN(x) ((x)? TRUE : FALSE) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 89cacc1c7b..9efffefce5 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -345,11 +345,10 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S #define COLOUR_PRIORITY_AMOUNT 4 //how many priority levels there are. //Endgame Results -#define NUKE_NEAR_MISS 1 -#define NUKE_MISS_STATION 2 -#define NUKE_SYNDICATE_BASE 3 -#define STATION_DESTROYED_NUKE 4 -#define STATION_EVACUATED 5 +#define NUKE_MISS_STATION 1 +#define NUKE_SYNDICATE_BASE 2 +#define STATION_DESTROYED_NUKE 3 +#define STATION_EVACUATED 4 #define BLOB_WIN 8 #define BLOB_NUKE 9 #define BLOB_DESTROYED 10 diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 69e7ac99fc..b4735cd0d8 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -289,4 +289,5 @@ #define HUMAN_FIRE_STACK_ICON_NUM 3 #define PULL_PRONE_SLOWDOWN 0.6 -#define HUMAN_CARRY_SLOWDOWN 0 +#define FIREMAN_CARRY_SLOWDOWN 0 +#define PIGGYBACK_CARRY_SLOWDOWN 1 diff --git a/code/__DEFINES/vote.dm b/code/__DEFINES/vote.dm index 12e802383e..175cce3dc4 100644 --- a/code/__DEFINES/vote.dm +++ b/code/__DEFINES/vote.dm @@ -5,6 +5,11 @@ #define MAJORITY_JUDGEMENT_VOTING 4 #define INSTANT_RUNOFF_VOTING 5 +#define SHOW_RESULTS (1<<0) +#define SHOW_VOTES (1<<1) +#define SHOW_WINNER (1<<2) +#define SHOW_ABSTENTION (1<<3) + GLOBAL_LIST_INIT(vote_score_options,list("Bad","Poor","Acceptable","Good","Great")) GLOBAL_LIST_INIT(vote_type_names,list(\ @@ -15,3 +20,10 @@ GLOBAL_LIST_INIT(vote_type_names,list(\ "Raw Score (returns results from 0 to 1, winner is 1)" = SCORE_VOTING,\ "Majority Judgement (single-winner score voting)" = MAJORITY_JUDGEMENT_VOTING,\ )) + +GLOBAL_LIST_INIT(display_vote_settings, list(\ +"Results" = SHOW_RESULTS, +"Ongoing Votes" = SHOW_VOTES, +"Winner" = SHOW_WINNER, +"Abstainers" = SHOW_ABSTENTION +)) \ No newline at end of file diff --git a/code/__HELPERS/_cit_helpers.dm b/code/__HELPERS/_cit_helpers.dm index cc8ab0d250..9afae12c30 100644 --- a/code/__HELPERS/_cit_helpers.dm +++ b/code/__HELPERS/_cit_helpers.dm @@ -58,14 +58,13 @@ GLOBAL_LIST_EMPTY(ipc_antennas_list) //Genitals and Arousal Lists GLOBAL_LIST_EMPTY(genitals_list) GLOBAL_LIST_EMPTY(cock_shapes_list) -GLOBAL_LIST_EMPTY(gentlemans_organ_names) GLOBAL_LIST_EMPTY(balls_shapes_list) GLOBAL_LIST_EMPTY(breasts_shapes_list) GLOBAL_LIST_EMPTY(vagina_shapes_list) -GLOBAL_LIST_INIT(cum_into_containers_list, list(/obj/item/reagent_containers/food/snacks/pie)) //Yer fuggin snowflake name list jfc -GLOBAL_LIST_INIT(dick_nouns, list("dick","cock","member","shaft")) -GLOBAL_LIST_INIT(cum_id_list,"semen") -GLOBAL_LIST_INIT(milk_id_list,"milk") +//longcat memes. +GLOBAL_LIST_INIT(dick_nouns, list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "One eyed trouser trout", "Ding dong", "ankle spanker", "Pork sword", "engine cranker", "Harry hot dog", "Davy Crockett", "Kidney cracker", "Heat seeking moisture missile", "Giggle stick", "love whistle", "Tube steak", "Uncle Dick", "Purple helmet warrior")) + +GLOBAL_LIST_INIT(genitals_visibility_toggles, list(GEN_VISIBLE_ALWAYS, GEN_VISIBLE_NO_CLOTHES, GEN_VISIBLE_NO_UNDIES, GEN_VISIBLE_NEVER)) GLOBAL_LIST_INIT(dildo_shapes, list( "Human" = "human", diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index ff2559b661..38e25b04c5 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -54,11 +54,6 @@ init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/testicles, GLOB.balls_shapes_list) - GLOB.gentlemans_organ_names = list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", - "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", - "baloney pony", "schlanger", "Mutton dagger", "old blind bob","Hanging Johnny", "fishing rod", "Tally whacker", "polly rocket", - "One eyed trouser trout", "Ding dong", "ankle spanker", "Pork sword", "engine cranker", "Harry hot dog", "Davy Crockett", - "Kidney cracker", "Heat seeking moisture missile", "Giggle stick", "love whistle", "Tube steak", "Uncle Dick", "Purple helmet warrior") for(var/gpath in subtypesof(/obj/item/organ/genital)) var/obj/item/organ/genital/G = gpath diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index b8edf3b0f4..f7546193aa 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -185,7 +185,6 @@ "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, "cock_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), "has_balls" = FALSE, - "balls_internal" = FALSE, "balls_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), "balls_size" = BALLS_SIZE_DEF, "balls_shape" = DEF_BALLS_SHAPE, @@ -200,13 +199,11 @@ "has_vag" = FALSE, "vag_shape" = pick(GLOB.vagina_shapes_list), "vag_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), - "vag_clits" = 1, - "vag_clit_diam" = 0.25, - "vag_clit_len" = 0.25, "has_womb" = FALSE, - "womb_cum_rate" = CUM_RATE, - "womb_cum_mult" = CUM_RATE_MULT, - "womb_efficiency" = CUM_EFFICIENCY, + "balls_visibility" = GEN_VISIBLE_NO_UNDIES, + "breasts_visibility"= GEN_VISIBLE_NO_UNDIES, + "cock_visibility" = GEN_VISIBLE_NO_UNDIES, + "vag_visibility" = GEN_VISIBLE_NO_UNDIES, "ipc_screen" = snowflake_ipc_antenna_list ? pick(snowflake_ipc_antenna_list) : "None", "ipc_antenna" = "None", "flavor_text" = "", diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index e8a57bb257..46c2c919f4 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -152,10 +152,10 @@ else if(ismob(A)) changeNext_move(CLICK_CD_MELEE) - UnarmedAttack(A,1) + UnarmedAttack(A, 1) else if(W) - W.afterattack(A,src,0,params) + W.ranged_attack_chain(src, A, params) else RangedAttack(A,params) diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index 12f7986357..28fd7397b0 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -163,3 +163,14 @@ #define ui_ghost_reenter_corpse "SOUTH:6,CENTER:24" #define ui_ghost_teleport "SOUTH:6,CENTER+1:24" #define ui_ghost_pai "SOUTH: 6, CENTER+2:24" + + +//UI position overrides for 1:1 screen layout. (default is 7:5) +#define ui_stamina "EAST-1:28,CENTER:17" // replacing internals button +#define ui_overridden_resist "EAST-3:24,SOUTH+1:7" +#define ui_combat_toggle "EAST-4:22,SOUTH:5" + +#define ui_boxcraft "EAST-4:22,SOUTH+1:6" +#define ui_boxarea "EAST-4:6,SOUTH+1:6" +#define ui_boxlang "EAST-5:22,SOUTH+1:6" +#define ui_boxvore "EAST-5:22,SOUTH+1:6" diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index baa1add7e1..2136ee96e4 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -8,12 +8,15 @@ *afterattack. The return value does not matter. */ /obj/item/proc/melee_attack_chain(mob/user, atom/target, params) - if(item_flags & NO_ATTACK_CHAIN_SOFT_STAMCRIT) - if(isliving(user)) - var/mob/living/L = user + if(isliving(user)) + var/mob/living/L = user + if(item_flags & NO_ATTACK_CHAIN_SOFT_STAMCRIT) if(IS_STAMCRIT(L)) to_chat(L, "You are too exhausted to swing [src]!") return + if(!CHECK_MOBILITY(L, MOBILITY_USE)) + to_chat(L, "You are unable to swing [src] right now!") + return if(tool_behaviour && target.tool_act(user, src, tool_behaviour)) return if(pre_attack(target, user, params)) @@ -24,6 +27,15 @@ return afterattack(target, user, TRUE, params) +/// Like melee_attack_chain but for ranged. +/obj/item/proc/ranged_attack_chain(mob/user, atom/target, params) + if(isliving(user)) + var/mob/living/L = user + if(!CHECK_MOBILITY(L, MOBILITY_USE)) + to_chat(L, "You are unable to raise [src] right now!") + return + afterattack(target, user, FALSE, params) + // Called when the item is in the active hand, and clicked; alternately, there is an 'activate held object' verb or you can hit pagedown. /obj/item/proc/attack_self(mob/user) if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_SELF, user) & COMPONENT_NO_INTERACT) @@ -50,7 +62,6 @@ user.changeNext_move(CLICK_CD_MELEE) return I.attack(src, user) - /obj/item/proc/attack(mob/living/M, mob/living/user) if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user) & COMPONENT_ITEM_NO_ATTACK) return @@ -117,6 +128,7 @@ if(user != src && check_shields(I, totitemdamage, "the [I.name]", MELEE_ATTACK, I.armour_penetration)) return FALSE send_item_attack_message(I, user) + I.do_stagger_action(src, user) if(I.force) apply_damage(totitemdamage, I.damtype) //CIT CHANGE - replaces I.force with totitemdamage if(I.damtype == BRUTE) @@ -166,5 +178,33 @@ playsound(src, 'sound/weapons/dink.ogg', 30, 1) return 1 +/// How much stamina this takes to swing this is not for realism purposes hecc off. /obj/item/proc/getweight() return total_mass || w_class * 1.25 + +/// How long this staggers for. 0 and negatives supported. +/obj/item/proc/melee_stagger_duration() + if(!isnull(stagger_force)) + return stagger_force + /// totally not an untested, arbitrary equation. + return clamp((1.5 + (w_class/7.5)) * (force / 2), 0, 10 SECONDS) + +/obj/item/proc/do_stagger_action(mob/living/target, mob/living/user) + if(!CHECK_BITFIELD(target.status_flags, CANSTAGGER)) + return FALSE + if(target.combat_flags & COMBAT_FLAG_SPRINT_ACTIVE) + target.do_staggered_animation() + var/duration = melee_stagger_duration() + if(!duration) //0 + return FALSE + else if(duration > 0) + target.Stagger(duration) + else //negative + target.AdjustStaggered(duration) + return TRUE + +/mob/proc/do_staggered_animation() + set waitfor = FALSE + animate(src, pixel_x = -2, pixel_y = -2, time = 1, flags = ANIMATION_RELATIVE | ANIMATION_PARALLEL) + animate(pixel_x = 4, pixel_y = 4, time = 1, flags = ANIMATION_RELATIVE) + animate(pixel_x = -2, pixel_y = -2, time = 0.5, flags = ANIMATION_RELATIVE) diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index bc290bedb9..8b08366c50 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -396,6 +396,10 @@ key_mode = KEY_MODE_TEXT value_mode = VALUE_MODE_NUM +/datum/config_entry/keyed_list/job_threat + key_mode = KEY_MODE_TEXT + value_mode = VALUE_MODE_NUM + /datum/config_entry/number/monkeycap config_entry_value = 64 min_val = 0 @@ -436,3 +440,8 @@ /datum/config_entry/number/penis_max_inches_prefs config_entry_value = 20 min_val = 0 + +/datum/config_entry/keyed_list/safe_visibility_toggles + key_mode = KEY_MODE_TEXT + value_mode = VALUE_MODE_FLAG + config_entry_value = list(GEN_VISIBLE_NO_CLOTHES, GEN_VISIBLE_NO_UNDIES, GEN_VISIBLE_NEVER) //refer to cit_helpers for all toggles. diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 31e436f206..91d0db85d1 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -66,6 +66,7 @@ SUBSYSTEM_DEF(job) /datum/controller/subsystem/job/proc/GetJob(rank) + RETURN_TYPE(/datum/job) if(!occupations.len) SetupOccupations() return name_occupations[rank] @@ -738,4 +739,4 @@ SUBSYSTEM_DEF(job) . |= player.mind /datum/controller/subsystem/job/proc/JobDebug(message) - log_job_debug(message) \ No newline at end of file + log_job_debug(message) diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 5aeaf43bab..c57bac5526 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -37,11 +37,11 @@ PROCESSING_SUBSYSTEM_DEF(quirks) if(job?.blacklisted_quirks) cut = filter_quirks(my_quirks, job.blacklisted_quirks) for(var/V in my_quirks) - var/datum/quirk/Q = quirks[V] - if(Q) + if(V in quirks) + var/datum/quirk/Q = quirks[V] user.add_quirk(Q, spawn_effects) else - stack_trace("Invalid quirk \"[V]\" in client [cli.ckey] preferences") + log_admin("Invalid quirk \"[V]\" in client [cli.ckey] preferences") cli.prefs.all_quirks -= V badquirk = TRUE if(badquirk) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 2ef9608a96..a7be36abc2 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -479,15 +479,15 @@ SUBSYSTEM_DEF(ticker) var/vote_type = CONFIG_GET(string/map_vote_type) switch(vote_type) if("PLURALITY") - SSvote.initiate_vote("map","server",hideresults=TRUE) + SSvote.initiate_vote("map","server", display = SHOW_RESULTS) if("APPROVAL") - SSvote.initiate_vote("map","server",hideresults=TRUE,votesystem = APPROVAL_VOTING) + SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = APPROVAL_VOTING) if("IRV") - SSvote.initiate_vote("map","server",hideresults=TRUE,votesystem = INSTANT_RUNOFF_VOTING) + SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = INSTANT_RUNOFF_VOTING) if("SCORE") - SSvote.initiate_vote("map","server",hideresults=TRUE,votesystem = MAJORITY_JUDGEMENT_VOTING) + SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = MAJORITY_JUDGEMENT_VOTING) else - SSvote.initiate_vote("map","server",hideresults=TRUE) + SSvote.initiate_vote("map","server", display = SHOW_RESULTS) // fallback /datum/controller/subsystem/ticker/proc/HasRoundStarted() @@ -503,9 +503,9 @@ SUBSYSTEM_DEF(ticker) SSticker.modevoted = TRUE var/dynamic = CONFIG_GET(flag/dynamic_voting) if(dynamic) - SSvote.initiate_vote("dynamic","server",hideresults=TRUE,votesystem=SCORE_VOTING,forced=TRUE,vote_time = 20 MINUTES) + SSvote.initiate_vote("dynamic", "server", display = NONE, votesystem = SCORE_VOTING, forced = TRUE,vote_time = 20 MINUTES) else - SSvote.initiate_vote("roundtype","server",hideresults=TRUE,votesystem=PLURALITY_VOTING,forced=TRUE, \ + SSvote.initiate_vote("roundtype", "server", display = NONE, votesystem = PLURALITY_VOTING, forced=TRUE, \ vote_time = (CONFIG_GET(flag/modetier_voting) ? 1 MINUTES : 20 MINUTES)) /datum/controller/subsystem/ticker/Recover() diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index e7e5754f6b..7d72951278 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -23,7 +23,7 @@ SUBSYSTEM_DEF(vote) var/list/generated_actions = list() var/next_pop = 0 - var/obfuscated = FALSE//CIT CHANGE - adds obfuscated/admin-only votes + var/display_votes = SHOW_RESULTS|SHOW_VOTES|SHOW_WINNER|SHOW_ABSTENTION //CIT CHANGE - adds obfuscated/admin-only votes var/list/stored_gamemode_votes = list() //Basically the last voted gamemode is stored here for end-of-round use. @@ -59,7 +59,7 @@ SUBSYSTEM_DEF(vote) voted.Cut() voting.Cut() scores.Cut() - obfuscated = FALSE //CIT CHANGE - obfuscated votes + display_votes = initial(display_votes) //CIT CHANGE - obfuscated votes remove_action_buttons() /datum/controller/subsystem/vote/proc/get_result() @@ -250,7 +250,7 @@ SUBSYSTEM_DEF(vote) if(winners.len > 0) if(was_roundtype_vote) stored_gamemode_votes = list() - if(!obfuscated) + if(display_votes & SHOW_RESULTS) if(vote_system == SCHULZE_VOTING) text += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!" if(vote_system == MAJORITY_JUDGEMENT_VOTING) @@ -261,15 +261,15 @@ SUBSYSTEM_DEF(vote) votes = 0 if(was_roundtype_vote) stored_gamemode_votes[choices[i]] = votes - text += "\n[choices[i]]: [obfuscated ? "???" : votes]" //CIT CHANGE - adds obfuscated votes + text += "\n[choices[i]]: [display_votes & SHOW_RESULTS ? votes : "???"]" //CIT CHANGE - adds obfuscated votes if(mode != "custom") - if(winners.len > 1 && !obfuscated) //CIT CHANGE - adds obfuscated votes + if(winners.len > 1 && display_votes & SHOW_WINNER) //CIT CHANGE - adds obfuscated votes text = "\nVote Tied Between:" for(var/option in winners) text += "\n\t[option]" . = pick(winners) - text += "\nVote Result: [obfuscated ? "???" : .]" //CIT CHANGE - adds obfuscated votes - else + text += "\nVote Result: [display_votes & SHOW_WINNER ? . : "???"]" //CIT CHANGE - adds obfuscated votes + if(display_votes & SHOW_ABSTENTION) text += "\nDid not vote: [GLOB.clients.len-voted.len]" else if(vote_system == SCORE_VOTING) for(var/score_name in scores) @@ -278,7 +278,7 @@ SUBSYSTEM_DEF(vote) score = 0 if(was_roundtype_vote) stored_gamemode_votes[score_name] = score - text = "\n[score_name]: [obfuscated ? "???" : score]" + text = "\n[score_name]: [display_votes & SHOW_RESULTS ? score : "???"]" . = 1 else text += "Vote Result: Inconclusive - No Votes!" @@ -295,7 +295,7 @@ SUBSYSTEM_DEF(vote) if(islist(myvote)) for(var/j=1,j<=myvote.len,j++) SSblackbox.record_feedback("nested tally","voting",1,list(vote_title_text,"[j]\th",choices[myvote[j]])) - if(obfuscated) //CIT CHANGE - adds obfuscated votes. this messages admins with the vote's true results + if(!(display_votes & SHOW_RESULTS)) //CIT CHANGE - adds obfuscated votes. this messages admins with the vote's true results var/admintext = "Obfuscated results" if(vote_system != SCORE_VOTING) if(vote_system == SCHULZE_VOTING) @@ -327,7 +327,7 @@ SUBSYSTEM_DEF(vote) if(CONFIG_GET(flag/modetier_voting)) reset() started_time = 0 - initiate_vote("mode tiers","server",hideresults=FALSE,votesystem=SCORE_VOTING,forced=TRUE, vote_time = 30 MINUTES) + initiate_vote("mode tiers","server", votesystem=SCORE_VOTING, forced=TRUE, vote_time = 30 MINUTES) to_chat(world,"The vote will end right as the round starts.") return . if("restart") @@ -354,11 +354,15 @@ SUBSYSTEM_DEF(vote) return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.") GLOB.master_mode = "dynamic" var/list/runnable_storytellers = config.get_runnable_storytellers() + var/datum/dynamic_storyteller/picked for(var/T in runnable_storytellers) var/datum/dynamic_storyteller/S = T + if(stored_gamemode_votes[initial(S.name)] == 1 && CHECK_BITFIELD(initial(S.flags), FORCE_IF_WON)) + picked = S runnable_storytellers[S] *= round(stored_gamemode_votes[initial(S.name)]*100000,1) - var/datum/dynamic_storyteller/S = pickweightAllowZero(runnable_storytellers) - GLOB.dynamic_storyteller_type = S + if(!picked) + picked = pickweightAllowZero(runnable_storytellers) + GLOB.dynamic_storyteller_type = picked if("map") var/datum/map_config/VM = config.maplist[.] message_admins("The map has been voted for and will change to: [VM.map_name]") @@ -432,7 +436,7 @@ SUBSYSTEM_DEF(vote) saved -= usr.ckey return 0 -/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, hideresults, votesystem = PLURALITY_VOTING, forced = FALSE,vote_time = -1)//CIT CHANGE - adds hideresults argument to votes to allow for obfuscated votes +/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, display = display_votes, votesystem = PLURALITY_VOTING, forced = FALSE,vote_time = -1)//CIT CHANGE - adds display argument to votes to allow for obfuscated votes vote_system = votesystem if(!mode) if(started_time) @@ -452,7 +456,7 @@ SUBSYSTEM_DEF(vote) SEND_SOUND(world, sound('sound/misc/notice2.ogg')) reset() - obfuscated = hideresults //CIT CHANGE - adds obfuscated votes + display_votes = display //CIT CHANGE - adds obfuscated votes switch(vote_type) if("restart") choices.Add("Restart Round","Continue Playing") @@ -503,6 +507,21 @@ SUBSYSTEM_DEF(vote) if(!option || mode || !usr.client) break choices.Add(option) + var/keep_going = TRUE + var/toggles = SHOW_RESULTS|SHOW_VOTES|SHOW_WINNER + while(keep_going) + var/list/choices = list() + for(var/A in GLOB.display_vote_settings) + var/toggletext + var/bitflag = GLOB.display_vote_settings[A] + toggletext = "[toggles & bitflag ? "Show" : "Hide"] [A]" + choices[toggletext] = bitflag + var/chosen = input(usr, "Toggle vote display settings. Cancel to finalize.", toggles) as null|anything in choices + if(!chosen) + keep_going = FALSE + else + toggles ^= choices[chosen] + display_votes = toggles else return 0 mode = vote_type @@ -573,7 +592,7 @@ SUBSYSTEM_DEF(vote) ivotedforthis = ((C.ckey in voted) && (i in voted[C.ckey])) if(!votes) votes = 0 - . += "
  • [ivotedforthis ? "" : ""][choices[i]] ([obfuscated ? (admin ? "??? ([votes])" : "???") : votes] votes)[ivotedforthis ? "" : ""]
    • " // CIT CHANGE - adds obfuscated votes + . += "
  • [ivotedforthis ? "" : ""][choices[i]] ([display_votes & SHOW_VOTES ? votes : (admin ? "??? ([votes])" : "???")] votes)[ivotedforthis ? "" : ""]
    • " // CIT CHANGE - adds obfuscated votes if(choice_descs.len >= i) . += "
  • [choice_descs[i]]
    • " . += "
    " diff --git a/code/datums/beam.dm b/code/datums/beam.dm index 2622b6ae39..6a9878e086 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -9,8 +9,8 @@ var/max_distance = 0 var/sleep_time = 3 var/finished = 0 - var/target_oldloc = null - var/origin_oldloc = null + var/turf/target_oldloc + var/turf/origin_oldloc var/static_beam = 0 var/beam_type = /obj/effect/ebeam //must be subtype var/timing_id = null @@ -23,13 +23,13 @@ target_oldloc = get_turf(target) sleep_time = beam_sleep_time if(origin_oldloc == origin && target_oldloc == target) - static_beam = 1 + static_beam = TRUE max_distance = maxdistance base_icon = new(beam_icon,beam_icon_state) icon = beam_icon icon_state = beam_icon_state beam_type = btype - if(time < INFINITY) + if(time < INFINITY) addtimer(CALLBACK(src,.proc/End), time) /datum/beam/proc/Start() @@ -42,10 +42,14 @@ return recalculating = TRUE timing_id = null - if(origin && target && get_dist(origin,target)[AM] pushes [user] off of [AM.p_them()]!") /datum/component/riding/cyborg diff --git a/code/datums/elements/flavor_text.dm b/code/datums/elements/flavor_text.dm index 373647d6f5..ea8e361694 100644 --- a/code/datums/elements/flavor_text.dm +++ b/code/datums/elements/flavor_text.dm @@ -114,6 +114,9 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code //subtypes with additional hooks for DNA and preferences. /datum/element/flavor_text/carbon + //list of antagonists etcetera that should have nothing to do with people's snowflakes. + var/static/list/i_dont_even_know_who_you_are = typecacheof(list(/datum/antagonist/abductor, /datum/antagonist/ert, + /datum/antagonist/nukeop, /datum/antagonist/wizard)) /datum/element/flavor_text/carbon/Attach(datum/target, text = "", _name = "Flavor Text", _addendum, _max_len = MAX_FLAVOR_LEN, _always_show = FALSE, _edit = TRUE) if(!iscarbon(target)) @@ -122,6 +125,7 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code if(. == ELEMENT_INCOMPATIBLE) return RegisterSignal(target, COMSIG_CARBON_IDENTITY_TRANSFERRED_TO, .proc/update_dna_flavor_text) + RegisterSignal(target, COMSIG_MOB_ANTAG_ON_GAIN, .proc/on_antag_gain) if(ishuman(target)) RegisterSignal(target, COMSIG_HUMAN_PREFS_COPIED_TO, .proc/update_prefs_flavor_text) RegisterSignal(target, COMSIG_HUMAN_HARDSET_DNA, .proc/update_dna_flavor_text) @@ -129,7 +133,7 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code /datum/element/flavor_text/carbon/Detach(mob/living/carbon/C) . = ..() - UnregisterSignal(C, list(COMSIG_CARBON_IDENTITY_TRANSFERRED_TO, COMSIG_HUMAN_PREFS_COPIED_TO, COMSIG_HUMAN_HARDSET_DNA, COMSIG_HUMAN_ON_RANDOMIZE)) + UnregisterSignal(C, list(COMSIG_CARBON_IDENTITY_TRANSFERRED_TO, COMSIG_MOB_ANTAG_ON_GAIN, COMSIG_HUMAN_PREFS_COPIED_TO, COMSIG_HUMAN_HARDSET_DNA, COMSIG_HUMAN_ON_RANDOMIZE)) /datum/element/flavor_text/carbon/proc/update_dna_flavor_text(mob/living/carbon/C) texts_by_atom[C] = C.dna.features["flavor_text"] @@ -144,3 +148,9 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code /datum/element/flavor_text/carbon/proc/unset_flavor(mob/living/carbon/user) texts_by_atom[user] = "" + +/datum/element/flavor_text/carbon/proc/on_antag_gain(mob/living/carbon/user, datum/antagonist/antag) + if(is_type_in_typecache(antag, i_dont_even_know_who_you_are)) + texts_by_atom[user] = "" + if(user.dna) + user.dna.features["flavor_text"] = "" \ No newline at end of file diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index ea883c5637..16d61c29f9 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -37,7 +37,7 @@ D.apply_damage(damage, STAMINA, affecting, armor_block) log_combat(A, D, "punched (boxing) ") - if(D.getStaminaLoss() > 100) + if(D.getStaminaLoss() > 100 && istype(D.mind?.martial_art, /datum/martial_art/boxing)) var/knockout_prob = (D.getStaminaLoss() + rand(-15,15))*0.75 if((D.stat != DEAD) && prob(knockout_prob)) D.visible_message("[A] has knocked [D] out with a haymaker!", \ diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index cf10244890..5a69ebe427 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -90,6 +90,7 @@ /datum/status_effect/staggered id = "staggered" blocks_sprint = TRUE + alert_type = null /datum/status_effect/staggered/on_creation(mob/living/new_owner, set_duration) if(isnum(set_duration)) diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index ab2a69e7e9..d1b5240798 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -88,14 +88,6 @@ if(quirk_holder) quirk_holder.remove_client_colour(/datum/client_colour/monochrome) -/datum/quirk/libido - name = "Nymphomania" - desc = "You're always feeling a bit in heat. Also, you get aroused faster than usual." - value = 0 - mob_trait = TRAIT_PERMABONER - gain_text = "You are feeling extra wild." - lose_text = "You don't feel that burning sensation anymore." - /datum/quirk/maso name = "Masochism" desc = "You are aroused by pain." diff --git a/code/game/gamemodes/bloodsucker/bloodsucker.dm b/code/game/gamemodes/bloodsucker/bloodsucker.dm index 3fe67fd431..01b6035034 100644 --- a/code/game/gamemodes/bloodsucker/bloodsucker.dm +++ b/code/game/gamemodes/bloodsucker/bloodsucker.dm @@ -23,7 +23,7 @@ antag_flag = ROLE_BLOODSUCKER false_report_weight = 1 restricted_jobs = list("AI","Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_jobs = list("Chaplain", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") required_players = 20 required_enemies = 2 recommended_enemies = 4 diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 14fe960422..4db8f4129a 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -88,13 +88,13 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th user.underwear = chosen_prof.underwear user.undie_color = chosen_prof.undie_color user.undershirt = chosen_prof.undershirt - user.shirt_color =chosen_prof.shirt_color + user.shirt_color = chosen_prof.shirt_color user.socks = chosen_prof.socks user.socks_color =chosen_prof.socks_color chosen_dna.transfer_identity(user, 1) user.updateappearance(mutcolor_update=1) - user.update_body() + user.update_body(TRUE) user.domutcheck() //vars hackery. not pretty, but better than the alternative. diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index 4c3ef824b9..58dfd6d814 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -54,9 +54,9 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) // Current storyteller var/datum/dynamic_storyteller/storyteller = null // Threat logging vars - /// The "threat cap", threat shouldn't normally go above this and is used in ruleset calculations + /// Target threat level right now. Events and antags will try to keep the round at this level. var/threat_level = 0 - /// Set at the beginning of the round. Spent by the mode to "purchase" rules. + /// The current antag threat. Recalculated every time a ruletype starts or ends. var/threat = 0 /// Starting threat level, for things that increase it but can bring it back down. var/initial_threat_level = 0 @@ -261,11 +261,11 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) . += "Uncharted Space
    " . += "Congratulations and thank you for participating in the NT 'Frontier' space program! Your station is actively orbiting a high value system far from the nearest support stations. Little is known about your region of space, and the opportunity to encounter the unknown invites greater glory. You are encouraged to elevate security as necessary to protect Nanotrasen assets." set_security_level(SEC_LEVEL_BLUE) - if(80 to 99) + if(80 to 95) . += "Black Orbit
    " . += "As part of a mandatory security protocol, we are required to inform you that as a result of your orbital pattern directly behind an astrological body (oriented from our nearest observatory), your station will be under decreased monitoring and support. It is anticipated that your extreme location and decreased surveillance could pose security risks. Avoid unnecessary risks and attempt to keep your station in one piece." set_security_level(SEC_LEVEL_AMBER) - if(100) + if(96 to 100) . += "Impending Doom
    " . += "Your station is somehow in the middle of hostile territory, in clear view of any enemy of the corporation. Your likelihood to survive is low, and station destruction is expected and almost inevitable. Secure any sensitive material and neutralize any enemy you will come across. It is important that you at least try to maintain the station.
    " . += "Good luck." @@ -330,7 +330,6 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) peaceful_percentage = round(LORENTZ_CUMULATIVE_DISTRIBUTION(relative_threat, GLOB.dynamic_curve_centre, GLOB.dynamic_curve_width), 0.01)*100 - threat = threat_level SSblackbox.record_feedback("tally","dynamic_threat",threat_level,"Initial threat level") SSblackbox.record_feedback("tally","dynamic_threat",GLOB.dynamic_curve_centre,"Curve centre") SSblackbox.record_feedback("tally","dynamic_threat",GLOB.dynamic_curve_width,"Curve width") @@ -463,7 +462,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) log_game("DYNAMIC: Additional ruleset picked successfully, now [executed_rules.len] picked. [extra_rulesets_amount] remaining.") else - if(threat >= 50) + if(threat_level >= 50) message_admins("DYNAMIC: Picking first roundstart ruleset failed. You should report this.") log_game("DYNAMIC: Picking first roundstart ruleset failed. drafted_rules.len = [drafted_rules.len] and threat = [threat]/[threat_level]") return FALSE @@ -509,9 +508,8 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) drafted_rules -= starting_rule starting_rule.trim_candidates() - var/added_threat = starting_rule.scale_up(extra_rulesets_amount, threat) + starting_rule.scale_up(extra_rulesets_amount, threat) if (starting_rule.pre_execute()) - spend_threat(starting_rule.cost + added_threat) log_threat("[starting_rule.ruletype] - [starting_rule.name] -[starting_rule.cost + starting_rule.scaled_times * starting_rule.scaling_cost] threat", verbose = TRUE) if(starting_rule.flags & HIGHLANDER_RULESET) highlander_executed = TRUE @@ -534,8 +532,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) /datum/game_mode/dynamic/proc/execute_roundstart_rule(sent_rule) var/datum/dynamic_ruleset/rule = sent_rule if(rule.execute()) - if(rule.persistent) - current_rules += rule + current_rules += rule SSblackbox.record_feedback("associative","dynamic_rulesets",1,rule.get_blackbox_info()) return TRUE rule.clean_up() // Refund threat, delete teams and so on. @@ -607,7 +604,6 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) if ((forced || (new_rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && new_rule.cost <= threat))) new_rule.trim_candidates() if (new_rule.ready(forced)) - spend_threat(new_rule.cost) log_threat("[new_rule.ruletype] - [new_rule.name] -[new_rule.cost] threat", verbose = TRUE) if (new_rule.execute()) // This should never fail since ready() returned 1 if(new_rule.flags & HIGHLANDER_RULESET) @@ -617,8 +613,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) log_game("DYNAMIC: Making a call to a specific ruleset...[new_rule.name]!") SSblackbox.record_feedback("associative","dynamic_rulesets",1,new_rule.get_blackbox_info()) executed_rules += new_rule - if (new_rule.persistent) - current_rules += new_rule + current_rules += new_rule return TRUE else if (forced) log_game("DYNAMIC: The ruleset [new_rule.name] couldn't be executed due to lack of eligible players.") @@ -629,7 +624,6 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) var/datum/dynamic_ruleset/rule = sent_rule if (rule.execute()) log_game("DYNAMIC: Injected a [rule.ruletype == "latejoin" ? "latejoin" : "midround"] ruleset [rule.name].") - spend_threat(rule.cost) log_threat("[rule.ruletype] [rule.name] spent [rule.cost]", verbose = TRUE) if(rule.flags & HIGHLANDER_RULESET) highlander_executed = TRUE @@ -647,9 +641,9 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) return TRUE stack_trace("The [rule.ruletype] rule \"[rule.name]\" failed to execute.") return FALSE - + /datum/game_mode/dynamic/process() - if (pop_last_updated < world.time - (60 SECONDS)) + if (pop_last_updated < world.time - (120 SECONDS)) pop_last_updated = world.time update_playercounts() @@ -658,7 +652,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) current_rules -= rule SSblackbox.record_feedback("tally","dynamic",1,"Rulesets finished") SSblackbox.record_feedback("associative","dynamic_rulesets_finished",1,rule.get_blackbox_info()) - + storyteller.do_process() if (midround_injection_cooldown < world.time) @@ -717,6 +711,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) current_players[CURRENT_OBSERVERS].Add(M) continue current_players[CURRENT_DEAD_PLAYERS].Add(M) // Players who actually died (and admins who ghosted, would be nice to avoid counting them somehow) + threat = storyteller.calculate_threat() + 50 // 50 is the centerpoint, so we want it to be around 50 /// Removes type from the list /datum/game_mode/dynamic/proc/remove_from_list(list/type_list, type) @@ -767,23 +762,21 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) SSblackbox.record_feedback("tally","dynamic",1,"Successful latejoin injections") latejoin_injection_cooldown = storyteller.get_latejoin_cooldown() + world.time -/// Refund threat, but no more than threat_level. -/datum/game_mode/dynamic/proc/refund_threat(regain) - threat = min(threat_level,threat+regain) - SSblackbox.record_feedback("tally","dynamic_threat",regain,"Refunded threat") - log_threat("[regain] refunded. Threat is now [threat].", verbose = TRUE) - -/// Generate threat and increase the threat_level if it goes beyond, capped at 100 +/// Increase the threat level. /datum/game_mode/dynamic/proc/create_threat(gain) - threat = min(100, threat+gain) - if(threat > threat_level) - threat_level = threat + threat_level += gain SSblackbox.record_feedback("tally","dynamic_threat",gain,"Created threat") - log_threat("[gain] created. Threat is now [threat] and threat level is now [threat_level].", verbose = TRUE) + log_threat("[gain] created. Threat level is now [threat_level].", verbose = TRUE) -/// Expend threat, can't fall under 0. +/// Decrease the threat level. +/datum/game_mode/dynamic/proc/remove_threat(loss) + threat_level -= loss + SSblackbox.record_feedback("tally","dynamic_threat",loss,"Removed threat") + log_threat("[loss] removed. Threat level is now [threat_level].", verbose = TRUE) + +/// Fill up more of the threat level. /datum/game_mode/dynamic/proc/spend_threat(cost) - threat = max(threat-cost,0) + threat += cost SSblackbox.record_feedback("tally","dynamic_threat",cost,"Threat spent") log_threat("[cost] spent. Threat is now [threat].", verbose = TRUE) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets.dm b/code/game/gamemodes/dynamic/dynamic_rulesets.dm index 2f143f7233..eb7da2144f 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets.dm @@ -174,8 +174,8 @@ /// This is called if persistent variable is true everytime SSTicker ticks. /datum/dynamic_ruleset/proc/rule_process() - return - + return TRUE + /// Called on game mode pre_setup for roundstart rulesets. /// Do everything you need to do before job is assigned here. /// IMPORTANT: ASSIGN special_role HERE @@ -201,8 +201,7 @@ /// Runs from gamemode process() if ruleset fails to start, like delayed rulesets not getting valid candidates. /// This one only handles refunding the threat, override in ruleset to clean up the rest. /datum/dynamic_ruleset/proc/clean_up() - mode.refund_threat(cost + (scaled_times * scaling_cost)) - mode.log_threat("[ruletype] [name] refunded [cost + (scaled_times * scaling_cost)]",verbose=TRUE) + return /// Gets weight of the ruleset /// Note that this decreases weight if repeatable is TRUE and repeatable_weight_decrease is higher than 0 diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 638d8b53b6..15c531b15d 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -315,7 +315,6 @@ /datum/dynamic_ruleset/midround/from_ghosts/wizard name = "Wizard" config_tag = "midround_wizard" - persistent = TRUE antag_datum = /datum/antagonist/wizard antag_flag = ROLE_WIZARD enemy_roles = list("Security Officer","Detective","Head of Security", "Captain") @@ -344,7 +343,6 @@ /datum/dynamic_ruleset/midround/from_ghosts/wizard/rule_process() // i can literally copy this from are_special_antags_dead it's great if(isliving(wizard.current) && wizard.current.stat!=DEAD) return FALSE - for(var/obj/item/phylactery/P in GLOB.poi_list) //TODO : IsProperlyDead() if(P.mind && P.mind.has_antag_datum(/datum/antagonist/wizard)) return FALSE @@ -666,9 +664,6 @@ Mind.transfer_to(Ninja) var/datum/antagonist/ninja/ninjadatum = new ninjadatum.helping_station = pick(TRUE,FALSE) - if(ninjadatum.helping_station) - mode.refund_threat(cost+5) - mode.log_threat("Ninja was helping station; [cost+5] cost refunded.") Mind.add_antag_datum(ninjadatum) if(Ninja.mind != Mind) //something has gone wrong! diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index 2527c83077..a7fc9b86ce 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -802,11 +802,10 @@ /datum/dynamic_ruleset/roundstart/bloodsucker name = "Bloodsuckers" config_tag = "bloodsucker" - persistent = TRUE antag_flag = ROLE_BLOODSUCKER antag_datum = ANTAG_DATUM_BLOODSUCKER minimum_required_age = 0 - protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_roles = list("Chaplain", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") restricted_roles = list("Cyborg", "AI") required_candidates = 1 weight = 2 diff --git a/code/game/gamemodes/dynamic/dynamic_storytellers.dm b/code/game/gamemodes/dynamic/dynamic_storytellers.dm index d25416a4d1..63fd12f47a 100644 --- a/code/game/gamemodes/dynamic/dynamic_storytellers.dm +++ b/code/game/gamemodes/dynamic/dynamic_storytellers.dm @@ -5,17 +5,18 @@ var/list/property_weights = list() // See below. var/curve_centre = 0 // As GLOB.dynamic_curve_centre. var/curve_width = 1.8 // As GLOB.dynamic_curve_width. - var/forced_threat_level = -1 + var/forced_threat_level = -1 // As GLOB.dynamic_forced_threat_level /* NO_ASSASSIN: Will not have permanent assassination targets. WAROPS_ALWAYS_ALLOWED: Can always do warops, regardless of threat level. USE_PREF_WEIGHTS: Will use peoples' preferences to change the threat centre. + FORCE_IF_WON: If this mode won the vote, forces it */ var/flags = 0 + var/dead_player_weight = 1 // How much dead players matter for threat calculation var/weight = 3 // Weights for randomly picking storyteller. Multiplied by score after voting. var/event_frequency_lower = 6 MINUTES // How rare events will be, at least. var/event_frequency_upper = 20 MINUTES // How rare events will be, at most. - var/pop_antag_ratio = 5 // How many non-antags there should be vs antags. var/datum/game_mode/dynamic/mode = null // Cached as soon as it's made, by dynamic. /** @@ -39,6 +40,27 @@ Property weights are: var/event_injection_cooldown_middle = 0.5*(GLOB.dynamic_event_delay_max + GLOB.dynamic_event_delay_min) mode.event_injection_cooldown = (round(CLAMP(EXP_DISTRIBUTION(event_injection_cooldown_middle), GLOB.dynamic_event_delay_min, GLOB.dynamic_event_delay_max)) + world.time) +/datum/dynamic_storyteller/proc/calculate_threat() + var/threat = 0 + for(var/datum/antagonist/A in GLOB.antagonists) + if(A?.owner?.current && A.owner.current.stat != DEAD) + threat += A.threat() + for(var/r in SSevents.running) + var/datum/round_event/R = r + threat += R.threat() + for(var/mob/living/simple_animal/hostile/H in GLOB.mob_living_list) + var/turf/T = get_turf(H) + if(H.stat != DEAD && is_station_level(T.z) && !("Station" in H.faction)) + threat += H.threat() + for (var/mob/M in mode.current_players[CURRENT_LIVING_PLAYERS]) + if (M.stat != DEAD && M.mind && M.mind.assigned_role) + if(length(M.mind.antag_datums)) + threat += SSjob.GetJob(M.mind.assigned_role).GetThreat() + else + threat -= SSjob.GetJob(M.mind.assigned_role).GetThreat() + threat += (mode.current_players[CURRENT_DEAD_PLAYERS].len)*dead_player_weight + return round(threat,0.1) + /datum/dynamic_storyteller/proc/do_process() return @@ -83,25 +105,9 @@ Property weights are: if(mode.forced_injection) mode.forced_injection = !dry_run return 100 - var/chance = 0 - // If the high pop override is in effect, we reduce the impact of population on the antag injection chance - var/high_pop_factor = (mode.current_players[CURRENT_LIVING_PLAYERS].len >= GLOB.dynamic_high_pop_limit) - var/max_pop_per_antag = max(pop_antag_ratio,15 - round(mode.threat_level/10) - round(mode.current_players[CURRENT_LIVING_PLAYERS].len/(high_pop_factor ? 10 : 5))) - if (!mode.current_players[CURRENT_LIVING_ANTAGS].len) - chance += 80 // No antags at all? let's boost those odds! - else - var/current_pop_per_antag = mode.current_players[CURRENT_LIVING_PLAYERS].len / mode.current_players[CURRENT_LIVING_ANTAGS].len - if (current_pop_per_antag > max_pop_per_antag) - chance += min(50, 25+10*(current_pop_per_antag-max_pop_per_antag)) - else - chance += 25-10*(max_pop_per_antag-current_pop_per_antag) - if (mode.current_players[CURRENT_DEAD_PLAYERS].len > mode.current_players[CURRENT_LIVING_PLAYERS].len) - chance -= 30 // More than half the crew died? ew, let's calm down on antags - if (mode.threat > 70) - chance += 15 - if (mode.threat < 30) - chance -= 15 - return round(max(0,chance)) + var/threat_perc = mode.threat/mode.threat_level + + return round(max(0,100*(1-(threat_perc*threat_perc*threat_perc)))) /datum/dynamic_storyteller/proc/roundstart_draft() var/list/drafted_rules = list() @@ -114,32 +120,41 @@ Property weights are: for(var/property in property_weights) if(property in rule.property_weights) // just treat it as 0 if it's not in there property_weight += rule.property_weights[property] * property_weights[property] - drafted_rules[rule] = (rule.get_weight() + property_weight)*rule.weight_mult + drafted_rules[rule] = (rule.get_weight() * property_weight)*rule.weight_mult return drafted_rules /datum/dynamic_storyteller/proc/midround_draft() var/list/drafted_rules = list() for (var/datum/dynamic_ruleset/midround/rule in mode.midround_rules) // if there are antags OR the rule is an antag rule, antag_acceptable will be true. - if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level) && mode.threat >= rule.cost) + if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level)) // Classic secret : only autotraitor/minor roles if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))) continue rule.trim_candidates() + var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat)) + /* Basically, the closer the cost is to the current threat-level-away-from-threat, the more likely it is to + pick this particular ruleset. + Let's use a toy example: there's 60 threat level and 10 threat spent. + We want to pick a ruleset that's close to that, so we run the below equation, on two rulesets. + Ruleset 1 has 30 cost, ruleset 2 has 5 cost. + When we do the math, ruleset 1's threat_weight is 0.538, and ruleset 2's is 0.238, meaning ruleset 1 + is 2.26 times as likely to be picked, all other things considered. + Of course, we don't want it to GUARANTEE the closest, that's no fun, so it's just a weight. + */ + var/threat_weight = 1-abs(1-LOGISTIC_FUNCTION(2,0.05,cost_difference,0)) if (rule.ready()) var/property_weight = 0 for(var/property in property_weights) if(property in rule.property_weights) property_weight += rule.property_weights[property] * property_weights[property] - drafted_rules[rule] = (rule.get_weight() + property_weight)*rule.weight_mult - else if(mode.threat < rule.cost) - SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough threat to spend") + drafted_rules[rule] = round(((rule.get_weight() * property_weight)*rule.weight_mult*threat_weight)*1000,1) return drafted_rules /datum/dynamic_storyteller/proc/latejoin_draft(mob/living/carbon/human/newPlayer) var/list/drafted_rules = list() for (var/datum/dynamic_ruleset/latejoin/rule in mode.latejoin_rules) - if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level) && mode.threat >= rule.cost) + if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level - mode.threat)) // Classic secret : only autotraitor/minor roles if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))) continue @@ -150,56 +165,53 @@ Property weights are: rule.candidates = list(newPlayer) rule.trim_candidates() + var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat)) + var/threat_weight = 1-abs(1-(LOGISTIC_FUNCTION(2,0.05,cost_difference,0))) if (rule.ready()) var/property_weight = 0 for(var/property in property_weights) if(property in rule.property_weights) property_weight += rule.property_weights[property] * property_weights[property] - drafted_rules[rule] = (rule.get_weight() + property_weight)*rule.weight_mult - else if(mode.threat < rule.cost) - SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough threat to spend") + drafted_rules[rule] = round(((rule.get_weight() * property_weight)*rule.weight_mult*threat_weight)*1000,1) return drafted_rules /datum/dynamic_storyteller/proc/event_draft() var/list/drafted_rules = list() for(var/datum/dynamic_ruleset/event/rule in mode.events) - if(rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level) && mode.threat >= rule.cost) + if(rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level) && (mode.threat_level - mode.threat) >= rule.cost) if(rule.ready()) var/property_weight = 0 for(var/property in property_weights) if(property in rule.property_weights) property_weight += rule.property_weights[property] * property_weights[property] drafted_rules[rule] = (rule.get_weight() + property_weight)*rule.weight_mult - else if(mode.threat < rule.cost) - SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough threat to spend") return drafted_rules -/datum/dynamic_storyteller/cowabunga +/datum/dynamic_storyteller/chaotic name = "Chaotic" config_tag = "chaotic" curve_centre = 10 desc = "High chaos modes. Revs, wizard, clock cult. Multiple antags at once. Chaos is kept up all round." - property_weights = list("extended" = -1, "chaos" = 10) + property_weights = list("extended" = -1, "chaos" = 2) weight = 1 event_frequency_lower = 2 MINUTES event_frequency_upper = 10 MINUTES - flags = WAROPS_ALWAYS_ALLOWED - pop_antag_ratio = 4 + flags = WAROPS_ALWAYS_ALLOWED | FORCE_IF_WON var/refund_cooldown = 0 -/datum/dynamic_storyteller/cowabunga/get_midround_cooldown() +/datum/dynamic_storyteller/chaotic/do_process() + if(refund_cooldown < world.time) + mode.create_threat(20) + mode.log_threat("Chaotic storyteller ramped up the chaos. Threat level is now [mode.threat_level].") + refund_cooldown = world.time + 20 MINUTES + +/datum/dynamic_storyteller/chaotic/get_midround_cooldown() return ..() / 4 -/datum/dynamic_storyteller/cowabunga/get_latejoin_cooldown() +/datum/dynamic_storyteller/chaotic/get_latejoin_cooldown() return ..() / 4 -/datum/dynamic_storyteller/cowabunga/do_process() - if(refund_cooldown < world.time) - mode.refund_threat(40) - mode.log_threat("Chaotic storyteller refunded 40 threat. Threat is now [mode.threat].") - refund_cooldown = world.time + 1200 SECONDS - /datum/dynamic_storyteller/team name = "Teamwork" config_tag = "teamwork" @@ -223,23 +235,93 @@ Property weights are: flags = WAROPS_ALWAYS_ALLOWED property_weights = list("valid" = 1, "conversion" = 20) -/datum/dynamic_storyteller/classic +/datum/dynamic_storyteller/random name = "Random" config_tag = "random" - desc = "No special weights attached. Anything goes." - weight = 4 - curve_width = 4 - pop_antag_ratio = 7 - flags = USE_PREF_WEIGHTS + weight = 1 + desc = "No weighting at all; every ruleset has the same chance of happening. Cooldowns vary wildly. As random as it gets." + forced_threat_level = 100 + +/datum/dynamic_storyteller/random/get_midround_cooldown() + return rand(GLOB.dynamic_midround_delay_min/2, GLOB.dynamic_midround_delay_max*2) + +/datum/dynamic_storyteller/random/get_event_cooldown() + return rand(GLOB.dynamic_event_delay_min/2, GLOB.dynamic_event_delay_max*2) + +/datum/dynamic_storyteller/random/get_latejoin_cooldown() + return rand(GLOB.dynamic_latejoin_delay_min/2, GLOB.dynamic_latejoin_delay_max*2) + +/datum/dynamic_storyteller/random/get_injection_chance() + return 50 // i would do rand(0,100) but it's actually the same thing when you do the math + +/datum/dynamic_storyteller/random/calculate_threat() + return 0 // what IS threat + +/datum/dynamic_storyteller/random/roundstart_draft() + var/list/drafted_rules = list() + for (var/datum/dynamic_ruleset/roundstart/rule in mode.roundstart_rules) + if (rule.acceptable(mode.roundstart_pop_ready, mode.threat_level)) // If we got the population and threat required + rule.candidates = mode.candidates.Copy() + rule.trim_candidates() + if (rule.ready() && rule.candidates.len > 0) + drafted_rules[rule] = 1 + return drafted_rules + +/datum/dynamic_storyteller/random/midround_draft() + var/list/drafted_rules = list() + for (var/datum/dynamic_ruleset/midround/rule in mode.midround_rules) + if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level)) + // Classic secret : only autotraitor/minor roles + if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))) + continue + rule.trim_candidates() + if (rule.ready()) + drafted_rules[rule] = 1 + return drafted_rules + +/datum/dynamic_storyteller/random/latejoin_draft(mob/living/carbon/human/newPlayer) + var/list/drafted_rules = list() + for (var/datum/dynamic_ruleset/latejoin/rule in mode.latejoin_rules) + if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level)) + // Classic secret : only autotraitor/minor roles + if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))) + continue + // No stacking : only one round-ender, unless threat level > stacking_limit. + if (mode.threat_level > GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking) + if(rule.flags & HIGHLANDER_RULESET && mode.highlander_executed) + continue + rule.candidates = list(newPlayer) + rule.trim_candidates() + if (rule.ready()) + drafted_rules[rule] = 1 + return drafted_rules + +/datum/dynamic_storyteller/random/event_draft() + var/list/drafted_rules = list() + for(var/datum/dynamic_ruleset/event/rule in mode.events) + if(rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level)) + if(rule.ready()) + drafted_rules[rule] = 1 + return drafted_rules /datum/dynamic_storyteller/story name = "Story" config_tag = "story" - desc = "Antags with options for loadouts and gimmicks. Traitor, wizard, nukies." + desc = "Antags with options for loadouts and gimmicks. Traitor, wizard, nukies. Has a buildup-climax-falling action threat curve." weight = 2 curve_width = 2 - pop_antag_ratio = 7 - property_weights = list("story_potential" = 10) + property_weights = list("story_potential" = 2) + + +/datum/dynamic_storyteller/story/do_process() + var/current_time = (world.time / SSautotransfer.targettime)*180 + mode.threat_level = round(mode.initial_threat_level*(sin(current_time)+0.5),0.1) + +/datum/dynamic_storyteller/classic + name = "Classic" + config_tag = "classic" + desc = "No special antagonist weights. Good variety, but not like random. Uses your chaos preference to weight." + flags = USE_PREF_WEIGHTS /datum/dynamic_storyteller/suspicion name = "Intrigue" @@ -247,8 +329,8 @@ Property weights are: desc = "Antags that instill distrust in the crew. Traitors, bloodsuckers." weight = 2 curve_width = 2 - pop_antag_ratio = 7 - property_weights = list("trust" = -5) + dead_player_weight = 2 + property_weights = list("trust" = -3) /datum/dynamic_storyteller/liteextended name = "Calm" @@ -256,10 +338,10 @@ Property weights are: desc = "Low-chaos round. Few antags. No conversion." curve_centre = -3 curve_width = 0.5 - flags = NO_ASSASSIN + flags = NO_ASSASSIN | FORCE_IF_WON weight = 1 - pop_antag_ratio = 10 - property_weights = list("extended" = 1, "chaos" = -1, "valid" = -1, "story_potential" = 1, "conversion" = -10) + dead_player_weight = 5 + property_weights = list("extended" = 2, "chaos" = -1, "valid" = -1, "story_potential" = 1, "conversion" = -10) /datum/dynamic_storyteller/no_antag name = "Extended" @@ -267,7 +349,7 @@ Property weights are: desc = "No standard antags. Threatening events may still spawn." curve_centre = -5 curve_width = 0.5 - flags = NO_ASSASSIN + flags = NO_ASSASSIN | FORCE_IF_WON weight = 1 property_weights = list("extended" = 2) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index b98462d4d4..5affeba6d6 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -323,7 +323,7 @@ var/free_tickets = CONFIG_GET(number/default_antag_tickets) //Max extra tickets you can use var/additional_tickets = CONFIG_GET(number/max_tickets_per_roll) - + var/list/ckey_to_mind = list() //this is admittedly shitcode but I'm webediting var/list/prev_tickets = SSpersistence.antag_rep //cache for hyper-speed in theory. how many tickets someone has stored var/list/curr_tickets = list() //how many tickets someone has for *this* antag roll, so with the free tickets @@ -337,7 +337,7 @@ continue curr_tickets[mind_ckey] = amount ckey_to_mind[mind_ckey] = M //make sure we can look them up after picking - + if(!return_list) //return a single guy var/ckey if(length(curr_tickets)) @@ -584,7 +584,7 @@ //By default nuke just ends the round /datum/game_mode/proc/OnNukeExplosion(off_station) nuke_off_station = off_station - if(off_station < 2) + if(!off_station) station_was_nuked = TRUE //Will end the round on next check. //Additional report section in roundend report diff --git a/code/game/gamemodes/gangs/gang.dm b/code/game/gamemodes/gangs/gang.dm index fa25701ac4..df94d68688 100644 --- a/code/game/gamemodes/gangs/gang.dm +++ b/code/game/gamemodes/gangs/gang.dm @@ -4,6 +4,7 @@ can_coexist_with_others = FALSE job_rank = ROLE_GANG antagpanel_category = "Gang" + threat = 2 var/hud_type = "gangster" var/message_name = "Gangster" var/datum/team/gang/gang @@ -167,6 +168,7 @@ name = "Gang boss" hud_type = "gang_boss" message_name = "Leader" + threat = 10 /datum/antagonist/gang/boss/on_gain() ..() @@ -474,4 +476,4 @@ #undef MAXIMUM_RECALLS -#undef INFLUENCE_INTERVAL \ No newline at end of file +#undef INFLUENCE_INTERVAL diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index bd58649b97..9df7bffafd 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -1,13 +1,67 @@ /obj/machinery/door/poddoor/shutters gender = PLURAL name = "shutters" - desc = "Heavy duty metal shutters that open mechanically." + desc = "Mechanical metal shutters operated by a button with a magnetic seal, keeping them airtight." icon = 'icons/obj/doors/shutters.dmi' layer = SHUTTER_LAYER closingLayer = SHUTTER_LAYER + armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 75, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70) damage_deflection = 20 + max_integrity = 100 /obj/machinery/door/poddoor/shutters/preopen icon_state = "open" density = FALSE opacity = 0 + +// The below shutters are the original ones from the TG codebase. They are remaining as "secure" shutters. If anyone wants to improve their animation, feel free. +// The original shutters are now shutters_old.dmi; copy the naming format of the files into new a new .dmi to add new shutters that work with the poddoor code for animating the doors. +// Originally, the shutters were reskins of blast doors. Eighty hits with the Cap's sabre to destroy one shutter is far too powerful considering shutters cannot be deconstructed (yet). +// If you're a mapper and want super strong shutter, use the 'old' ones. + +/obj/machinery/door/poddoor/shutters/old + name = "strong shutters" + desc = "These shutters have an armoured frame; it looks like plasteel. These shutters look robust enough to survive explosions." + icon = 'icons/obj/doors/shutters_old.dmi' + icon_state = "closed" + armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 75, "bomb" = 30, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70) + max_integrity = 300 + +/obj/machinery/door/poddoor/shutters/old/preopen + icon_state = "open" + density = FALSE + opacity = 0 + +// End of old shutter stuff. Credit for the old shutter sprites to TG. + +/obj/machinery/door/poddoor/shutters/radiation + name = "radiation shutters" + desc = "Lead-lined shutters painted yellow with a radioactive hazard symbol on it. Blocks out most radiation" + icon = 'icons/obj/doors/shutters_radiation.dmi' + icon_state = "closed" + rad_insulation = 0.2 + +/obj/machinery/door/poddoor/shutters/radiation/preopen + icon_state = "open" + density = FALSE + opacity = 0 + rad_insulation = 1 + +/obj/machinery/door/poddoor/shutters/radiation/do_animate(animation) + ..() + switch(animation) + if("opening") + rad_insulation = 1 + if("closing") + rad_insulation = 0.2 + +/obj/machinery/door/poddoor/shutters/window + name = "windowed shutters" + desc = "Mechanical shutters that have some form of plastic window in them, allowing you to see through the shutters at all times." + icon = 'icons/obj/doors/shutters_window.dmi' + icon_state = "closed" + opacity = 0 + +/obj/machinery/door/poddoor/shutters/window/preopen + icon_state = "open" + density = FALSE diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 5a215f0396..e1d6101aa5 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -34,7 +34,12 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) var/usesound = null var/throwhitsound = null var/w_class = WEIGHT_CLASS_NORMAL + + /// The amount of stamina it takes to swing an item in a normal melee attack do not lie to me and say it's for realism because it ain't. If null it will autocalculate from w_class. var/total_mass //Total mass in arbitrary pound-like values. If there's no balance reasons for an item to have otherwise, this var should be the item's weight in pounds. + /// How long, in deciseconds, this staggers for, if null it will autocalculate from w_class and force. Unlike total mass this supports 0 and negatives. + var/stagger_force + var/slot_flags = 0 //This is used to determine on which slots an item can fit. pass_flags = PASSTABLE pressure_resistance = 4 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index bf023c2c07..29a31122bf 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -170,7 +170,7 @@ flags_1 = CONDUCT_1 brightness_on = 2 light_color = "#FFDDCC" - flashlight_power = 0.3 + flashlight_power = 0.5 var/holo_cooldown = 0 /obj/item/flashlight/pen/afterattack(atom/target, mob/user, proximity_flag) @@ -227,15 +227,12 @@ custom_materials = null on = TRUE - // green-shaded desk lamp /obj/item/flashlight/lamp/green desc = "A classic green-shaded desk lamp." icon_state = "lampgreen" item_state = "lampgreen" - - /obj/item/flashlight/lamp/verb/toggle_light() set name = "Toggle light" set category = "Object" @@ -258,12 +255,13 @@ desc = "A red Nanotrasen issued flare. There are instructions on the side, it reads 'pull cord, make light'." w_class = WEIGHT_CLASS_SMALL brightness_on = 7 // Pretty bright. + total_mass = 0.8 light_color = "#FA421A" icon_state = "flare" item_state = "flare" actions_types = list() var/fuel = 0 - var/on_damage = 7 + var/on_damage = 9 var/produce_heat = 1500 heat = 1000 light_color = LIGHT_COLOR_FLARE @@ -331,14 +329,15 @@ name = "torch" desc = "A torch fashioned from some leaves and a log." w_class = WEIGHT_CLASS_BULKY - brightness_on = 4 + brightness_on = 6 //When on were like a lantern light_color = "#FAA44B" icon_state = "torch" item_state = "torch" lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' light_color = LIGHT_COLOR_ORANGE - on_damage = 10 + total_mass = TOTAL_MASS_NORMAL_ITEM + on_damage = 12 //Its a log thats on fire slot_flags = null /obj/item/flashlight/lantern @@ -348,10 +347,9 @@ lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi' desc = "A mining lantern." - brightness_on = 6 // luminosity when on + brightness_on = 6 // luminosity when on light_color = "#FFAA44" - flashlight_power = 0.75 - + flashlight_power = 0.8 /obj/item/flashlight/slime gender = PLURAL @@ -372,7 +370,6 @@ var/emp_cur_charges = 4 var/charge_tick = 0 - /obj/item/flashlight/emp/New() ..() START_PROCESSING(SSobj, src) @@ -435,7 +432,7 @@ var/fuel = 0 /obj/item/flashlight/glowstick/Initialize() - fuel = rand(1600, 2000) + fuel = rand(1000, 1500) light_color = color . = ..() @@ -540,7 +537,7 @@ /obj/item/flashlight/eyelight name = "eyelight" desc = "This shouldn't exist outside of someone's head, how are you seeing this?" - brightness_on = 15 + brightness_on = 10 flags_1 = CONDUCT_1 item_flags = DROPDEL actions_types = list() diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index a2145e67ee..c6bb350929 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -58,6 +58,21 @@ new /obj/effect/abstract/DPtarget(get_turf(src), pod) +/obj/item/choice_beacon/ingredients + name = "ingredient box delivery beacon" + desc = "Summon a box of ingredients from a wide selection!" + icon_state = "gangtool-red" + +/obj/item/choice_beacon/ingredients/generate_display_names() + var/static/list/ingredientboxes + if(!ingredientboxes) + ingredientboxes = list() + var/list/templist = typesof(/obj/item/storage/box/ingredients) + for(var/V in templist) + var/obj/item/storage/box/ingredients/A = V + ingredientboxes[initial(A.theme_name)] = A + return ingredientboxes + /obj/item/choice_beacon/hero name = "heroic beacon" desc = "To summon heroes from the past to protect the future." @@ -72,7 +87,6 @@ hero_item_list[initial(A.name)] = A return hero_item_list - /obj/item/storage/box/hero name = "Courageous Tomb Raider - 1940's." @@ -115,4 +129,5 @@ icon = 'icons/obj/supermatter.dmi' icon_state = "supermatterspray" w_class = WEIGHT_CLASS_SMALL - var/usesleft = 2 \ No newline at end of file + var/usesleft = 2 + diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index a54d126abb..b596e40e36 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -120,6 +120,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ )), \ null, \ new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("pestle", /obj/item/pestle, 1, time = 50), \ new/datum/stack_recipe("floodlight frame", /obj/structure/floodlight_frame, 5, one_per_turf = TRUE, on_floor = TRUE), \ )) @@ -255,6 +256,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),\ null, \ new/datum/stack_recipe("picture frame", /obj/item/wallframe/picture, 1, time = 10),\ + new/datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar, 3), \ new/datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),\ )) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 489704dbd5..a67757a535 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -946,12 +946,47 @@ /obj/item/reagent_containers/food/snacks/grown/apple, /obj/item/reagent_containers/food/snacks/chocolatebar, /obj/item/reagent_containers/food/snacks/grown/cherries, + /obj/item/reagent_containers/food/snacks/grown/berries, /obj/item/reagent_containers/food/snacks/grown/banana, /obj/item/reagent_containers/food/snacks/grown/cabbage, /obj/item/reagent_containers/food/snacks/grown/soybeans, /obj/item/reagent_containers/food/snacks/grown/corn, /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet, - /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle) + /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle, + /obj/item/reagent_containers/food/snacks/faggot, + /obj/item/reagent_containers/food/snacks/grown/citrus/orange, + /obj/item/reagent_containers/food/snacks/grown/citrus/lemon, + /obj/item/reagent_containers/food/snacks/grown/citrus/lime, + /obj/item/reagent_containers/food/snacks/grown/bluecherries, + /obj/item/reagent_containers/food/snacks/grown/cocoapod, + /obj/item/reagent_containers/food/snacks/grown/vanillapod, + /obj/item/reagent_containers/food/snacks/grown/grapes, + /obj/item/reagent_containers/food/snacks/grown/strawberry, + /obj/item/reagent_containers/food/snacks/grown/whitebeet, + /obj/item/reagent_containers/food/snacks/meat/slab/bear, + /obj/item/reagent_containers/food/snacks/meat/slab/spider, + /obj/item/reagent_containers/food/snacks/spidereggs, + /obj/item/reagent_containers/food/snacks/carpmeat, + /obj/item/reagent_containers/food/snacks/meat/slab/xeno, + /obj/item/reagent_containers/food/snacks/meat/slab/corgi, + /obj/item/reagent_containers/food/snacks/grown/oat, + /obj/item/reagent_containers/food/snacks/grown/wheat, + /obj/item/reagent_containers/honeycomb, + /obj/item/reagent_containers/food/snacks/grown/watermelon, + /obj/item/reagent_containers/food/snacks/grown/onion, + /obj/item/reagent_containers/food/snacks/grown/peach, + /obj/item/reagent_containers/food/snacks/grown/peanut, + /obj/item/reagent_containers/food/snacks/grown/pineapple, + /obj/item/reagent_containers/food/snacks/grown/pumpkin, + /obj/item/reagent_containers/food/snacks/meat/rawcrab, + /obj/item/reagent_containers/food/snacks/meat/slab/goliath, + /obj/item/reagent_containers/food/snacks/meat/slab/chicken, + /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime, + /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem, + /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, + /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton, + /obj/item/reagent_containers/food/snacks/egg, + /obj/item/reagent_containers/food/snacks/grown/eggplant) new randomFood(src) /obj/item/storage/box/ingredients/fiesta @@ -1061,6 +1096,15 @@ new /obj/item/reagent_containers/food/snacks/grown/cabbage(src) new /obj/item/reagent_containers/food/snacks/grown/chili(src) +/obj/item/storage/box/ingredients/sushi + theme_name = "sushi" + +/obj/item/storage/box/ingredients/sushi/PopulateContents() + for(var/i in 1 to 3) + new /obj/item/reagent_containers/food/snacks/sea_weed(src) + new /obj/item/reagent_containers/food/snacks/carpmeat(src) + new /obj/item/reagent_containers/food/snacks/meat/rawcrab(src) + /obj/item/storage/box/emptysandbags name = "box of empty sandbags" diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index c92bbdc996..4eaa0b4e0a 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -211,9 +211,6 @@ /obj/proc/check_uplink_validity() return 1 -/obj/proc/intercept_user_move(dir, mob, newLoc, oldLoc) - return - /obj/vv_get_dropdown() . = ..() .["Delete all of type"] = "?_src_=vars;[HrefToken()];delall=[REF(src)]" diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index e19feea582..a40314c7ad 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -121,7 +121,7 @@ return FALSE var/turf/T = get_turf(src) for(var/mob/living/L in T) - if(L.anchored || horizontal && L.mob_size > MOB_SIZE_TINY && L.density) + if(L.move_resist >= MOVE_FORCE_VERY_STRONG || (horizontal && L.mob_size > MOB_SIZE_TINY && L.density)) if(user) to_chat(user, "There's something large on top of [src], preventing it from opening." ) return FALSE @@ -133,7 +133,7 @@ if(closet != src && !closet.wall_mounted) return FALSE for(var/mob/living/L in T) - if(L.anchored || horizontal && L.mob_size > MOB_SIZE_TINY && L.density) + if(L.move_resist >= MOVE_FORCE_VERY_STRONG || horizontal && L.mob_size > MOB_SIZE_TINY && L.density) if(user) to_chat(user, "There's something too large in [src], preventing it from closing.") return FALSE @@ -216,7 +216,7 @@ if(!isliving(AM)) //let's not put ghosts or camera mobs inside closets... return FALSE var/mob/living/L = AM - if(L.anchored || L.buckled || L.incorporeal_move || L.has_buckled_mobs()) + if(L.move_resist >= MOVE_FORCE_VERY_STRONG || L.buckled || L.incorporeal_move || L.has_buckled_mobs()) return FALSE if(L.mob_size > MOB_SIZE_TINY) // Tiny mobs are treated as items. if(horizontal && L.density) @@ -451,7 +451,7 @@ /obj/structure/closet/relaymove(mob/user) if(user.stat || !isturf(loc) || !isliving(user)) return - if(locked) + if(locked || welded) if(message_cooldown <= world.time) message_cooldown = world.time + 50 to_chat(user, "[src]'s door won't budge!") diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index ecacf49fc2..528153324d 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -73,7 +73,7 @@ H.socks_color = recolor_undergarment(H, "socks", H.socks_color) add_fingerprint(H) - H.update_body() + H.update_body(TRUE) /obj/structure/dresser/proc/recolor_undergarment(mob/living/carbon/human/H, garment_type = "underwear", default_color) var/n_color = input(H, "Choose your [garment_type]'\s color.", "Character Preference", default_color) as color|null diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 7469bd2e72..65145c0eed 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -31,7 +31,7 @@ new_spawn.underwear = "Nude" //You're a plant, partner new_spawn.undershirt = "Nude" //changing underwear/shirt/socks doesn't seem to function correctly right now because of some bug elsewhere? new_spawn.socks = "Nude" - new_spawn.update_body() + new_spawn.update_body(TRUE) //Ash walker eggs: Spawns in ash walker dens in lavaland. Ghosts become unbreathing lizards that worship the Necropolis and are advised to retrieve corpses to create more ash walkers. diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 7be6269589..1df424815b 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -194,7 +194,7 @@ body += "Thunderdome Admin | " body += "Thunderdome Observer | " body += "Make mentor | " - body += "Remove mentor" + body += "Remove mentor | " body += "Allow reentering round" body += "
    " body += "" diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index 3336da7267..3e604856c5 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -45,6 +45,6 @@ SEND_SIGNAL(H, COMSIG_HUMAN_ON_RANDOMIZE) - H.update_body() + H.update_body(TRUE) H.update_hair() H.update_body_parts() diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 2e3626dd4c..2706eac405 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -22,6 +22,7 @@ GLOBAL_LIST_EMPTY(antagonists) var/antagpanel_category = "Uncategorized" //Antagpanel will display these together, REQUIRED var/show_name_in_check_antagonists = FALSE //Will append antagonist name in admin listings - use for categories that share more than one antag type var/list/blacklisted_quirks = list(/datum/quirk/nonviolent,/datum/quirk/mute) // Quirks that will be removed upon gaining this antag. Pacifist and mute are default. + var/threat = 0 // Amount of threat this antag poses, for dynamic mode /datum/antagonist/New() GLOB.antagonists += src @@ -75,6 +76,7 @@ GLOBAL_LIST_EMPTY(antagonists) remove_blacklisted_quirks() if(is_banned(owner.current) && replace_banned) replace_banned_player() + SEND_SIGNAL(owner.current, COMSIG_MOB_ANTAG_ON_GAIN, src) /datum/antagonist/proc/is_banned(mob/M) if(!M) @@ -237,6 +239,10 @@ GLOBAL_LIST_EMPTY(antagonists) return H.hijack_speed_override return hijack_speed +/// Gets our threat level. Defaults to threat var, override for custom stuff like different traitor goals having different threats. +/datum/antagonist/proc/threat() + return threat + //This one is created by admin tools for custom objectives /datum/antagonist/custom antagpanel_category = "Custom" diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm index 564e9a8617..44116dbe36 100644 --- a/code/modules/antagonists/abductor/abductor.dm +++ b/code/modules/antagonists/abductor/abductor.dm @@ -6,6 +6,7 @@ antagpanel_category = "Abductor" job_rank = ROLE_ABDUCTOR show_in_antagpanel = FALSE //should only show subtypes + threat = 5 var/datum/team/abductor_team/team var/sub_role var/outfit diff --git a/code/modules/antagonists/blob/blob.dm b/code/modules/antagonists/blob/blob.dm index 3d6db983dc..1b076c9302 100644 --- a/code/modules/antagonists/blob/blob.dm +++ b/code/modules/antagonists/blob/blob.dm @@ -3,7 +3,7 @@ roundend_category = "blobs" antagpanel_category = "Blob" job_rank = ROLE_BLOB - + threat = 20 var/datum/action/innate/blobpop/pop_action var/starting_points_human_blob = 60 var/point_rate_human_blob = 2 @@ -63,4 +63,4 @@ if(owner && owner.current) var/mob/camera/blob/B = owner.current if(istype(B)) - . += "(Progress: [B.blobs_legit.len]/[B.blobwincount])" \ No newline at end of file + . += "(Progress: [B.blobs_legit.len]/[B.blobwincount])" diff --git a/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm b/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm index b720d3590e..3757aecd02 100644 --- a/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm +++ b/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm @@ -75,6 +75,7 @@ desc = "A floating, fragile spore." icon_state = "blobpod" icon_living = "blobpod" + threat = 0.2 health = 30 maxHealth = 30 verb_say = "psychically pulses" diff --git a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm index f95883e7c8..2b621ff494 100644 --- a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm +++ b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm @@ -6,7 +6,7 @@ roundend_category = "bloodsuckers" antagpanel_category = "Bloodsucker" job_rank = ROLE_BLOODSUCKER - + threat = 5 // NAME var/bloodsucker_name // My Dracula style name var/bloodsucker_title // My Dracula style title @@ -89,10 +89,8 @@ // Refill with Blood owner.current.blood_volume = max(owner.current.blood_volume,BLOOD_VOLUME_SAFE) - - - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/datum/antagonist/bloodsucker/threat() + return threat+3*vamplevel /datum/antagonist/bloodsucker/proc/SelectFirstName() diff --git a/code/modules/antagonists/bloodsucker/datum_hunter.dm b/code/modules/antagonists/bloodsucker/datum_hunter.dm index 5fc6716a7d..84b9d4e828 100644 --- a/code/modules/antagonists/bloodsucker/datum_hunter.dm +++ b/code/modules/antagonists/bloodsucker/datum_hunter.dm @@ -13,7 +13,10 @@ var/list/datum/objective/objectives_given = list() // For removal if needed. var/datum/martial_art/my_kungfu // Hunters know a lil kung fu. var/bad_dude = FALSE // Every first hunter spawned is a SHIT LORD. + threat = -3 +/datum/antagonist/vamphunter/threat() + return bad_dude ? -threat : threat /datum/antagonist/vamphunter/on_gain() diff --git a/code/modules/antagonists/bloodsucker/datum_vassal.dm b/code/modules/antagonists/bloodsucker/datum_vassal.dm index 345c6f3c10..3d5ed1369b 100644 --- a/code/modules/antagonists/bloodsucker/datum_vassal.dm +++ b/code/modules/antagonists/bloodsucker/datum_vassal.dm @@ -19,6 +19,7 @@ var/datum/antagonist/bloodsucker/master // Who made me? var/list/datum/action/powers = list()// Purchased powers var/list/datum/objective/objectives_given = list() // For removal if needed. + threat = 1 /datum/antagonist/vassal/can_be_owned(datum/mind/new_owner) // If we weren't created by a bloodsucker, then we cannot be a vassal (assigned from antag panel) diff --git a/code/modules/antagonists/bloodsucker/powers/veil.dm b/code/modules/antagonists/bloodsucker/powers/veil.dm index 0b3cded832..ecb0611940 100644 --- a/code/modules/antagonists/bloodsucker/powers/veil.dm +++ b/code/modules/antagonists/bloodsucker/powers/veil.dm @@ -95,7 +95,7 @@ H.dna.features = random_features(H.dna.species?.id) // Apply Appearance - H.update_body() // Outfit and underware, also body. + H.update_body(TRUE) // Outfit and underwear, also body and privates. //H.update_mutant_bodyparts() // Lizard tails etc H.update_hair() H.update_body_parts() @@ -140,7 +140,7 @@ ADD_TRAIT(H, TRAIT_DISFIGURED, "husk") // NOTE: We are ASSUMING husk. // H.status_flags |= DISFIGURED // Restore "Unknown" disfigurement H.dna.features = prev_features // Apply Appearance - H.update_body() // Outfit and underware, also body. + H.update_body(TRUE) // Outfit and underwear, also body and privates. H.update_hair() H.update_body_parts() // Body itself, maybe skin color? cast_effect() // POOF diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index efe21f38fa..a48e080a89 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -5,6 +5,7 @@ var/special_role = ROLE_BROTHER var/datum/team/brother_team/team antag_moodlet = /datum/mood_event/focused + threat = 3 /datum/antagonist/brother/create_team(datum/team/brother_team/new_team) if(!new_team) diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index a81c409233..cc15147312 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -8,6 +8,7 @@ antagpanel_category = "Changeling" job_rank = ROLE_CHANGELING antag_moodlet = /datum/mood_event/focused + threat = 10 var/you_are_greet = TRUE var/give_objectives = TRUE diff --git a/code/modules/antagonists/clockcult/clock_mobs.dm b/code/modules/antagonists/clockcult/clock_mobs.dm index 2f00fd4e4a..87466d65f2 100644 --- a/code/modules/antagonists/clockcult/clock_mobs.dm +++ b/code/modules/antagonists/clockcult/clock_mobs.dm @@ -6,6 +6,7 @@ unique_name = 1 minbodytemp = 0 unsuitable_atmos_damage = 0 + threat = 1 atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) //Robotic damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0) healable = FALSE diff --git a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm index 897bff779d..f43f2814d8 100644 --- a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm +++ b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm @@ -9,6 +9,7 @@ desc = "The stalwart apparition of a soldier, blazing with crimson flames. It's armed with a gladius and shield." icon_state = "clockwork_marauder" mob_biotypes = MOB_HUMANOID + threat = 3 health = 120 maxHealth = 120 force_threshold = 8 diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm index 1869414ab6..cf3d88983c 100644 --- a/code/modules/antagonists/clockcult/clockcult.dm +++ b/code/modules/antagonists/clockcult/clockcult.dm @@ -5,6 +5,7 @@ antagpanel_category = "Clockcult" job_rank = ROLE_SERVANT_OF_RATVAR antag_moodlet = /datum/mood_event/cult + threat = 3 var/datum/action/innate/hierophant/hierophant_network = new() var/datum/team/clockcult/clock_team var/make_team = TRUE //This should be only false for tutorial scarabs diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 4bab621674..1746fd135c 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -5,6 +5,7 @@ roundend_category = "cultists" antagpanel_category = "Cult" antag_moodlet = /datum/mood_event/cult + threat = 3 var/datum/action/innate/cult/comm/communion = new var/datum/action/innate/cult/mastervote/vote = new var/datum/action/innate/cult/blood_magic/magic = new diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm index 1d0bfde322..dec39a2aa6 100644 --- a/code/modules/antagonists/devil/devil.dm +++ b/code/modules/antagonists/devil/devil.dm @@ -91,6 +91,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", job_rank = ROLE_DEVIL //Don't delete upon mind destruction, otherwise soul re-selling will break. delete_on_mind_deletion = FALSE + threat = 5 var/obligation var/ban var/bane @@ -112,6 +113,9 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /obj/effect/proc_holder/spell/targeted/summon_dancefloor)) var/ascendable = FALSE +/datum/antagonist/devil/threat() + return threat + form * 10 + /datum/antagonist/devil/can_be_owned(datum/mind/new_owner) . = ..() return . && (ishuman(new_owner.current) || iscyborg(new_owner.current)) @@ -120,7 +124,6 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", . = ..() .["Toggle ascendable"] = CALLBACK(src,.proc/admin_toggle_ascendable) - /datum/antagonist/devil/proc/admin_toggle_ascendable(mob/admin) ascendable = !ascendable message_admins("[key_name_admin(admin)] set [owner.current] devil ascendable to [ascendable]") @@ -244,7 +247,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", H.undershirt = "Nude" H.socks = "Nude" H.dna.features["mcolor"] = "511" //A deep red - H.regenerate_icons() + H.update_body(TRUE) else //Did the devil get hit by a staff of transmutation? owner.current.color = "#501010" give_appropriate_spells() @@ -466,7 +469,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", H.undershirt = "Nude" H.socks = "Nude" H.dna.features["mcolor"] = "511" - H.regenerate_icons() + H.update_body(TRUE) if(SOULVALUE >= TRUE_THRESHOLD) //Yes, BOTH this and the above if statement are to run if soulpower is high enough. var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(targetturf) A.faction |= "hell" diff --git a/code/modules/antagonists/devil/imp/imp.dm b/code/modules/antagonists/devil/imp/imp.dm index c2f636959b..1539bc384b 100644 --- a/code/modules/antagonists/devil/imp/imp.dm +++ b/code/modules/antagonists/devil/imp/imp.dm @@ -62,6 +62,7 @@ name = "Imp" antagpanel_category = "Devil" show_in_roundend = FALSE + threat = 10 /datum/antagonist/imp/on_gain() . = ..() @@ -71,4 +72,4 @@ var/datum/objective/newobjective = new newobjective.explanation_text = "Try to get a promotion to a higher devilic rank." newobjective.owner = owner - objectives += newobjective \ No newline at end of file + objectives += newobjective diff --git a/code/modules/antagonists/devil/sintouched/sintouched.dm b/code/modules/antagonists/devil/sintouched/sintouched.dm index 9983e5f599..c9bf474567 100644 --- a/code/modules/antagonists/devil/sintouched/sintouched.dm +++ b/code/modules/antagonists/devil/sintouched/sintouched.dm @@ -14,6 +14,13 @@ var/static/list/sins = list(SIN_ACEDIA,SIN_GLUTTONY,SIN_GREED,SIN_SLOTH,SIN_WRATH,SIN_ENVY,SIN_PRIDE) +/datum/antagonist/sintouched/threat() + switch(sin) + if(SIN_GLUTTONY,SIN_ENVY) + return 1 + else + return 0 + /datum/antagonist/sintouched/New() . = ..() sin = pick(sins) @@ -80,4 +87,4 @@ #undef SIN_GREED #undef SIN_PRIDE #undef SIN_SLOTH -#undef SIN_WRATH \ No newline at end of file +#undef SIN_WRATH diff --git a/code/modules/antagonists/disease/disease_abilities.dm b/code/modules/antagonists/disease/disease_abilities.dm index e8dcaf9cc7..496d11bcbc 100644 --- a/code/modules/antagonists/disease/disease_abilities.dm +++ b/code/modules/antagonists/disease/disease_abilities.dm @@ -59,7 +59,7 @@ new /datum/disease_ability/symptom/powerful/youth var/stat_block = "" var/threshold_block = "" var/category = "" - + var/malefit = 0 // used for threat calculation var/list/symptoms var/list/actions @@ -282,6 +282,7 @@ new /datum/disease_ability/symptom/powerful/youth /datum/disease_ability/symptom/medium/heal cost = 5 + malefit = -1 category = "Symptom (+)" /datum/disease_ability/symptom/powerful @@ -291,6 +292,7 @@ new /datum/disease_ability/symptom/powerful/youth /datum/disease_ability/symptom/powerful/heal cost = 8 + malefit = -1 category = "Symptom (Strong+)" /******MILD******/ @@ -319,50 +321,61 @@ new /datum/disease_ability/symptom/powerful/youth /datum/disease_ability/symptom/medium/hallucigen symptoms = list(/datum/symptom/hallucigen) + malefit = 1 short_desc = "Cause victims to hallucinate." long_desc = "Cause victims to hallucinate. Decreases stats, especially resistance." /datum/disease_ability/symptom/medium/choking symptoms = list(/datum/symptom/choking) + malefit = 1 short_desc = "Cause victims to choke." long_desc = "Cause victims to choke, threatening asphyxiation. Decreases stats, especially transmissibility." /datum/disease_ability/symptom/medium/confusion symptoms = list(/datum/symptom/confusion) + malefit = 1 short_desc = "Cause victims to become confused." long_desc = "Cause victims to become confused intermittently." /datum/disease_ability/symptom/medium/vomit symptoms = list(/datum/symptom/vomit) + malefit = 1 short_desc = "Cause victims to vomit." long_desc = "Cause victims to vomit. Slightly increases transmissibility. Vomiting also also causes the victims to lose nutrition and removes some toxin damage." /datum/disease_ability/symptom/medium/voice_change symptoms = list(/datum/symptom/voice_change) + malefit = 1 short_desc = "Change the voice of victims." long_desc = "Change the voice of victims, causing confusion in communications." /datum/disease_ability/symptom/medium/visionloss symptoms = list(/datum/symptom/visionloss) + malefit = 1 short_desc = "Damage the eyes of victims, eventually causing blindness." long_desc = "Damage the eyes of victims, eventually causing blindness. Decreases all stats." /datum/disease_ability/symptom/medium/deafness + malefit = 1 symptoms = list(/datum/symptom/deafness) /datum/disease_ability/symptom/medium/fever + malefit = 1 symptoms = list(/datum/symptom/fever) /datum/disease_ability/symptom/medium/shivering + malefit = 1 symptoms = list(/datum/symptom/shivering) /datum/disease_ability/symptom/medium/headache symptoms = list(/datum/symptom/headache) /datum/disease_ability/symptom/medium/nano_boost + malefit = -1 symptoms = list(/datum/symptom/nano_boost) /datum/disease_ability/symptom/medium/nano_destroy + malefit = 1 symptoms = list(/datum/symptom/nano_destroy) /datum/disease_ability/symptom/medium/viraladaptation @@ -374,18 +387,22 @@ new /datum/disease_ability/symptom/powerful/youth symptoms = list(/datum/symptom/viralevolution) /datum/disease_ability/symptom/medium/polyvitiligo + malefit = 1 symptoms = list(/datum/symptom/polyvitiligo) /datum/disease_ability/symptom/medium/disfiguration + malefit = 1 symptoms = list(/datum/symptom/disfiguration) /datum/disease_ability/symptom/medium/itching symptoms = list(/datum/symptom/itching) + malefit = 1 short_desc = "Cause victims to itch." long_desc = "Cause victims to itch, increasing all stats except stealth." /datum/disease_ability/symptom/medium/heal/weight_loss symptoms = list(/datum/symptom/weight_loss) + malefit = 1 short_desc = "Cause victims to lose weight." long_desc = "Cause victims to lose weight, and make it almost impossible for them to gain nutrition from food. Reduced nutrition allows your infection to spread more easily from hosts, especially by sneezing." @@ -400,12 +417,15 @@ new /datum/disease_ability/symptom/powerful/youth /******POWERFUL******/ /datum/disease_ability/symptom/powerful/fire + malefit = 1 symptoms = list(/datum/symptom/fire) /datum/disease_ability/symptom/powerful/flesh_eating + malefit = 1 symptoms = list(/datum/symptom/flesh_eating) /datum/disease_ability/symptom/powerful/genetic_mutation + malefit = 1 symptoms = list(/datum/symptom/genetic_mutation) cost = 8 @@ -413,6 +433,7 @@ new /datum/disease_ability/symptom/powerful/youth symptoms = list(/datum/symptom/inorganic_adaptation) /datum/disease_ability/symptom/powerful/narcolepsy + malefit = 1 symptoms = list(/datum/symptom/narcolepsy) /datum/disease_ability/symptom/powerful/youth @@ -451,4 +472,4 @@ new /datum/disease_ability/symptom/powerful/youth /datum/disease_ability/symptom/powerful/heal/coma symptoms = list(/datum/symptom/heal/coma) short_desc = "Cause victims to fall into a healing coma when hurt." - long_desc = "Cause victims to fall into a healing coma when hurt." \ No newline at end of file + long_desc = "Cause victims to fall into a healing coma when hurt." diff --git a/code/modules/antagonists/disease/disease_datum.dm b/code/modules/antagonists/disease/disease_datum.dm index 3c7de589d9..c827179006 100644 --- a/code/modules/antagonists/disease/disease_datum.dm +++ b/code/modules/antagonists/disease/disease_datum.dm @@ -17,6 +17,14 @@ . = ..() +/datum/antagonist/disease/threat() + var/mob/camera/disease/D = owner.current + var/final_threat = 0 + for(var/V in D.purchased_abilities) + var/datum/disease_ability/A = V + final_threat += (A.cost/8)*A.malefit + return final_threat*D.hosts + /datum/antagonist/disease/greet() to_chat(owner.current, "You are the [owner.special_role]!") to_chat(owner.current, "Infect members of the crew to gain adaptation points, and spread your infection further.") diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm index 5c878bcc55..bda1fbabe6 100644 --- a/code/modules/antagonists/ert/ert.dm +++ b/code/modules/antagonists/ert/ert.dm @@ -10,6 +10,7 @@ var/datum/outfit/outfit = /datum/outfit/ert/security var/role = "Security Officer" var/list/name_source + threat = -5 show_in_antagpanel = FALSE antag_moodlet = /datum/mood_event/focused diff --git a/code/modules/antagonists/greybois/greybois.dm b/code/modules/antagonists/greybois/greybois.dm index b5e18045e8..458ebad9cd 100644 --- a/code/modules/antagonists/greybois/greybois.dm +++ b/code/modules/antagonists/greybois/greybois.dm @@ -2,6 +2,7 @@ name = "Emergency Assistant" show_name_in_check_antagonists = TRUE show_in_antagpanel = FALSE + threat = -1 var/mission = "Assist the station." var/datum/outfit/outfit = /datum/outfit/ert/greybois diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm index bfd7b50cf8..ffca67b882 100644 --- a/code/modules/antagonists/highlander/highlander.dm +++ b/code/modules/antagonists/highlander/highlander.dm @@ -73,4 +73,4 @@ antiwelder.name = "compulsion of honor" antiwelder.desc = "You are unable to hold anything in this hand until you're the last one left!" antiwelder.icon_state = "bloodhand_right" - H.put_in_hands(antiwelder) \ No newline at end of file + H.put_in_hands(antiwelder) diff --git a/code/modules/antagonists/monkey/monkey.dm b/code/modules/antagonists/monkey/monkey.dm index e480eb8674..ebb39c814e 100644 --- a/code/modules/antagonists/monkey/monkey.dm +++ b/code/modules/antagonists/monkey/monkey.dm @@ -8,6 +8,7 @@ job_rank = ROLE_MONKEY roundend_category = "monkeys" antagpanel_category = "Monkey" + threat = 3 var/datum/team/monkey/monkey_team var/monkey_only = TRUE @@ -81,6 +82,7 @@ /datum/antagonist/monkey/leader name = "Monkey Leader" + threat = 5 monkey_only = FALSE /datum/antagonist/monkey/leader/admin_add(datum/mind/new_owner,mob/admin) diff --git a/code/modules/antagonists/morph/morph_antag.dm b/code/modules/antagonists/morph/morph_antag.dm index e01751946d..07781ce60a 100644 --- a/code/modules/antagonists/morph/morph_antag.dm +++ b/code/modules/antagonists/morph/morph_antag.dm @@ -2,5 +2,6 @@ name = "Morph" show_name_in_check_antagonists = TRUE show_in_antagpanel = FALSE + threat = 2 -//It does nothing! (Besides tracking) \ No newline at end of file +//It does nothing! (Besides tracking) diff --git a/code/modules/antagonists/nightmare/nightmare.dm b/code/modules/antagonists/nightmare/nightmare.dm index 41a3f181d0..837b6e4216 100644 --- a/code/modules/antagonists/nightmare/nightmare.dm +++ b/code/modules/antagonists/nightmare/nightmare.dm @@ -1,4 +1,5 @@ /datum/antagonist/nightmare name = "Nightmare" show_in_antagpanel = FALSE - show_name_in_check_antagonists = TRUE \ No newline at end of file + show_name_in_check_antagonists = TRUE + threat = 5 diff --git a/code/modules/antagonists/ninja/ninja.dm b/code/modules/antagonists/ninja/ninja.dm index 133bd5ab6a..bfd028aec2 100644 --- a/code/modules/antagonists/ninja/ninja.dm +++ b/code/modules/antagonists/ninja/ninja.dm @@ -8,6 +8,9 @@ var/give_objectives = TRUE var/give_equipment = TRUE +/datum/antagonist/ninja/threat() + return helping_station ? -8 : 8 + /datum/antagonist/ninja/apply_innate_effects(mob/living/mob_override) var/mob/living/M = mob_override || owner.current update_ninja_icons_added(M) diff --git a/code/modules/antagonists/nukeop/clownop.dm b/code/modules/antagonists/nukeop/clownop.dm index a3ccdee2b5..0ff2980939 100644 --- a/code/modules/antagonists/nukeop/clownop.dm +++ b/code/modules/antagonists/nukeop/clownop.dm @@ -3,6 +3,7 @@ name = "Clown Operative" roundend_category = "clown operatives" antagpanel_category = "ClownOp" + threat = 7 nukeop_outfit = /datum/outfit/syndicate/clownop /datum/antagonist/nukeop/clownop/on_gain() diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 1963bf16e3..2c91e18bd8 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -74,16 +74,15 @@ /obj/machinery/nuclearbomb/syndicate/get_cinematic_type(off_station) var/datum/game_mode/nuclear/NM = SSticker.mode switch(off_station) - if(0) + if(FALSE) if(istype(NM) && !NM.nuke_team.syndies_escaped()) return CINEMATIC_ANNIHILATION else return CINEMATIC_NUKE_WIN - if(1) + if(NUKE_MISS_STATION) return CINEMATIC_NUKE_MISS - if(2) + else return CINEMATIC_NUKE_FAR - return CINEMATIC_NUKE_FAR /obj/machinery/nuclearbomb/proc/disk_check(obj/item/disk/nuclear/D) if(D.fake) @@ -387,14 +386,14 @@ if("anchor") if(auth && yes_code) playsound(src, 'sound/machines/nuke/general_beep.ogg', 50, FALSE) - set_anchor() + set_anchor(usr) else playsound(src, 'sound/machines/nuke/angry_beep.ogg', 50, FALSE) -/obj/machinery/nuclearbomb/proc/set_anchor() - if(isinspace() && !anchored) - to_chat(usr, "There is nothing to anchor to!") +/obj/machinery/nuclearbomb/proc/set_anchor(mob/user) + if((istype(get_area(src), /area/space) || isinspace()) && !anchored) + to_chat(user, "This is not a suitable platform for anchoring [src]!") else anchored = !anchored @@ -480,20 +479,14 @@ GLOB.enter_allowed = FALSE - var/off_station = 0 + var/off_station = FALSE var/turf/bomb_location = get_turf(src) - var/area/A = get_area(bomb_location) - if(bomb_location && is_station_level(bomb_location.z)) - if(istype(A, /area/space)) - off_station = NUKE_NEAR_MISS - if((bomb_location.x < (128-NUKERANGE)) || (bomb_location.x > (128+NUKERANGE)) || (bomb_location.y < (128-NUKERANGE)) || (bomb_location.y > (128+NUKERANGE))) - off_station = NUKE_NEAR_MISS + if(!bomb_location || !is_station_level(bomb_location.z)) + off_station = NUKE_MISS_STATION else if(bomb_location.onSyndieBase()) off_station = NUKE_SYNDICATE_BASE - else - off_station = NUKE_MISS_STATION - if(off_station < 2) + if(!off_station) SSshuttle.registerHostileEnvironment(src) SSshuttle.lockdown = TRUE @@ -507,7 +500,7 @@ INVOKE_ASYNC(GLOBAL_PROC,.proc/KillEveryoneOnZLevel, z) /obj/machinery/nuclearbomb/proc/get_cinematic_type(off_station) - if(off_station < 2) + if(!off_station) return CINEMATIC_SELFDESTRUCT else return CINEMATIC_SELFDESTRUCT_MISS @@ -588,7 +581,7 @@ This is here to make the tiles around the station mininuke change when it's armed. */ -/obj/machinery/nuclearbomb/selfdestruct/set_anchor() +/obj/machinery/nuclearbomb/selfdestruct/set_anchor(mob/user) return /obj/machinery/nuclearbomb/selfdestruct/set_active() diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index 4a63ba65bd..7510ad6997 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -4,6 +4,7 @@ antagpanel_category = "NukeOp" job_rank = ROLE_OPERATIVE antag_moodlet = /datum/mood_event/focused + threat = 10 var/datum/team/nuclear/nuke_team var/always_new_team = FALSE //If not assigned a team by default ops will try to join existing ones, set this to TRUE to always create new team. var/send_to_spawnpoint = TRUE //Should the user be moved to default spawnpoint. diff --git a/code/modules/antagonists/overthrow/overthrow.dm b/code/modules/antagonists/overthrow/overthrow.dm index c8b253793e..0e8c4a35e0 100644 --- a/code/modules/antagonists/overthrow/overthrow.dm +++ b/code/modules/antagonists/overthrow/overthrow.dm @@ -10,6 +10,7 @@ roundend_category = "syndicate mutineers" antagpanel_category = "Syndicate Mutineers" job_rank = ROLE_TRAITOR // simply use the traitor preference & jobban settings + threat = 5 var/datum/team/overthrow/team var/static/list/possible_useful_items diff --git a/code/modules/antagonists/pirate/pirate.dm b/code/modules/antagonists/pirate/pirate.dm index ff33477909..01f3c6068e 100644 --- a/code/modules/antagonists/pirate/pirate.dm +++ b/code/modules/antagonists/pirate/pirate.dm @@ -3,6 +3,7 @@ job_rank = ROLE_TRAITOR roundend_category = "space pirates" antagpanel_category = "Pirate" + threat = 5 var/datum/team/pirate/crew /datum/antagonist/pirate/greet() @@ -104,4 +105,4 @@ else parts += "The pirate crew has failed." - return "
    [parts.Join("
    ")]
    " \ No newline at end of file + return "
    [parts.Join("
    ")]
    " diff --git a/code/modules/antagonists/revenant/revenant_antag.dm b/code/modules/antagonists/revenant/revenant_antag.dm index 8d99edf26e..46c1176533 100644 --- a/code/modules/antagonists/revenant/revenant_antag.dm +++ b/code/modules/antagonists/revenant/revenant_antag.dm @@ -2,6 +2,7 @@ name = "Revenant" show_in_antagpanel = FALSE show_name_in_check_antagonists = TRUE + threat = 5 /datum/antagonist/revenant/greet() owner.announce_objectives() diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index c4190d8cd9..4f308cc4c0 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -7,6 +7,7 @@ antagpanel_category = "Revolution" job_rank = ROLE_REV antag_moodlet = /datum/mood_event/revolution + threat = 2 var/hud_type = "rev" var/datum/team/revolution/rev_team @@ -148,6 +149,7 @@ /datum/antagonist/rev/head name = "Head Revolutionary" hud_type = "rev_head" + threat = 8 var/remove_clumsy = FALSE var/give_flash = FALSE var/give_hud = TRUE diff --git a/code/modules/antagonists/slaughter/slaughter_antag.dm b/code/modules/antagonists/slaughter/slaughter_antag.dm index a018603cf1..04f7167fa5 100644 --- a/code/modules/antagonists/slaughter/slaughter_antag.dm +++ b/code/modules/antagonists/slaughter/slaughter_antag.dm @@ -3,6 +3,7 @@ show_name_in_check_antagonists = TRUE var/objective_verb = "Kill" var/datum/mind/summoner + threat = 10 job_rank = ROLE_ALIEN show_in_antagpanel = FALSE @@ -28,4 +29,4 @@ /datum/antagonist/slaughter/laughter name = "Laughter demon" - objective_verb = "Hug and Tickle" \ No newline at end of file + objective_verb = "Hug and Tickle" diff --git a/code/modules/antagonists/survivalist/survivalist.dm b/code/modules/antagonists/survivalist/survivalist.dm index 0b66e8cb23..04ad53f65b 100644 --- a/code/modules/antagonists/survivalist/survivalist.dm +++ b/code/modules/antagonists/survivalist/survivalist.dm @@ -3,6 +3,7 @@ show_in_antagpanel = FALSE show_name_in_check_antagonists = TRUE blacklisted_quirks = list(/datum/quirk/nonviolent) // mutes are allowed + threat = 1 var/greet_message = "" /datum/antagonist/survivalist/proc/forge_objectives() diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm index 292fb10202..724c4e6f76 100644 --- a/code/modules/antagonists/swarmer/swarmer.dm +++ b/code/modules/antagonists/swarmer/swarmer.dm @@ -70,6 +70,7 @@ icon_living = "swarmer" icon_dead = "swarmer_unactivated" icon_gib = null + threat = 0.5 wander = 0 harm_intent_damage = 5 minbodytemp = 0 diff --git a/code/modules/antagonists/traitor/classes/ai.dm b/code/modules/antagonists/traitor/classes/ai.dm index fac1efeb49..eaa1137d51 100644 --- a/code/modules/antagonists/traitor/classes/ai.dm +++ b/code/modules/antagonists/traitor/classes/ai.dm @@ -1,5 +1,6 @@ /datum/traitor_class/ai // this one is special, so has no weight name = "Malfunctioning AI" + threat = 20 /datum/traitor_class/ai/forge_objectives(datum/antagonist/traitor/T) var/objective_count = 0 diff --git a/code/modules/antagonists/traitor/classes/assassin.dm b/code/modules/antagonists/traitor/classes/assassin.dm index 0c1d950f57..6b709aac59 100644 --- a/code/modules/antagonists/traitor/classes/assassin.dm +++ b/code/modules/antagonists/traitor/classes/assassin.dm @@ -3,7 +3,7 @@ employer = "Donk Corporation" weight = 0 chaos = 1 - cost = 2 + threat = 2 /datum/traitor_class/human/assassin/forge_single_objective(datum/antagonist/traitor/T) .=1 diff --git a/code/modules/antagonists/traitor/classes/hijack.dm b/code/modules/antagonists/traitor/classes/hijack.dm index e89eda1dcf..59e0591600 100644 --- a/code/modules/antagonists/traitor/classes/hijack.dm +++ b/code/modules/antagonists/traitor/classes/hijack.dm @@ -3,7 +3,7 @@ employer = "The Gorlex Marauders" weight = 3 chaos = 5 - cost = 5 + threat = 3 uplink_filters = list(/datum/uplink_item/stealthy_weapons/romerol_kit) /datum/traitor_class/human/hijack/forge_objectives(datum/antagonist/traitor/T) diff --git a/code/modules/antagonists/traitor/classes/martyr.dm b/code/modules/antagonists/traitor/classes/martyr.dm index 78f8bf9b0c..72f9ac86fc 100644 --- a/code/modules/antagonists/traitor/classes/martyr.dm +++ b/code/modules/antagonists/traitor/classes/martyr.dm @@ -3,7 +3,7 @@ employer = "The Tiger Cooperative" weight = 2 chaos = 5 - cost = 5 + threat = 5 uplink_filters = list(/datum/uplink_item/stealthy_weapons/romerol_kit,/datum/uplink_item/bundles_TC/contract_kit) /datum/traitor_class/human/martyr/forge_objectives(datum/antagonist/traitor/T) diff --git a/code/modules/antagonists/traitor/classes/traitor_class.dm b/code/modules/antagonists/traitor/classes/traitor_class.dm index 3df9dec929..012a269572 100644 --- a/code/modules/antagonists/traitor/classes/traitor_class.dm +++ b/code/modules/antagonists/traitor/classes/traitor_class.dm @@ -5,7 +5,7 @@ GLOBAL_LIST_EMPTY(traitor_classes) var/employer = "The Syndicate" var/weight = 0 var/chaos = 0 - var/cost = 0 + var/threat = 0 var/TC = 20 var/list/uplink_filters diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index a9dee81a6c..d3aae4b75a 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -12,6 +12,7 @@ var/datum/traitor_class/traitor_kind var/datum/contractor_hub/contractor_hub hijack_speed = 0.5 //10 seconds per hijack stage by default + threat = 5 /datum/antagonist/traitor/New() ..() @@ -21,11 +22,6 @@ /datum/antagonist/traitor/proc/set_traitor_kind(var/kind) traitor_kind = GLOB.traitor_classes[kind] - if(istype(SSticker.mode, /datum/game_mode/dynamic)) - var/datum/game_mode/dynamic/mode = SSticker.mode - if(traitor_kind.cost) - mode.spend_threat(traitor_kind.cost) - mode.log_threat("[traitor_kind.cost] was spent due to [owner.name] being a [traitor_kind.name].") /datum/antagonist/traitor/on_gain() if(owner.current && isAI(owner.current)) @@ -38,7 +34,7 @@ var/list/weights = list() for(var/C in GLOB.traitor_classes) var/datum/traitor_class/class = GLOB.traitor_classes[C] - var/weight = (1.5*class.weight)/(0.5+NUM_E**(-chaos_weight*class.chaos)) // just a logistic function + var/weight = LOGISTIC_FUNCTION(1.5*class.weight,chaos_weight,class.chaos,0) weights[C] = weight var/choice = pickweightAllowZero(weights) if(!choice) @@ -294,3 +290,6 @@ /datum/antagonist/traitor/is_gamemode_hero() return SSticker.mode.name == "traitor" + +/datum/antagonist/traitor/threat() + return threat+traitor_kind.threat diff --git a/code/modules/antagonists/wishgranter/wishgranter.dm b/code/modules/antagonists/wishgranter/wishgranter.dm index 15ec78692f..46b5edffd3 100644 --- a/code/modules/antagonists/wishgranter/wishgranter.dm +++ b/code/modules/antagonists/wishgranter/wishgranter.dm @@ -2,6 +2,7 @@ name = "Wishgranter Avatar" show_in_antagpanel = FALSE show_name_in_check_antagonists = TRUE + threat = 20 /datum/antagonist/wishgranter/proc/forge_objectives() var/datum/objective/hijack/hijack = new @@ -25,4 +26,4 @@ H.dna.add_mutation(HULK) H.dna.add_mutation(XRAY) H.dna.add_mutation(SPACEMUT) - H.dna.add_mutation(TK) \ No newline at end of file + H.dna.add_mutation(TK) diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm index 5ef3f24bd6..0e4e26e3f8 100644 --- a/code/modules/antagonists/wizard/equipment/spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/spellbook.dm @@ -11,7 +11,6 @@ var/buy_word = "Learn" var/limit //used to prevent a spellbook_entry from being bought more than X times with one wizard spellbook var/list/no_coexistance_typecache //Used so you can't have specific spells together - var/dynamic_cost = 0 // How much threat the spell costs to purchase for dynamic. var/dynamic_requirement = 0 // How high the threat level needs to be for purchasing in dynamic. /datum/spellbook_entry/New() @@ -31,10 +30,6 @@ for(var/spell in user.mind.spell_list) if(is_type_in_typecache(spell, no_coexistance_typecache)) return 0 - if(dynamic_cost>0 && istype(SSticker.mode,/datum/game_mode/dynamic)) - var/datum/game_mode/dynamic/mode = SSticker.mode - if(mode.threat < dynamic_cost) - return 0 return 1 /datum/spellbook_entry/proc/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) //return 1 on success @@ -70,10 +65,6 @@ SSblackbox.record_feedback("nested tally", "wizard_spell_improved", 1, list("[name]", "[aspell.spell_level]")) return 1 //No same spell found - just learn it - if(dynamic_cost > 0 && istype(SSticker.mode,/datum/game_mode/dynamic)) - var/datum/game_mode/dynamic/mode = SSticker.mode - mode.spend_threat(dynamic_cost) - mode.log_threat("Wizard spent [dynamic_cost] on [name].") SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name) user.mind.AddSpell(S) to_chat(user, "You have learned [S.name].") @@ -97,10 +88,6 @@ if(!S) S = new spell_type() var/spell_levels = 0 - if(dynamic_cost > 0 && istype(SSticker.mode,/datum/game_mode/dynamic)) - var/datum/game_mode/dynamic/mode = SSticker.mode - mode.refund_threat(dynamic_cost) - mode.log_threat("Wizard refunded [dynamic_cost] on [name].") for(var/obj/effect/proc_holder/spell/aspell in user.mind.spell_list) if(initial(S.name) == initial(aspell.name)) spell_levels = aspell.spell_level @@ -308,7 +295,6 @@ desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself." item_path = /obj/item/gun/magic/staff/change dynamic_requirement = 60 - dynamic_cost = 20 /datum/spellbook_entry/item/staffanimation name = "Staff of Animation" @@ -376,7 +362,6 @@ item_path = /obj/item/storage/belt/wands/full category = "Defensive" dynamic_requirement = 60 - dynamic_cost = 10 /datum/spellbook_entry/item/armor name = "Mastercrafted Armor Set" @@ -396,7 +381,6 @@ item_path = /obj/item/antag_spawner/contract category = "Assistance" dynamic_requirement = 50 - dynamic_cost = 10 /datum/spellbook_entry/item/plasmafist name = "Plasma Fist" @@ -424,10 +408,6 @@ category = "Assistance" dynamic_requirement = 60 -/datum/spellbook_entry/item/bloodbottle/New() - ..() - dynamic_cost = CONFIG_GET(keyed_list/dynamic_cost)["slaughter_demon"] - /datum/spellbook_entry/item/hugbottle name = "Bottle of Tickles" desc = "A bottle of magically infused fun, the smell of which will \ @@ -443,10 +423,6 @@ category = "Assistance" dynamic_requirement = 40 -/datum/spellbook_entry/item/hugbottle/New() - ..() - dynamic_cost = CONFIG_GET(keyed_list/dynamic_cost)["slaughter_demon"]/3 - /datum/spellbook_entry/item/mjolnir name = "Mjolnir" desc = "A mighty hammer on loan from Thor, God of Thunder. It crackles with barely contained power." @@ -522,7 +498,6 @@ /datum/spellbook_entry/summon/guns name = "Summon Guns" desc = "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill you. Just be careful not to stand still too long!" - dynamic_cost = 10 dynamic_requirement = 60 /datum/spellbook_entry/summon/guns/IsAvailible() @@ -536,17 +511,11 @@ active = 1 playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1) to_chat(user, "You have cast summon guns!") - if(istype(SSticker.mode,/datum/game_mode/dynamic)) - var/datum/game_mode/dynamic/mode = SSticker.mode - var/threat_spent = dynamic_cost - mode.spend_threat(threat_spent) - mode.log_threat("Wizard spent [threat_spent] on summon guns.") return 1 /datum/spellbook_entry/summon/magic name = "Summon Magic" desc = "Share the wonders of magic with the crew and show them why they aren't to be trusted with it at the same time." - dynamic_cost = 10 dynamic_requirement = 60 /datum/spellbook_entry/summon/magic/IsAvailible() @@ -560,17 +529,11 @@ active = 1 playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1) to_chat(user, "You have cast summon magic!") - if(istype(SSticker.mode,/datum/game_mode/dynamic)) - var/datum/game_mode/dynamic/mode = SSticker.mode - var/threat_spent = dynamic_cost - mode.spend_threat(threat_spent) - mode.log_threat("Wizard spent [threat_spent] on summon magic.") return 1 /datum/spellbook_entry/summon/events name = "Summon Events" desc = "Give Murphy's law a little push and replace all events with special wizard ones that will confound and confuse everyone. Multiple castings increase the rate of these events." - dynamic_cost = 20 dynamic_requirement = 60 var/times = 0 @@ -582,11 +545,6 @@ /datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name) summonevents() - if(istype(SSticker.mode,/datum/game_mode/dynamic) && times == 0) - var/datum/game_mode/dynamic/mode = SSticker.mode - var/threat_spent = dynamic_cost - mode.spend_threat(threat_spent) - mode.log_threat("Wizard spent [threat_spent] on summon events.") times++ playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1) to_chat(user, "You have cast summon events.") diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 234bb3d1a1..2d32f8f00a 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -4,6 +4,7 @@ antagpanel_category = "Wizard" job_rank = ROLE_WIZARD antag_moodlet = /datum/mood_event/focused + threat = 30 var/give_objectives = TRUE var/strip = TRUE //strip before equipping var/allow_rename = TRUE diff --git a/code/modules/antagonists/xeno/xeno.dm b/code/modules/antagonists/xeno/xeno.dm index b8f9927bc4..7c4c5351df 100644 --- a/code/modules/antagonists/xeno/xeno.dm +++ b/code/modules/antagonists/xeno/xeno.dm @@ -13,6 +13,7 @@ job_rank = ROLE_ALIEN show_in_antagpanel = FALSE var/datum/team/xeno/xeno_team + threat = 3 /datum/antagonist/xeno/create_team(datum/team/xeno/new_team) if(!new_team) @@ -34,4 +35,4 @@ /mob/living/carbon/alien/mind_initialize() ..() if(!mind.has_antag_datum(/datum/antagonist/xeno)) - mind.add_antag_datum(/datum/antagonist/xeno) \ No newline at end of file + mind.add_antag_datum(/datum/antagonist/xeno) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index f740ed27dd..50dd1e5608 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -208,7 +208,7 @@ else H.skin_tone = random_skin_tone() H.update_hair() - H.update_body() + H.update_body() //update_genitals arg FALSE because these don't quite require/have them most times. if(outfit) var/static/list/slots = list("uniform", "r_hand", "l_hand", "suit", "shoes", "gloves", "ears", "glasses", "mask", "head", "belt", "r_pocket", "l_pocket", "back", "id", "neck", "backpack_contents", "suit_store") for(var/slot in slots) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 87330ce42c..0a0cf25d2c 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -126,7 +126,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, "cock_color" = "fff", "has_balls" = FALSE, - "balls_internal" = FALSE, "balls_color" = "fff", "balls_shape" = DEF_BALLS_SHAPE, "balls_size" = BALLS_SIZE_DEF, @@ -141,12 +140,11 @@ GLOBAL_LIST_EMPTY(preferences_datums) "has_vag" = FALSE, "vag_shape" = DEF_VAGINA_SHAPE, "vag_color" = "fff", - "vag_clits" = 1, - "vag_clit_diam" = 0.25, "has_womb" = FALSE, - "womb_cum_rate" = CUM_RATE, - "womb_cum_mult" = CUM_RATE_MULT, - "womb_efficiency" = CUM_EFFICIENCY, + "balls_visibility" = GEN_VISIBLE_NO_UNDIES, + "breasts_visibility"= GEN_VISIBLE_NO_UNDIES, + "cock_visibility" = GEN_VISIBLE_NO_UNDIES, + "vag_visibility" = GEN_VISIBLE_NO_UNDIES, "ipc_screen" = "Sunburst", "ipc_antenna" = "None", "flavor_text" = "", @@ -187,6 +185,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/sprint_spacebar = FALSE var/sprint_toggle = FALSE + var/hud_toggle_flash = TRUE + var/hud_toggle_color = "#ffffff" + var/list/exp = list() var/list/menuoptions @@ -418,7 +419,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "" mutant_category = 0 - if("tail_lizard" in pref_species.default_features) + if(pref_species.mutant_bodyparts["tail_lizard"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -431,7 +432,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "" mutant_category = 0 - if("mam_tail" in pref_species.default_features) + if(pref_species.mutant_bodyparts["mam_tail"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -443,7 +444,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" mutant_category = 0 - if("tail_human" in pref_species.default_features) + if(pref_species.mutant_bodyparts["tail_human"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -456,7 +457,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "" mutant_category = 0 - if("meat_type" in pref_species.default_features) + if(pref_species.mutant_bodyparts["meat_type"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -468,7 +469,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" mutant_category = 0 - if("snout" in pref_species.default_features) + if(pref_species.mutant_bodyparts["snout"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -480,7 +481,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" mutant_category = 0 - if("horns" in pref_species.default_features) + if(pref_species.mutant_bodyparts["horns"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -493,7 +494,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) mutant_category++ if(mutant_category >= MAX_MUTANT_ROWS) dat += "" - if("frills" in pref_species.default_features) + if(pref_species.mutant_bodyparts["frills"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -506,7 +507,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "" mutant_category = 0 - if("spines" in pref_species.default_features) + if(pref_species.mutant_bodyparts["spines"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -519,7 +520,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "" mutant_category = 0 - if("body_markings" in pref_species.default_features) + if(pref_species.mutant_bodyparts["body_markings"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -531,7 +532,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" mutant_category = 0 - if("mam_body_markings" in pref_species.default_features) + if(pref_species.mutant_bodyparts["mam_body_markings"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -543,7 +544,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" - if("mam_ears" in pref_species.default_features) + if(pref_species.mutant_bodyparts["mam_ears"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -556,7 +557,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "" mutant_category = 0 - if("ears" in pref_species.default_features) + if(pref_species.mutant_bodyparts["ears"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -569,7 +570,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "" mutant_category = 0 - if("mam_snouts" in pref_species.default_features) + if(pref_species.mutant_bodyparts["mam_snouts"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -581,7 +582,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" mutant_category = 0 - if("legs" in pref_species.default_features) + if(pref_species.mutant_bodyparts["legs"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -593,7 +594,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" mutant_category = 0 - if("deco_wings" in pref_species.default_features) + if(pref_species.mutant_bodyparts["deco_wings"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -602,7 +603,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "[features["deco_wings"]]" dat += "    Change
    " - if("insect_wings" in pref_species.default_features) + if(pref_species.mutant_bodyparts["insect_wings"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -614,7 +615,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" mutant_category = 0 - if("insect_fluff" in pref_species.default_features) + if(pref_species.mutant_bodyparts["insect_fluff"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -625,7 +626,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" mutant_category = 0 - if("taur" in pref_species.default_features) + if(pref_species.mutant_bodyparts["taur"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -633,7 +634,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "[features["taur"]]" - if("insect_markings" in pref_species.default_features) + if(pref_species.mutant_bodyparts["insect_markings"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -650,7 +651,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" mutant_category = 0 - if("wings" in pref_species.mutant_bodyparts && GLOB.r_wings_list.len >1) + if(pref_species.mutant_bodyparts["wings"] && GLOB.r_wings_list.len >1) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -662,7 +663,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" mutant_category = 0 - if("xenohead" in pref_species.default_features) + if(pref_species.mutant_bodyparts["xenohead"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -674,7 +675,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" mutant_category = 0 - if("xenotail" in pref_species.default_features) + if(pref_species.mutant_bodyparts["xenotail"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -686,7 +687,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" mutant_category = 0 - if("xenodorsal" in pref_species.default_features) + if(pref_species.mutant_bodyparts["xenodorsal"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -698,7 +699,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" mutant_category = 0 - if("ipc_screen" in pref_species.default_features) + if(pref_species.mutant_bodyparts["ipc_screen"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -710,7 +711,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" mutant_category = 0 - if("ipc_antenna" in pref_species.default_features) + if(pref_species.mutant_bodyparts["ipc_antenna"]) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -763,6 +764,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "    Change
    " dat += "Penis Shape: [features["cock_shape"]]" dat += "Penis Length: [features["cock_length"]] inch(es)" + dat += "Penis Visibility:[features["cock_visibility"]]" dat += "Has Testicles:[features["has_balls"] == TRUE ? "Yes" : "No"]" if(features["has_balls"]) if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE) @@ -771,7 +773,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) else dat += "Testicles Color:
    " dat += "    Change
    " - dat += "Testicles showing:[features["balls_shape"]]" + dat += "Testicles Visibility:[features["balls_visibility"]]" dat += APPEARANCE_CATEGORY_COLUMN dat += "

    Vagina

    " dat += "[features["has_vag"] == TRUE ? "Yes" : "No"]" @@ -783,6 +785,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) else dat += "Vagina Color:
    " dat += "    Change
    " + dat += "Vagina Visibility:[features["vag_visibility"]]" dat += "Has Womb:[features["has_womb"] == TRUE ? "Yes" : "No"]" dat += "" dat += APPEARANCE_CATEGORY_COLUMN @@ -796,7 +799,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Color:
    " dat += "    Change
    " dat += "Cup Size:[features["breasts_size"]]" - dat += "Breast Shape:[features["breasts_shape"]]" + dat += "Breasts Shape:[features["breasts_shape"]]" + dat += "Breasts Visibility:[features["breasts_visibility"]]" dat += "Lactates:[features["breasts_producing"] == TRUE ? "Yes" : "No"]" dat += "" dat += "" @@ -902,6 +906,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Fit Viewport: [auto_fit_viewport ? "Auto" : "Manual"]
    " dat += "Sprint Key: [sprint_spacebar ? "Space" : "Shift"]
    " dat += "Toggle Sprint: [sprint_toggle ? "Enabled" : "Disabled"]
    " + dat += "HUD Button Flashes: [hud_toggle_flash ? "Enabled" : "Disabled"]
    " + dat += "HUD Button Flash Color:     Change
    " if (CONFIG_GET(flag/maprotation) && CONFIG_GET(flag/tgstyle_maprotation)) var/p_map = preferred_map @@ -1563,14 +1569,14 @@ GLOBAL_LIST_EMPTY(preferences_datums) pref_species = new newtype() //let's ensure that no weird shit happens on species swapping. custom_species = null - if(!("body_markings" in pref_species.default_features)) + if(!pref_species.mutant_bodyparts["body_markings"]) features["body_markings"] = "None" - if(!("mam_body_markings" in pref_species.default_features)) + if(!pref_species.mutant_bodyparts["mam_body_markings"]) features["mam_body_markings"] = "None" - if("mam_body_markings" in pref_species.default_features) + if(pref_species.mutant_bodyparts["mam_body_markings"]) if(features["mam_body_markings"] == "None") features["mam_body_markings"] = "Plain" - if("tail_lizard" in pref_species.default_features) + if(pref_species.mutant_bodyparts["tail_lizard"]) features["tail_lizard"] = "Smooth" if(pref_species.id == "felinid") features["mam_tail"] = "Cat" @@ -1939,8 +1945,13 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(new_shape) features["cock_shape"] = new_shape + if("cock_visibility") + var/n_vis = input(user, "Penis Visibility", "Character Preference") as null|anything in CONFIG_GET(keyed_list/safe_visibility_toggles) + if(n_vis) + features["cock_visibility"] = n_vis + if("balls_color") - var/new_ballscolor = input(user, "Testicle Color:", "Character Preference") as color|null + var/new_ballscolor = input(user, "Testicles Color:", "Character Preference") as color|null if(new_ballscolor) var/temp_hsv = RGBtoHSV(new_ballscolor) if(new_ballscolor == "#000000") @@ -1950,11 +1961,10 @@ GLOBAL_LIST_EMPTY(preferences_datums) else to_chat(user,"Invalid color. Your color is not bright enough.") - if("balls_shape") - var/new_shape - new_shape = input(user, "Testicle Type:", "Character Preference") as null|anything in GLOB.balls_shapes_list - if(new_shape) - features["balls_shape"] = new_shape + if("balls_visibility") + var/n_vis = input(user, "Testicles Visibility", "Character Preference") as null|anything in CONFIG_GET(keyed_list/safe_visibility_toggles) + if(n_vis) + features["balls_visibility"] = n_vis if("breasts_size") var/new_size = input(user, "Breast Size", "Character Preference") as null|anything in CONFIG_GET(keyed_list/breasts_cups_prefs) @@ -1978,6 +1988,11 @@ GLOBAL_LIST_EMPTY(preferences_datums) else to_chat(user,"Invalid color. Your color is not bright enough.") + if("breasts_visibility") + var/n_vis = input(user, "Breasts Visibility", "Character Preference") as null|anything in CONFIG_GET(keyed_list/safe_visibility_toggles) + if(n_vis) + features["breasts_visibility"] = n_vis + if("vag_shape") var/new_shape new_shape = input(user, "Vagina Type", "Character Preference") as null|anything in GLOB.vagina_shapes_list @@ -1995,6 +2010,11 @@ GLOBAL_LIST_EMPTY(preferences_datums) else to_chat(user,"Invalid color. Your color is not bright enough.") + if("vag_visibility") + var/n_vis = input(user, "Vagina Visibility", "Character Preference") as null|anything in CONFIG_GET(keyed_list/safe_visibility_toggles) + if(n_vis) + features["vag_visibility"] = n_vis + if("ooccolor") var/new_ooccolor = input(user, "Choose your OOC colour:", "Game Preference",ooccolor) as color|null if(new_ooccolor) @@ -2075,6 +2095,11 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(pickedPDASkin) pda_skin = pickedPDASkin + if("hud_toggle_color") + var/new_toggle_color = input(user, "Choose your HUD toggle flash color:", "Game Preference",hud_toggle_color) as color|null + if(new_toggle_color) + hud_toggle_color = new_toggle_color + else switch(href_list["preference"]) //CITADEL PREFERENCES EDIT - I can't figure out how to modularize these, so they have to go here. :c -Pooj @@ -2088,8 +2113,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) features["has_balls"] = FALSE if("has_balls") features["has_balls"] = !features["has_balls"] - if("balls_internal") - features["balls_internal"] = !features["balls_internal"] if("has_breasts") features["has_breasts"] = !features["has_breasts"] if(features["has_breasts"] == FALSE) @@ -2278,6 +2301,10 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("sprint_toggle") sprint_toggle = !sprint_toggle + + if("hud_toggle_flash") + hud_toggle_flash = !hud_toggle_flash + if("save") save_preferences() save_character() @@ -2389,17 +2416,10 @@ GLOBAL_LIST_EMPTY(preferences_datums) character.dna.nameless = character.nameless character.dna.custom_species = character.custom_species - if("tail_lizard" in pref_species.default_features) - character.dna.species.mutant_bodyparts |= "tail_lizard" - if("mam_tail" in pref_species.default_features) - character.dna.species.mutant_bodyparts |= "mam_tail" - if("xenotail" in pref_species.default_features) - character.dna.species.mutant_bodyparts |= "xenotail" - - if("meat_type" in pref_species.default_features) + if(pref_species.mutant_bodyparts["meat_type"]) character.type_of_meat = GLOB.meat_types[features["meat_type"]] - if(("legs" in character.dna.species.mutant_bodyparts) && (character.dna.features["legs"] == "Digitigrade" || character.dna.features["legs"] == "Avian")) + if(character.dna.species.mutant_bodyparts["legs"] && (character.dna.features["legs"] == "Digitigrade" || character.dna.features["legs"] == "Avian")) pref_species.species_traits |= DIGITIGRADE else pref_species.species_traits -= DIGITIGRADE @@ -2409,6 +2429,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) else character.Digitigrade_Leg_Swap(TRUE) + character.give_genitals(TRUE) //character.update_genitals() is already called on genital.update_appearance() + SEND_SIGNAL(character, COMSIG_HUMAN_PREFS_COPIED_TO, src, icon_updates, roundstart_checks) //let's be sure the character updates diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 69b8b5685f..7858bc099b 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -5,7 +5,7 @@ // You do not need to raise this if you are adding new values that have sane defaults. // Only raise this value when changing the meaning/format/name/layout of an existing value // where you would want the updater procs below to run -#define SAVEFILE_VERSION_MAX 26 +#define SAVEFILE_VERSION_MAX 27 /* SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn @@ -145,6 +145,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(features["meat_type"] == "Inesct") features["meat_type"] = "Insect" + if(current_version < 27) + var/tennis + S["feature_balls_shape"] >> tennis + if(tennis == "Hidden") + features["balls_visibility"] = GEN_VISIBLE_NEVER + /datum/preferences/proc/load_path(ckey,filename="preferences.sav") if(!ckey) return @@ -200,6 +206,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["auto_fit_viewport"] >> auto_fit_viewport S["sprint_spacebar"] >> sprint_spacebar S["sprint_toggle"] >> sprint_toggle + S["hud_toggle_flash"] >> hud_toggle_flash + S["hud_toggle_color"] >> hud_toggle_color S["menuoptions"] >> menuoptions S["enable_tips"] >> enable_tips S["tip_delay"] >> tip_delay @@ -239,6 +247,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car auto_fit_viewport = sanitize_integer(auto_fit_viewport, 0, 1, initial(auto_fit_viewport)) sprint_spacebar = sanitize_integer(sprint_spacebar, 0, 1, initial(sprint_spacebar)) sprint_toggle = sanitize_integer(sprint_toggle, 0, 1, initial(sprint_toggle)) + hud_toggle_flash = sanitize_integer(hud_toggle_flash, 0, 1, initial(hud_toggle_flash)) + hud_toggle_color = sanitize_hexcolor(hud_toggle_color, 6, 1, initial(hud_toggle_color)) ghost_form = sanitize_inlist(ghost_form, GLOB.ghost_forms, initial(ghost_form)) ghost_orbit = sanitize_inlist(ghost_orbit, GLOB.ghost_orbits, initial(ghost_orbit)) ghost_accs = sanitize_inlist(ghost_accs, GLOB.ghost_accs_options, GHOST_ACCS_DEFAULT_OPTION) @@ -248,7 +258,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car pda_style = sanitize_inlist(pda_style, GLOB.pda_styles, initial(pda_style)) pda_color = sanitize_hexcolor(pda_color, 6, 1, initial(pda_color)) pda_skin = sanitize_inlist(pda_skin, GLOB.pda_reskins, PDA_SKIN_ALT) - screenshake = sanitize_integer(screenshake, 0, 800, initial(screenshake)) damagescreenshake = sanitize_integer(damagescreenshake, 0, 2, initial(damagescreenshake)) widescreenpref = sanitize_integer(widescreenpref, 0, 1, initial(widescreenpref)) @@ -301,6 +310,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["auto_fit_viewport"], auto_fit_viewport) WRITE_FILE(S["sprint_spacebar"], sprint_spacebar) WRITE_FILE(S["sprint_toggle"], sprint_toggle) + WRITE_FILE(S["hud_toggle_flash"], hud_toggle_flash) + WRITE_FILE(S["hud_toggle_color"], hud_toggle_color) WRITE_FILE(S["menuoptions"], menuoptions) WRITE_FILE(S["enable_tips"], enable_tips) WRITE_FILE(S["tip_delay"], tip_delay) @@ -427,7 +438,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car //Citadel code S["feature_genitals_use_skintone"] >> features["genitals_use_skintone"] - S["feature_exhibitionist"] >> features["exhibitionist"] S["feature_mcolor2"] >> features["mcolor2"] S["feature_mcolor3"] >> features["mcolor3"] S["feature_mam_body_markings"] >> features["mam_body_markings"] @@ -447,22 +457,24 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["feature_cock_color"] >> features["cock_color"] S["feature_cock_length"] >> features["cock_length"] S["feature_cock_diameter"] >> features["cock_diameter"] - S["feature_has_sheath"] >> features["sheath_color"] + S["feature_cock_visibility"] >> features["cock_visibility"] //balls features S["feature_has_balls"] >> features["has_balls"] S["feature_balls_color"] >> features["balls_color"] S["feature_balls_size"] >> features["balls_size"] - S["feature_balls_shape"] >> features["balls_shape"] + S["feature_balls_visibility"] >> features["balls_visibility"] //breasts features S["feature_has_breasts"] >> features["has_breasts"] S["feature_breasts_size"] >> features["breasts_size"] S["feature_breasts_shape"] >> features["breasts_shape"] S["feature_breasts_color"] >> features["breasts_color"] S["feature_breasts_producing"] >> features["breasts_producing"] + S["feature_breasts_visibility"] >> features["breasts_visibility"] //vagina features S["feature_has_vag"] >> features["has_vag"] S["feature_vag_shape"] >> features["vag_shape"] S["feature_vag_color"] >> features["vag_color"] + S["feature_vag_visibility"] >> features["vag_visibility"] //womb features S["feature_has_womb"] >> features["has_womb"] //flavor text @@ -549,14 +561,18 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car var/static/list/B_sizes if(!B_sizes) - B_sizes = CONFIG_GET(keyed_list/breasts_cups_prefs) - B_sizes = B_sizes.Copy() + var/list/L = CONFIG_GET(keyed_list/breasts_cups_prefs) + B_sizes = L.Copy() var/static/min_D if(!min_D) min_D = CONFIG_GET(number/penis_min_inches_prefs) var/static/max_D if(!max_D) max_D = CONFIG_GET(number/penis_max_inches_prefs) + var/static/safe_visibilities + if(!safe_visibilities) + var/list/L = CONFIG_GET(keyed_list/safe_visibility_toggles) + safe_visibilities = L.Copy() features["breasts_size"] = sanitize_inlist(features["breasts_size"], B_sizes, BREASTS_SIZE_DEF) features["cock_length"] = sanitize_integer(features["cock_length"], min_D, max_D, COCK_SIZE_DEF) @@ -568,6 +584,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car features["cock_color"] = sanitize_hexcolor(features["cock_color"], 3, FALSE, "FFF") features["balls_color"] = sanitize_hexcolor(features["balls_color"], 3, FALSE, "FFF") features["vag_color"] = sanitize_hexcolor(features["vag_color"], 3, FALSE, "FFF") + features["breasts_visibility"] = sanitize_inlist(features["breasts_visibility"], safe_visibilities, GEN_VISIBLE_NO_UNDIES) + features["cock_visibility"] = sanitize_inlist(features["cock_visibility"], safe_visibilities, GEN_VISIBLE_NO_UNDIES) + features["balls_visibility"] = sanitize_inlist(features["balls_visibility"], safe_visibilities, GEN_VISIBLE_NO_UNDIES) + features["vag_visibility"] = sanitize_inlist(features["vag_visibility"], safe_visibilities, GEN_VISIBLE_NO_UNDIES) + features["flavor_text"] = copytext(features["flavor_text"], 1, MAX_FLAVOR_LEN) @@ -648,6 +669,30 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["feature_insect_markings"] , features["insect_markings"]) WRITE_FILE(S["feature_meat"] , features["meat_type"]) + WRITE_FILE(S["feature_has_cock"], features["has_cock"]) + WRITE_FILE(S["feature_cock_shape"], features["cock_shape"]) + WRITE_FILE(S["feature_cock_color"], features["cock_color"]) + WRITE_FILE(S["feature_cock_length"], features["cock_length"]) + WRITE_FILE(S["feature_cock_visibility"], features["cock_visibility"]) + + WRITE_FILE(S["feature_has_balls"], features["has_balls"]) + WRITE_FILE(S["feature_balls_color"], features["balls_color"]) + WRITE_FILE(S["feature_balls_size"], features["balls_size"]) + WRITE_FILE(S["feature_balls_visibility"], features["balls_visibility"]) + + WRITE_FILE(S["feature_has_breasts"], features["has_breasts"]) + WRITE_FILE(S["feature_breasts_size"], features["breasts_size"]) + WRITE_FILE(S["feature_breasts_shape"], features["breasts_shape"]) + WRITE_FILE(S["feature_breasts_color"], features["breasts_color"]) + WRITE_FILE(S["feature_breasts_producing"], features["breasts_producing"]) + WRITE_FILE(S["feature_breasts_visibility"], features["breasts_visibility"]) + + WRITE_FILE(S["feature_has_vag"], features["has_vag"]) + WRITE_FILE(S["feature_vag_shape"], features["vag_shape"]) + WRITE_FILE(S["feature_vag_color"], features["vag_color"]) + WRITE_FILE(S["feature_vag_visibility"], features["vag_visibility"]) + + WRITE_FILE(S["feature_has_womb"], features["has_womb"]) //Custom names for(var/custom_name_id in GLOB.preferences_custom_names) diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index bfbd1d519b..f11c89d00c 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -24,6 +24,7 @@ w_class = WEIGHT_CLASS_SMALL armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 30, "acid" = 30) resistance_flags = FIRE_PROOF | ACID_PROOF + mutantrace_variation = STYLE_MUZZLE var/voice_unknown = TRUE ///This makes it so that your name shows up as unknown when wearing the mask. /obj/item/clothing/mask/luchador diff --git a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm deleted file mode 100644 index 89644667d0..0000000000 --- a/code/modules/clothing/spacesuits/flightsuit.dm +++ /dev/null @@ -1,1120 +0,0 @@ - -#define FLIGHTPACK_SPRITE_ON_APPEND "_on" -#define FLIGHTPACK_SPRITE_BOOST_APPEND "_boost" -#define FLIGHTPACK_SPRITE_OFF_APPEND "_off" -#define FLIGHTPACK_SPRITE_BASE "flightpack" - -//So how this is planned to work is it is an item that allows you to fly with some interesting movement mechanics. -//You will still move instantly like usual, but when you move in a direction you gain "momentum" towards that direction -//Momentum will have a maximum value that it will be capped to, and will go down over time -//There is toggleable "stabilizers" that will make momentum go down FAST instead of its normal slow rate -//The suit is heavy and will slow you down on the ground but is a bit faster then usual in air -//The speed at which you drift is determined by your current momentum -//Also, I should probably add in some kind of limiting mechanic but I really don't like having to refill this all the time, expecially as it will be NODROP_1. -//Apparently due to code limitations you have to detect mob movement with.. shoes. -//The object that handles the flying itself - FLIGHT PACK -------------------------------------------------------------------------------------- -/obj/item/flightpack - name = "flight pack" - desc = "An advanced back-worn system that has dual ion engines powerful enough to grant a humanoid flight. Contains an internal self-recharging high-current capacitor for short, powerful boosts." - icon = 'icons/obj/device.dmi' - icon_state = FLIGHTPACK_SPRITE_BASE - item_state = FLIGHTPACK_SPRITE_BASE - actions_types = list(/datum/action/item_action/flightpack/toggle_flight, /datum/action/item_action/flightpack/engage_boosters, /datum/action/item_action/flightpack/toggle_stabilizers, /datum/action/item_action/flightpack/change_power, /datum/action/item_action/flightpack/toggle_airbrake) - armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 10, "bomb" = 30, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75) - w_class = WEIGHT_CLASS_BULKY - slot_flags = ITEM_SLOT_BACK - resistance_flags = FIRE_PROOF - - var/processing_mode = FLIGHTSUIT_PROCESSING_FULL - var/obj/item/clothing/suit/space/hardsuit/flightsuit/suit = null - var/mob/living/carbon/human/wearer = null - var/slowdown_ground = 1 - var/slowdown_air = 0 - var/slowdown_brake = TRUE - var/flight = FALSE - var/flight_passflags = PASSTABLE - var/powersetting = 1 - var/powersetting_high = 3 - var/powersetting_low = 1 - var/override_safe = FALSE - - var/boost = FALSE - var/boost_maxcharge = 30 //Vroom! If you hit someone while boosting they'll likely be knocked flying. Fun. - var/boost_charge = 30 - var/boost_speed = 2 - var/boost_power = 50 - var/boost_chargerate = 0.3 - var/boost_drain = 6 //Keep in mind it charges and drains at the same time, so drain realistically is drain-charge=change - - var/momentum_x = 0 //Realistic physics. No more "Instant stopping while barreling down a hallway at Mach 1". - var/momentum_y = 0 - var/momentum_max = 500 - var/momentum_impact_coeff = 0.5 //At this speed you'll start coliding with people resulting in momentum loss and them being knocked back, but no injuries or knockdowns - var/momentum_impact_loss = 50 - var/momentum_crash_coeff = 0.8 //At this speed if you hit a dense object, you will careen out of control, while that object will be knocked flying. - var/momentum_drift_coeff = 0.04 - var/momentum_speed = 0 //How fast we are drifting around - var/momentum_speed_x = 0 - var/momentum_speed_y = 0 - var/momentum_passive_loss = 4 - var/momentum_gain = 20 - var/drift_tolerance = 2 - - var/stabilizer = TRUE - var/stabilizer_decay_amount = 11 - var/gravity = TRUE - var/gravity_decay_amount = 3 - var/pressure = TRUE - var/pressure_decay_amount = 3 - var/pressure_threshold = 30 - var/brake = FALSE - var/airbrake_decay_amount = 30 - - var/resync = FALSE //Used to resync the flight-suit every 30 seconds or so. - - var/disabled = FALSE //Whether it is disabled from crashes/emps/whatever - var/emp_disable_message = FALSE - - //This is probably too much code just for EMP damage. - var/emp_damage = 0 //One hit should make it hard to control, continuous hits will cripple it and then simply shut it off/make it crash. Direct hits count more. - var/emp_strong_damage = 4 - var/emp_weak_damage = 2.5 - var/emp_heal_amount = 0.06 //How much emp damage to heal per process. - var/emp_disable_threshold = 3 //3 weak ion, 2 strong ion hits. - var/emp_disabled = FALSE - - var/requires_suit = TRUE - - var/datum/effect_system/trail_follow/ion/flight/ion_trail - - var/assembled = FALSE - var/obj/item/stock_parts/manipulator/part_manip = null - var/obj/item/stock_parts/scanning_module/part_scan = null - var/obj/item/stock_parts/capacitor/part_cap = null - var/obj/item/stock_parts/micro_laser/part_laser = null - var/obj/item/stock_parts/matter_bin/part_bin = null - - var/crashing = FALSE //Are we currently getting wrecked? - - var/atom/movable/cached_pull //recipe for disaster again. - var/afterForceMove = FALSE - var/datum/component/mobhook - -/obj/item/flightpack/proc/changeWearer(mob/changeto) - if(wearer) - LAZYREMOVE(wearer.user_movement_hooks, src) - wearer = null - QDEL_NULL(mobhook) - cached_pull = null - if(istype(changeto)) - wearer = changeto - LAZYADD(wearer.user_movement_hooks, src) - cached_pull = changeto.pulling - mobhook = changeto.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED), CALLBACK(src, .proc/on_mob_move, changeto)) - -/obj/item/flightpack/Initialize() - ion_trail = new - ion_trail.set_up(src) - START_PROCESSING(SSflightpacks, src) - update_parts() - sync_processing(SSflightpacks) - update_icon() - ..() - -/obj/item/flightpack/full/Initialize() - part_manip = new /obj/item/stock_parts/manipulator/pico(src) - part_scan = new /obj/item/stock_parts/scanning_module/phasic(src) - part_cap = new /obj/item/stock_parts/capacitor/super(src) - part_laser = new /obj/item/stock_parts/micro_laser/ultra(src) - part_bin = new /obj/item/stock_parts/matter_bin/super(src) - ..() - -/obj/item/flightpack/proc/usermessage(message, span = "boldnotice", mob/mob_override = null) - var/mob/targ = wearer - if(ismob(loc)) - targ = loc - if(istype(mob_override)) - targ = mob_override - if(!istype(targ)) - return - to_chat(targ, "[icon2html(src, targ)]|[message]") - -/obj/item/flightpack/proc/sync_processing(datum/controller/subsystem/processing/flightpacks/FPS) - processing_mode = FPS.flightsuit_processing - if(processing_mode == FLIGHTSUIT_PROCESSING_NONE) - momentum_x = 0 - momentum_y = 0 - momentum_speed_x = 0 - momentum_speed_y = 0 - momentum_speed = 0 - boost_charge = 0 - boost = FALSE - update_slowdown() - -/obj/item/flightpack/proc/update_parts() - boost_chargerate = initial(boost_chargerate) - boost_drain = initial(boost_drain) - powersetting_high = initial(powersetting_high) - emp_disable_threshold = initial(emp_disable_threshold) - stabilizer_decay_amount = initial(stabilizer_decay_amount) - airbrake_decay_amount = initial(airbrake_decay_amount) - assembled = FALSE //Ready? - if(part_manip && part_scan && part_cap && part_laser && part_bin) - var/manip = part_manip.rating - var/scan = part_scan.rating - var/cap = part_cap.rating - var/laser = part_laser.rating - var/bin = part_bin.rating - assembled = TRUE - boost_chargerate *= cap - boost_drain -= manip - powersetting_high = CLAMP(laser, 0, 3) - emp_disable_threshold = bin*1.25 - stabilizer_decay_amount = scan*3.5 - airbrake_decay_amount = manip*8 - -/obj/item/flightpack/Destroy() - if(suit) - delink_suit() - changeWearer() - disable_flight(TRUE) - QDEL_NULL(part_manip) - QDEL_NULL(part_scan) - QDEL_NULL(part_cap) - QDEL_NULL(part_laser) - QDEL_NULL(part_bin) - QDEL_NULL(ion_trail) - QDEL_NULL(mobhook) - STOP_PROCESSING(SSflightpacks, src) - . = ..() - -/obj/item/flightpack/emp_act(severity) - . = ..() - if(. & EMP_PROTECT_SELF) - return - var/damage = severity == 1 ? emp_strong_damage : emp_weak_damage - if(emp_damage <= (emp_disable_threshold * 1.5)) - emp_damage += damage - usermessage("WARNING: Class [severity] EMP detected! Circuit damage at [(emp_damage/emp_disable_threshold)*100]%!", "boldwarning") - -//Proc to change amount of momentum the wearer has, or dampen all momentum by a certain amount. -/obj/item/flightpack/proc/adjust_momentum(amountx, amounty, reduce_amount_total = 0) - if(reduce_amount_total != 0) - if(momentum_x > 0) - momentum_x = CLAMP(momentum_x - reduce_amount_total, 0, momentum_max) - else if(momentum_x < 0) - momentum_x = CLAMP(momentum_x + reduce_amount_total, -momentum_max, 0) - if(momentum_y > 0) - momentum_y = CLAMP(momentum_y - reduce_amount_total, 0, momentum_max) - else if(momentum_y < 0) - momentum_y = CLAMP(momentum_y + reduce_amount_total, -momentum_max, 0) - momentum_x = CLAMP(momentum_x + amountx, -momentum_max, momentum_max) - momentum_y = CLAMP(momentum_y + amounty, -momentum_max, momentum_max) - calculate_momentum_speed() - -//The wearer has momentum left. Move them and take some away, while negating the momentum that moving the wearer would gain. Or force the wearer to lose control if they are incapacitated. -/obj/item/flightpack/proc/momentum_drift() - if(!flight || !wearer || (momentum_speed == 0)) - return FALSE - else if(!wearer.canmove) - losecontrol() - var/drift_dir_x = 0 - var/drift_dir_y = 0 - if(momentum_x > 0) - drift_dir_x = EAST - else if(momentum_x < 0) - drift_dir_x = WEST - if(momentum_y > 0) - drift_dir_y = NORTH - else if(momentum_y < 0) - drift_dir_y = SOUTH - momentum_decay() - for(var/i in 1 to momentum_speed) - if(momentum_speed_x >= i) - step(wearer, drift_dir_x) - if(momentum_speed_y >= i) - step(wearer, drift_dir_y) - sleep(1) - if(prob(emp_damage * 15)) - step(wearer, pick(GLOB.alldirs)) - -/obj/item/flightpack/proc/on_mob_move(mob/mob, turf/oldLoc, dir, forced) - if(forced) - if(cached_pull && istype(oldLoc) && (get_dist(oldLoc, loc) <= 1) && !oldLoc.density) - cached_pull.forceMove(oldLoc) - mob.start_pulling(cached_pull, TRUE) - afterForceMove = TRUE - else - cached_pull = null - else - if(afterForceMove && !oldLoc.density) - cached_pull.forceMove(oldLoc) - wearer.start_pulling(cached_pull, TRUE) - cached_pull = null - else - cached_pull = wearer.pulling - afterForceMove = FALSE - if(flight) - ion_trail.generate_effect() - -/obj/item/flightpack/intercept_user_move(dir, mob, newLoc, oldLoc) - if(!flight) - return - var/momentum_increment = momentum_gain - if(boost) - momentum_increment = boost_power - if(brake) - momentum_increment = 0 - if(!gravity && !pressure) - momentum_increment -= 10 - switch(dir) - if(NORTH) - adjust_momentum(0, momentum_increment) - if(SOUTH) - adjust_momentum(0, -momentum_increment) - if(EAST) - adjust_momentum(momentum_increment, 0) - if(WEST) - adjust_momentum(-momentum_increment, 0) - -//Make the wearer lose some momentum. -/obj/item/flightpack/proc/momentum_decay() - var/amt = momentum_passive_loss - brake? (amt += airbrake_decay_amount) : 0 - gravity? (amt += gravity_decay_amount) : 0 - stabilizer? (amt += stabilizer_decay_amount) : 0 - pressure? (amt += pressure_decay_amount) : 0 - adjust_momentum(0, 0, amt) - -//Check for gravity, air pressure, and whether this is still linked to a suit. Also, resync the flightpack/flight suit every minute. -/obj/item/flightpack/proc/check_conditions() - if(flight && (!assembled || !wearer || (!suit && requires_suit))) - disable_flight(TRUE) - var/turf/T = get_turf(src) - if(T) - gravity = has_gravity() - var/datum/gas_mixture/gas = T.return_air() - var/envpressure = gas.return_pressure() - pressure = envpressure >= pressure_threshold - if(!pressure && brake) - brake = FALSE - usermessage("Airbrakes deactivated due to lack of pressure!", "boldwarning") - if(suit && !suit.deployedshoes && (brake || stabilizer)) - brake = FALSE - stabilizer = FALSE - usermessage("Warning: Sensor data is not being received from flight shoes. Stabilizers and airbrake modules deactivated!", "boldwarning") - - -/obj/item/flightpack/process() - if(processing_mode == FLIGHTSUIT_PROCESSING_NONE) - return FALSE - check_conditions() - calculate_momentum_speed() - momentum_drift() - handle_boost() - handle_damage() - -/obj/item/flightpack/proc/update_slowdown() - flight? (slowdown = slowdown_air) : (slowdown = slowdown_ground) - -/obj/item/flightpack/proc/handle_damage() - if(emp_damage) - emp_damage = CLAMP(emp_damage-emp_heal_amount, 0, emp_disable_threshold * 10) - if(emp_damage >= emp_disable_threshold) - emp_disabled = TRUE - if(emp_disabled && (emp_damage <= 0.5)) - emp_disabled = FALSE - emp_disable_message = FALSE - usermessage("Electromagnetic deflection system re-activated. Flight systems re-enabled.") - disabled = emp_disabled - if(disabled) - if(emp_disabled && (!emp_disable_message)) - usermessage("Electromagnetic deflectors overloaded. Short circuit detected in internal systems!", "boldwarning") - usermessage("Deactivating to prevent fatal power overload!", "boldwarning") - emp_disable_message = TRUE - if(flight) - disable_flight(TRUE) - -/obj/item/flightpack/update_icon() - if(!flight) - icon_state = "[FLIGHTPACK_SPRITE_BASE][FLIGHTPACK_SPRITE_OFF_APPEND]" - item_state = "[FLIGHTPACK_SPRITE_BASE][FLIGHTPACK_SPRITE_OFF_APPEND]" - if(flight) - if(!boost) - icon_state = "[FLIGHTPACK_SPRITE_BASE][FLIGHTPACK_SPRITE_ON_APPEND]" - item_state = "[FLIGHTPACK_SPRITE_BASE][FLIGHTPACK_SPRITE_ON_APPEND]" - else - icon_state = "[FLIGHTPACK_SPRITE_BASE][FLIGHTPACK_SPRITE_BOOST_APPEND]" - item_state = "[FLIGHTPACK_SPRITE_BASE][FLIGHTPACK_SPRITE_BOOST_APPEND]" - if(wearer) - wearer.update_inv_wear_suit() - wearer.update_inv_back() - -/obj/item/flightpack/proc/handle_boost() - if(boost) - boost_charge = CLAMP(boost_charge-boost_drain, 0, boost_maxcharge) - if(boost_charge < 1) - deactivate_booster() - if(boost_charge < boost_maxcharge) - boost_charge = CLAMP(boost_charge+boost_chargerate, 0, boost_maxcharge) - -/obj/item/flightpack/proc/cycle_power() - powersetting < powersetting_high? (powersetting++) : (powersetting = 1) - momentum_gain = powersetting * 10 - usermessage("Engine output set to [momentum_gain].") - momentum_drift_coeff = ((momentum_gain)*(drift_tolerance*1.1))/momentum_max - -/obj/item/flightpack/proc/crash_damage(density, anchored, speed, victim_name) - var/crashmessagesrc = "[wearer] violently crashes into [victim_name], " - var/userdamage = 10 - stabilizer * 3 - part_bin.rating - part_scan.rating * part_manip.rating + anchored * 2 + boost * 2 + speed * 2 - if(userdamage > 0) - crashmessagesrc += "that really must have hurt!" - wearer.adjustBruteLoss(userdamage) - else - crashmessagesrc += "but luckily [wearer]'s impact was absorbed by [wearer.p_their()] suit's stabilizers!" - wearer.visible_message(crashmessagesrc) - -/obj/item/flightpack/proc/userknockback(density, anchored, speed, dir) - dir = turn(dir, 180) - var/turf/target = get_edge_target_turf(get_turf(wearer), dir) - wearer.visible_message("[wearer] is knocked flying by the impact!") - wearer.throw_at(target, speed * 2 + density * 2 + anchored * 2, 2, wearer) - -/obj/item/flightpack/proc/flight_impact(atom/impacted_atom, crashdir) //Yes, victim. - if(!flight || (impacted_atom == wearer) || crashing || (processing_mode == FLIGHTSUIT_PROCESSING_NONE)) - return FALSE - crashing = TRUE - var/crashpower = 0 - if(crashdir == NORTH || crashdir == SOUTH) - crashpower = momentum_speed_y - else if(crashdir == EAST || crashdir == WEST) - crashpower = momentum_speed_x - if(boost) - crashpower = 3 - if(!crashpower) - crashing = FALSE - return FALSE - var/density = FALSE - var/anchored = TRUE //Just in case... - var/damage = FALSE - if(istype(impacted_atom, /obj/structure/grille) && (crashpower > 1)) - crash_grille(impacted_atom) - else if((istype(impacted_atom, /obj/machinery/door)) && (!istype(impacted_atom, /obj/machinery/door/poddoor))) - var/obj/machinery/door/D = impacted_atom - if(!airlock_pass(D) && (momentum_speed >= 3)) - damage = TRUE - anchored = TRUE - density = FALSE - else if(istype(impacted_atom, /obj/structure/mineral_door)) - door_pass(impacted_atom) - else if(isclosedturf(impacted_atom) && (crashpower >= 3)) - damage = TRUE - density = TRUE - anchored = TRUE - else if(ismovableatom(impacted_atom)) - var/atom/movable/impacted_AM = impacted_atom - if(!impacted_AM.throwing && (crashpower >= 3)) - density = impacted_AM.density - anchored = impacted_AM.anchored - damage = anchored - atom_impact(impacted_AM, crashpower, crashdir) - if(damage) - crash_damage(density, anchored, momentum_speed, impacted_atom.name) - userknockback(density, anchored, momentum_speed, crashdir) - losecontrol(knockdown = FALSE, move = FALSE) - crashing = FALSE - -/obj/item/flightpack/proc/door_pass(obj/structure/mineral_door/door) - INVOKE_ASYNC(door, /obj/structure/mineral_door.proc/Open) - var/turf/T = get_turf(door) - wearer.forceMove(T) - wearer.visible_message("[wearer] rolls to [wearer.p_their()] sides and slips past [door]!") - -/obj/item/flightpack/proc/crash_grille(obj/structure/grille/target) - target.hitby(wearer) - target.take_damage(60, BRUTE, "melee", 1) - if(wearer.Move(target.loc)) - wearer.visible_message("[wearer] smashes straight past [target]!") - -/obj/item/flightpack/proc/airlock_pass(obj/machinery/door/A) - var/nopass = FALSE - if(!A.density) - return TRUE - nopass = (A.locked || A.stat || (A.obj_flags & EMAGGED) || A.welded) - if(A.requiresID()) - if((!A.allowed(wearer)) && !A.emergency) - nopass = TRUE - if(!nopass) - INVOKE_ASYNC(A, /obj/machinery/door.proc/open) - wearer.visible_message("[wearer] rolls sideways and slips past [A]") - var/turf/target = get_turf(A) - if(istype(A, /obj/machinery/door/window) && (get_turf(wearer) == get_turf(A))) - target = get_step(A, A.dir) - wearer.forceMove(target) - return !nopass - -/obj/item/flightpack/proc/atom_impact(atom/movable/victim, power, direction) - if(!victim) - return FALSE - if(!victim.anchored) - var/knockback = (power + ((part_manip.rating + part_bin.rating) / 2) - (victim.density * 2)) * 2 - victim.visible_message("[victim.name] is sent flying by the impact!") - var/turf/target = get_turf(victim) - for(var/i in 1 to knockback) - target = get_step(target, direction) - for(var/i in 1 to knockback/3) - target = get_step(target, pick(GLOB.alldirs)) - victim.throw_at(target, knockback, part_manip.rating) - if(isobj(victim)) - var/obj/O = victim - O.take_damage(power * 14) - -/obj/item/flightpack/proc/losecontrol(knockdown = FALSE, move = TRUE) - usermessage("Warning: Control system not responding. Deactivating!", "boldwarning") - if(wearer) - wearer.visible_message("[wearer]'s flight suit abruptly shuts off and [wearer.p_they()] lose[wearer.p_s()] control!") - if(move) - while(momentum_x != 0 || momentum_y != 0) - sleep(2) - step(wearer, pick(GLOB.cardinals)) - momentum_decay() - adjust_momentum(0, 0, 10) - wearer.visible_message("[wearer]'s flight suit crashes into the ground!") - if(knockdown) - wearer.DefaultCombatKnockdown(80) - momentum_x = 0 - momentum_y = 0 - calculate_momentum_speed() - if(flight) - disable_flight(FALSE) - -/obj/item/flightpack/proc/enable_flight(forced = FALSE) - if(!forced) - if(disabled) - usermessage("Internal systems recalibrating. Unable to safely proceed.", "boldwarning") - return FALSE - if(suit) - if(suit.shoes) - suit.shoes.toggle(TRUE) - else if(!requires_suit) - usermessage("Warning: Flightpack not linked to compatible flight-suit mount!", "boldwarning") - return FALSE - wearer.movement_type |= FLYING - wearer.pass_flags |= flight_passflags - usermessage("ENGAGING FLIGHT ENGINES.") - wearer.visible_message("[wearer]'s flight engines activate as [wearer.p_they()] lift[wearer.p_s()] into the air!") - flight = TRUE - update_slowdown() - update_icon() - ion_trail.start() - -/obj/item/flightpack/proc/disable_flight(forced = FALSE) - if(forced) - losecontrol(knockdown = TRUE) - return TRUE - calculate_momentum_speed() - if(momentum_speed == 0) - momentum_x = 0 - momentum_y = 0 - calculate_momentum_speed() - usermessage("DISENGAGING FLIGHT ENGINES.") - wearer.visible_message("[wearer] drops to the ground as [wearer.p_their()] flight engines cut out!") - wearer.movement_type &= ~FLYING - wearer.pass_flags &= ~flight_passflags - flight = FALSE - update_slowdown() - update_icon() - ion_trail.stop() - if(suit && suit.shoes) - suit.shoes.toggle(FALSE) - if(isturf(wearer.loc)) - var/turf/T = wearer.loc - T.Entered(src) - else - if(override_safe) - disable_flight(TRUE) - return TRUE - usermessage("Warning: Velocity too high to safely disengage. Retry to confirm emergency shutoff.", "boldwarning") - override_safe = TRUE - addtimer(CALLBACK(src, .proc/enable_safe), 50) - return FALSE - -/obj/item/flightpack/proc/enable_safe() - if(override_safe) - override_safe = FALSE - -/obj/item/flightpack/dropped(mob/wearer) - changeWearer() - ..() - -/obj/item/flightpack/item_action_slot_check(slot, mob/user, datum/action/A) - if(slot == ITEM_SLOT_BACK) - return TRUE - -/obj/item/flightpack/equipped(mob/user, slot) - changeWearer(user) - ..() - -/obj/item/flightpack/proc/calculate_momentum_speed() - if(abs(momentum_x) >= (momentum_crash_coeff*momentum_max)) //Calculate X - momentum_speed_x = 3 - else if(abs(momentum_x) >= (momentum_impact_coeff*momentum_max)) - momentum_speed_x = 2 - else if(abs(momentum_x) >= (momentum_drift_coeff*momentum_max)) - momentum_speed_x = 1 - else - momentum_speed_x = 0 - if(abs(momentum_y) >= (momentum_crash_coeff*momentum_max)) //Calculate Y - momentum_speed_y = 3 - else if(abs(momentum_y) >= (momentum_impact_coeff*momentum_max)) - momentum_speed_y = 2 - else if(abs(momentum_y) >= (momentum_drift_coeff*momentum_max)) - momentum_speed_y = 1 - else - momentum_speed_y = 0 - momentum_speed = max(momentum_speed_x, momentum_speed_y) - -/obj/item/flightpack/item_action_slot_check(slot, mob/user, datum/action/A) - return slot == SLOT_BACK - -/obj/item/flightpack/proc/enable_stabilizers() - if(requires_suit && suit && !suit.deployedshoes) - usermessage("Stabilizers requires flight shoes to be attached and deployed!", "boldwarning") - return FALSE - usermessage("Activating automatic stabilization controller and enabling maneuvering assistance.") - stabilizer = TRUE - return TRUE - -/obj/item/flightpack/proc/disable_stabilizers() - if(wearer) - if(brake) - disable_airbrake() - usermessage("Deactivating stabilization controllers!", "boldwarning") - stabilizer = FALSE - -/obj/item/flightpack/proc/activate_booster() - if(!flight) - usermessage("Error: Engines offline!", "boldwarning") - return FALSE - if(boost_charge < 5) - usermessage("Insufficient charge in boost capacitors to engage.", "boldwarning") - return FALSE - usermessage("Boosters engaged!") - boost = TRUE - update_slowdown() - update_icon() - -/obj/item/flightpack/proc/deactivate_booster() - usermessage("Boosters disengaged!") - boost = FALSE - update_slowdown() - update_icon() - -/obj/item/flightpack/proc/enable_airbrake() - if(wearer) - if(!stabilizer && !enable_stabilizers()) - usermessage("Airbrake deployment: Stabilizer Errored.", "boldwarning") - return FALSE - usermessage("Airbrakes extended!") - brake = TRUE - update_slowdown() - -/obj/item/flightpack/proc/disable_airbrake() - if(wearer) - usermessage("Airbrakes retracted!", "boldwarning") - brake = FALSE - update_slowdown() - -/obj/item/flightpack/proc/relink_suit(obj/item/clothing/suit/space/hardsuit/flightsuit/F) - if(suit && suit == F) - return FALSE - else - delink_suit() - if(istype(F)) - suit = F - suit.pack = src - else - suit = null - -/obj/item/flightpack/proc/delink_suit() - if(suit) - if(suit.pack && suit.pack == src) - suit.pack = null - suit = null - -/obj/item/flightpack/attackby(obj/item/I, mob/user, params) - var/const/SuccessMessage = " has been successfully installed into systems." - var/changed = FALSE - if(istype(I, /obj/item/stock_parts)) - var/obj/item/stock_parts/S = I - if(istype(S, /obj/item/stock_parts/manipulator)) - usermessage("[I][SuccessMessage]", mob_override = user) - if(user.transferItemToLoc(I, src)) - if(part_manip) - part_manip.forceMove(get_turf(src)) - part_manip = I - changed = TRUE - if(istype(S, /obj/item/stock_parts/scanning_module)) - usermessage("[I][SuccessMessage]", mob_override = user) - if(user.transferItemToLoc(I, src)) - if(part_scan) - part_scan.forceMove(get_turf(src)) - part_scan = I - changed = TRUE - if(istype(S, /obj/item/stock_parts/micro_laser)) - usermessage("[I][SuccessMessage]", mob_override = user) - if(user.transferItemToLoc(I, src)) - if(part_laser) - part_laser.forceMove(get_turf(src)) - part_laser = I - changed = TRUE - if(istype(S, /obj/item/stock_parts/matter_bin)) - usermessage("[I][SuccessMessage]", mob_override = user) - if(user.transferItemToLoc(I, src)) - if(part_bin) - part_bin.forceMove(get_turf(src)) - part_bin = I - changed = TRUE - if(istype(S, /obj/item/stock_parts/capacitor)) - usermessage("[I][SuccessMessage]", mob_override = user) - if(user.transferItemToLoc(I, src)) - if(part_cap) - part_cap.forceMove(get_turf(src)) - part_cap = I - changed = TRUE - if(changed) - update_parts() - ..() - -//MOB MOVEMENT STUFF---------------------------------------------------------------------------------------------------------------------------------------------- - -/mob/proc/get_flightpack() - return - -/mob/living/carbon/get_flightpack() - var/obj/item/flightpack/F = back - if(istype(F)) - return F - else - return FALSE - -/obj/item/flightpack/proc/allow_thrust(amount) - if(flight) - return TRUE - -//FLIGHT SHOES----------------------------------------------------------------------------------------------------------------------------------------------------- - -/obj/item/clothing/shoes/flightshoes - name = "flight shoes" - desc = "A pair of specialized boots that contain stabilizers and sensors necessary for flight gear to work." //Apparently you need these to detect mob movement. - icon_state = "flightshoes" - item_state = "flightshoes_mob" - var/obj/item/clothing/suit/space/hardsuit/flightsuit/suit = null - var/obj/item/flightpack/pack = null - var/mob/living/carbon/human/wearer = null - var/active = FALSE - permeability_coefficient = 0.01 - resistance_flags = FIRE_PROOF | ACID_PROOF - -/obj/item/clothing/shoes/flightshoes/Destroy() - pack = null - wearer = null - suit = null - . = ..() - -/obj/item/clothing/shoes/flightshoes/proc/toggle(toggle) - if(suit) - active = toggle - if(active) - clothing_flags |= NOSLIP - if(!active) - clothing_flags &= ~NOSLIP - -/obj/item/clothing/shoes/flightshoes/item_action_slot_check(slot, mob/user, datum/action/A) - return slot == SLOT_SHOES - -/obj/item/clothing/shoes/flightshoes/proc/delink_suit() - if(suit) - if(suit.shoes && suit.shoes == src) - suit.shoes = null - suit = null - -/obj/item/clothing/shoes/flightshoes/proc/relink_suit(obj/item/clothing/suit/space/hardsuit/flightsuit/F) - if(suit && suit == F) - return FALSE - else - delink_suit() - if(istype(F)) - suit = F - suit.shoes = src - else - suit = null - -//FLIGHT SUIT------------------------------------------------------------------------------------------------------------------------------------------------------ -//Flight pack and flight shoes/helmet are stored in here. This has to be locked to someone to use either. For both balance reasons and practical codewise reasons. - -/obj/item/clothing/suit/space/hardsuit/flightsuit - name = "flight suit" - desc = "An advanced suit that allows the wearer flight via two high powered miniature jet engines on a deployable back-mounted unit." - icon_state = "flightsuit" - item_state = "flightsuit" - strip_delay = 30 - w_class = WEIGHT_CLASS_BULKY - resistance_flags = FIRE_PROOF | ACID_PROOF - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/flightsuit - jetpack = null - actions_types = list(/datum/action/item_action/flightsuit/toggle_helmet, /datum/action/item_action/flightsuit/toggle_boots, /datum/action/item_action/flightsuit/toggle_flightpack, /datum/action/item_action/flightsuit/lock_suit) - armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 10, "bomb" = 30, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 100) - max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT - var/locked_strip_delay = 80 - var/obj/item/flightpack/pack = null - var/obj/item/clothing/shoes/flightshoes/shoes = null - var/mob/living/carbon/human/user = null - var/deployedpack = FALSE - var/deployedshoes = FALSE - var/locked = FALSE - var/flightpack - var/flight = FALSE - var/maint_panel = FALSE - -/obj/item/clothing/suit/space/hardsuit/flightsuit/Initialize() - . = ..() - allowed = GLOB.advanced_hardsuit_allowed - -/obj/item/clothing/suit/space/hardsuit/flightsuit/full/Initialize() - makepack() - makeshoes() - resync() - return ..() - -/obj/item/clothing/suit/space/hardsuit/flightsuit/ui_action_click() - return //Handled in action datums. - -/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/usermessage(message, span = "boldnotice") - var/mob/targ = user - if(ismob(loc)) - targ = loc - if(!istype(targ)) - return - to_chat(targ, "[icon2html(src, targ)]|[message]") - -/obj/item/clothing/suit/space/hardsuit/flightsuit/examine(mob/user) - . = ..() - . += "SUIT: [locked ? "LOCKED" : "UNLOCKED"]" - . += "FLIGHTPACK: [deployedpack ? "ENGAGED" : "DISENGAGED"] FLIGHTSHOES : [deployedshoes ? "ENGAGED" : "DISENGAGED"] HELMET : [suittoggled ? "ENGAGED" : "DISENGAGED"]" - . += "Its maintainence panel is [maint_panel ? "OPEN" : "CLOSED"]" - -/obj/item/clothing/suit/space/hardsuit/flightsuit/Destroy() - if(ismob(loc)) - dropped(loc) - QDEL_NULL(pack) - QDEL_NULL(shoes) - return ..() - -/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/resync() - if(pack) - pack.relink_suit(src) - if(user) - if(pack) - pack.changeWearer(user) - if(shoes) - shoes.wearer = user - else - if(pack) - pack.changeWearer(null) - if(shoes) - shoes.wearer = null - if(shoes) - shoes.relink_suit(src) - -/obj/item/clothing/suit/space/hardsuit/flightsuit/allow_attack_hand_drop(user) - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if(src == H.wear_suit && locked) - usermessage("You can not take a locked hardsuit off! Unlock it first!", "boldwarning") - return FALSE - return ..() - -/obj/item/clothing/suit/space/hardsuit/flightsuit/dropped(mob/the_user) - if(deployedpack) - retract_flightpack(TRUE) - if(deployedshoes) - retract_flightshoes(TRUE) - if(locked) - unlock_suit(null) - if(user) - user = null - ..() - -/obj/item/clothing/suit/space/hardsuit/flightsuit/ToggleHelmet() - if(!suittoggled) - if(!locked) - usermessage("You must lock your suit before engaging the helmet!", "boldwarning") - return FALSE - ..() - -/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/lock_suit(mob/wearer) - user = wearer - user.visible_message("[wearer]'s flight suit locks around [wearer.p_them()], powered buckles and straps automatically adjusting to [wearer.p_their()] body!") - playsound(src.loc, 'sound/items/rped.ogg', 65, 1) - resync() - strip_delay = locked_strip_delay - locked = TRUE - return TRUE - -/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/unlock_suit(mob/wearer) - if(user) - if(suittoggled) - usermessage("You must retract the helmet before unlocking your suit!", "boldwarning") - return FALSE - if(pack && pack.flight) - usermessage("You must shut off the flight-pack before unlocking your suit!", "boldwarning") - return FALSE - if(deployedpack) - usermessage("Your flightpack must be fully retracted first!", "boldwarning") - return FALSE - if(deployedshoes) - usermessage("Your flight shoes must be fully retracted first!", "boldwarning") - return FALSE - if(wearer) - user.visible_message("[wearer]'s flight suit detaches from [wearer.p_their()] body, becoming nothing more then a bulky metal skeleton.") - playsound(src, 'sound/items/rped.ogg', 65, 1) - resync() - strip_delay = initial(strip_delay) - locked = FALSE - return TRUE - -/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/extend_flightpack(forced = FALSE) - if(!pack) - usermessage("There is no attached flightpack!", "boldwarning") - return FALSE - if(deployedpack) - retract_flightpack() - if(!locked) - usermessage("You must lock your flight suit first before deploying anything!", "boldwarning") - return FALSE - if(ishuman(user)) - if(user.back) - usermessage("You're already wearing something on your back!", "boldwarning") - return FALSE - user.equip_to_slot_if_possible(pack,SLOT_BACK,0,0,1) - ADD_TRAIT(pack, TRAIT_NODROP, FLIGHTSUIT_TRAIT) - resync() - user.visible_message("A [pack.name] extends from [user]'s [name] and clamps to [user.p_their()] back!") - user.update_inv_wear_suit() - playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1) - deployedpack = TRUE - -/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/retract_flightpack(forced = FALSE) - if(ishuman(user)) - if(pack.flight && !forced) - usermessage("You must disable the engines before retracting the flightpack!", "boldwarning") - return FALSE - if(pack.flight && forced) - pack.disable_flight(1) - REMOVE_TRAIT_FROM(pack, TRAIT_NODROP, FLIGHTSUIT_TRAIT) - resync() - if(user) - user.transferItemToLoc(pack, src, TRUE) - user.update_inv_wear_suit() - user.visible_message("[user]'s [pack.name] detaches from [user.p_their()] back and retracts into [user.p_their()] [src]!") - pack.forceMove(src) - playsound(src, 'sound/mecha/mechmove03.ogg', 50, 1) - deployedpack = FALSE - -/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/extend_flightshoes(forced = FALSE) - if(!shoes) - usermessage("Flight shoes are not installed", "boldwarning") - return FALSE - if(deployedshoes) - retract_flightshoes() - if(!locked) - usermessage("You must lock your flight suit first before deploying anything!", "boldwarning") - return FALSE - if(ishuman(user)) - if(user.shoes) - usermessage("You're already wearing something on your feet!", "boldwarning") - return FALSE - user.equip_to_slot_if_possible(shoes,SLOT_SHOES,0,0,1) - ADD_TRAIT(shoes, TRAIT_NODROP, FLIGHTSUIT_TRAIT) - user.visible_message("[user]'s [name] extends a pair of [shoes.name] over [user.p_their()] feet!") - user.update_inv_wear_suit() - playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1) - deployedshoes = TRUE - -/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/retract_flightshoes(forced = FALSE) - REMOVE_TRAIT_FROM(shoes, TRAIT_NODROP, FLIGHTSUIT_TRAIT) - playsound(src, 'sound/mecha/mechmove03.ogg', 50, 1) - if(user) - user.transferItemToLoc(shoes, src, TRUE) - user.update_inv_wear_suit() - user.visible_message("[user]'s [shoes.name] retracts back into [user.p_their()] [name]!") - shoes.forceMove(src) - deployedshoes = FALSE - -/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/makepack() - if(!pack) - pack = new /obj/item/flightpack/full(src) - pack.relink_suit(src) - -/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/makeshoes() - if(!shoes) - shoes = new /obj/item/clothing/shoes/flightshoes(src) - shoes.pack = pack - shoes.suit = src - -/obj/item/clothing/suit/space/hardsuit/flightsuit/equipped(mob/M, slot) - if(ishuman(M)) - user = M - if(slot != SLOT_WEAR_SUIT) - if(deployedpack) - retract_flightpack(TRUE) - if(deployedshoes) - retract_flightshoes(TRUE) - if(locked) - unlock_suit(user) - ..() - -/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/detach_pack() - pack.delink_suit() - pack.forceMove(get_turf(src)) - pack = null - usermessage("You detach the flightpack.") - -/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/attach_pack(obj/item/flightpack/F) - F.forceMove(src) - pack = F - pack.relink_suit(src) - usermessage("You attach and fasten the flightpack.") - -/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/detach_shoes() - shoes.delink_suit() - shoes.forceMove(get_turf(src)) - shoes = null - usermessage("You detach the flight shoes.") - -/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/attach_shoes(obj/item/clothing/shoes/flightshoes/S) - S.forceMove(src) - shoes = S - shoes.relink_suit(src) - usermessage("You attach and fasten a pair of flight shoes.") - -/obj/item/clothing/suit/space/hardsuit/flightsuit/attackby(obj/item/I, mob/wearer, params) - user = wearer - if(src == user.get_item_by_slot(SLOT_WEAR_SUIT)) - usermessage("You can not perform any service without taking the suit off!", "boldwarning") - return FALSE - else if(locked) - usermessage("You can not perform any service while the suit is locked!", "boldwarning") - return FALSE - else if(istype(I, /obj/item/screwdriver)) - if(!maint_panel) - maint_panel = TRUE - else - maint_panel = FALSE - usermessage("You [maint_panel? "open" : "close"] the maintenance panel.") - return FALSE - else if(!maint_panel) - usermessage("The maintenance panel is closed!", "boldwarning") - return FALSE - else if(istype(I, /obj/item/crowbar)) - var/list/inputlist = list() - if(pack) - inputlist += "Pack" - if(shoes) - inputlist += "Shoes" - if(!inputlist.len) - usermessage("There is nothing inside the flightsuit to remove!", "boldwarning") - return FALSE - var/input = input(user, "What to remove?", "Removing module") as null|anything in list("Pack", "Shoes") - if(pack && input == "Pack") - if(pack.flight) - usermessage("You can not pry off an active flightpack!", "boldwarning") - return FALSE - if(deployedpack) - usermessage("Disengage the flightpack first!", "boldwarning") - return FALSE - detach_pack() - if(shoes && input == "Shoes") - if(deployedshoes) - usermessage("Disengage the shoes first!", "boldwarning") - return FALSE - detach_shoes() - return TRUE - else if(istype(I, /obj/item/flightpack)) - var/obj/item/flightpack/F = I - if(pack) - usermessage("[src] already has a flightpack installed!", "boldwarning") - return FALSE - if(!F.assembled) - var/addmsg = " It is missing a " - var/list/addmsglist = list() - if(!F.part_manip) - addmsglist += "manipulator" - if(!F.part_cap) - addmsglist += "capacitor" - if(!F.part_scan) - addmsglist += "scanning module" - if(!F.part_laser) - addmsglist += "micro-laser" - if(!F.part_bin) - addmsglist += "matter bin" - addmsg += english_list(addmsglist) - usermessage("The flightpack you are trying to install is not fully assembled and operational![addmsg].", "boldwarning") - return FALSE - if(user.temporarilyRemoveItemFromInventory(F)) - attach_pack(F) - return TRUE - else if(istype(I, /obj/item/clothing/shoes/flightshoes)) - var/obj/item/clothing/shoes/flightshoes/S = I - if(shoes) - usermessage("There are already shoes installed!", "boldwarning") - return FALSE - if(user.temporarilyRemoveItemFromInventory(S)) - attach_shoes(S) - return TRUE - . = ..() - -//FLIGHT HELMET---------------------------------------------------------------------------------------------------------------------------------------------------- -/obj/item/clothing/head/helmet/space/hardsuit/flightsuit - name = "flight helmet" - desc = "A sealed helmet attached to a flight suit for EVA usage scenarios. Its visor contains an information uplink HUD." - icon_state = "flighthelmet" - item_state = "flighthelmet" - item_color = "flight" - resistance_flags = FIRE_PROOF | ACID_PROOF - brightness_on = 7 - light_color = "#30ffff" - armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 10, "bomb" = 30, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 100) - max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT - var/list/datahuds = list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC_BASIC) - var/zoom_range = 12 - var/zoom = FALSE - actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/flightpack/zoom) - -/obj/item/clothing/head/helmet/space/hardsuit/flightsuit/equipped(mob/living/carbon/human/wearer, slot) - ..() - for(var/hudtype in datahuds) - var/datum/atom_hud/H = GLOB.huds[hudtype] - H.add_hud_to(wearer) - -/obj/item/clothing/head/helmet/space/hardsuit/flightsuit/dropped(mob/living/carbon/human/wearer) - ..() - if(wearer) - for(var/hudtype in datahuds) - var/datum/atom_hud/H = GLOB.huds[hudtype] - H.remove_hud_from(wearer) - if(zoom) - toggle_zoom(wearer, TRUE) - -/obj/item/clothing/head/helmet/space/hardsuit/flightsuit/proc/toggle_zoom(mob/living/user, force_off = FALSE) - if(zoom || force_off) - user.client.change_view(CONFIG_GET(string/default_view)) - to_chat(user, "Disabling smart zooming image enhancement...") - zoom = FALSE - return FALSE - else - user.client.change_view(zoom_range) - to_chat(user, "Enabling smart zooming image enhancement!") - zoom = TRUE - return TRUE diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index e2125964e4..a8ab470d5d 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -121,7 +121,8 @@ var/activeFor = 0 //How long the event has existed. You don't need to change this. var/current_players = 0 //Amount of of alive, non-AFK human players on server at the time of event start - var/fakeable = TRUE //Can be faked by fake news event. + var/threat = 0 + var/fakeable = TRUE //Can be faked by fake news event. //Called first before processing. //Allows you to setup your event, such as randomly @@ -161,7 +162,9 @@ /datum/round_event/proc/end() return - +// Returns threat; used for dynamic. Used for custom stuff, just returns the threat var by default. +/datum/round_event/proc/threat() + return threat //Do not override this proc, instead use the appropiate procs. //This proc will handle the calls to the appropiate procs. diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index 75114af902..e61af1368d 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -27,6 +27,7 @@ "How do I vore people?", "ERP?", "Not epic bros...") + threat = 5 /datum/round_event/brand_intelligence/announce(fake) diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index e24ce13034..7763f9950d 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -16,6 +16,7 @@ startWhen = 6 endWhen = 66 announceWhen = 1 + threat = 15 var/list/wave_type var/wave_name = "normal" var/direction @@ -88,8 +89,10 @@ max_occurrences = 3 earliest_start = 35 MINUTES + /datum/round_event/meteor_wave/threatening wave_name = "threatening" + threat = 25 /datum/round_event_control/meteor_wave/catastrophic name = "Meteor Wave: Catastrophic" @@ -101,6 +104,7 @@ /datum/round_event/meteor_wave/catastrophic wave_name = "catastrophic" + threat = 35 #undef SINGULO_BEACON_DISTURBANCE #undef SINGULO_BEACON_MAX_DISTURBANCE diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 47cde0899b..86ff1ed0da 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -15,7 +15,7 @@ /datum/round_event/pirates startWhen = 60 //2 minutes to answer - var/datum/comm_message/threat + var/datum/comm_message/threat_message var/payoff = 0 var/paid_off = FALSE var/ship_name = "Space Privateers Association" @@ -28,16 +28,16 @@ priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", "commandreport") // CITADEL EDIT metabreak if(fake) return - threat = new + threat_message = new payoff = round(SSshuttle.points * 0.80) - threat.title = "Business proposition" - threat.content = "This is [ship_name]. Pay up [payoff] credits or you'll walk the plank." - threat.possible_answers = list("We'll pay.","No way.") - threat.answer_callback = CALLBACK(src,.proc/answered) - SScommunications.send_message(threat,unique = TRUE) + threat_message.title = "Business proposition" + threat_message.content = "This is [ship_name]. Pay up [payoff] credits or you'll walk the plank." + threat_message.possible_answers = list("We'll pay.","No way.") + threat_message.answer_callback = CALLBACK(src,.proc/answered) + SScommunications.send_message(threat_message,unique = TRUE) /datum/round_event/pirates/proc/answered() - if(threat && threat.answered == 1) + if(threat_message && threat_message.answered == 1) if(SSshuttle.points >= payoff) SSshuttle.points -= payoff priority_announce("Thanks for the credits, landlubbers.",sender_override = ship_name) diff --git a/code/modules/events/wizard/magicarp.dm b/code/modules/events/wizard/magicarp.dm index 57e2a2a051..4d2e8e624c 100644 --- a/code/modules/events/wizard/magicarp.dm +++ b/code/modules/events/wizard/magicarp.dm @@ -30,6 +30,7 @@ icon_dead = "magicarp_dead" icon_gib = "magicarp_gib" ranged = 1 + threat = 4 retreat_distance = 2 minimum_distance = 0 //Between shots they can and will close in to nash projectiletype = /obj/item/projectile/magic @@ -51,6 +52,7 @@ color = "#00FFFF" maxHealth = 75 health = 75 + threat = 7 /mob/living/simple_animal/hostile/carp/ranged/chaos/Shoot() projectiletype = pick(allowed_projectile_types) diff --git a/code/modules/events/wizard/race.dm b/code/modules/events/wizard/race.dm index 2aeb200c88..5c3b8432c1 100644 --- a/code/modules/events/wizard/race.dm +++ b/code/modules/events/wizard/race.dm @@ -10,6 +10,7 @@ var/list/stored_name var/list/stored_species var/list/stored_dna + threat = 10 /datum/round_event/wizard/race/setup() stored_name = list() @@ -56,4 +57,4 @@ H.set_species(stored_species[H]) H.real_name = stored_name[H] H.dna.unique_enzymes = stored_dna[H] - to_chat(H, "You feel back to your normal self again.") \ No newline at end of file + to_chat(H, "You feel back to your normal self again.") diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index bab49e9f83..99fd2af9bb 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -201,12 +201,11 @@ GLOBAL_VAR_INIT(frying_hardmode, TRUE) GLOBAL_VAR_INIT(frying_bad_chem_add_volume, TRUE) GLOBAL_LIST_INIT(frying_bad_chems, list( -/datum/reagent/toxin/bad_food = 10, -/datum/reagent/clf3 = 2, +/datum/reagent/toxin/bad_food = 3, /datum/reagent/drug/aranesp = 2, -/datum/reagent/blackpowder = 10, -/datum/reagent/phlogiston = 3, -/datum/reagent/toxin/cyanide = 3, +/datum/reagent/toxin = 2, +/datum/reagent/lithium = 2, +/datum/reagent/mercury = 2, )) /obj/item/reagent_containers/food/snacks/deepfryholder/Initialize(mapload, obj/item/fried) @@ -239,8 +238,10 @@ GLOBAL_LIST_INIT(frying_bad_chems, list( var/bad_chem = GLOB.frying_bad_chems[R] var/bad_chem_amount = GLOB.frying_bad_chems[bad_chem] if(GLOB.frying_bad_chem_add_volume) - reagents.maximum_volume += bad_chem_amount + reagents.maximum_volume += bad_chem_amount + 2 //Added room for condensed cooking oil reagents.add_reagent(bad_chem, bad_chem_amount) + //All fried inedible items also get condensed cooking oil added, which induces minor vomiting and heart damage + reagents.add_reagent(/datum/reagent/toxin/condensed_cooking_oil, 2) /obj/item/reagent_containers/food/snacks/deepfryholder/Destroy() if(trash) diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm index dfb62ef59d..03f4640718 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/snacks_pie.dm @@ -44,7 +44,7 @@ if(ishuman(hit_atom)) var/mob/living/carbon/human/H = hit_atom var/mutable_appearance/creamoverlay = mutable_appearance('icons/effects/creampie.dmi') - if((("mam_snouts" in H.dna.species.default_features) && H.dna.features["mam_snouts"] != "None") || (("snout" in H.dna.species.default_features) && H.dna.features["snout"] != "None")) + if((H.dna.species.mutant_bodyparts["mam_snouts"] && H.dna.features["mam_snouts"] != "None") || (H.dna.species.mutant_bodyparts["snout"] && H.dna.features["snout"] != "None")) creamoverlay.icon_state = "creampie_snout" else creamoverlay.icon_state = "creampie_human" diff --git a/code/modules/holiday/halloween/halloween.dm b/code/modules/holiday/halloween/halloween.dm index d3b9b92b4f..6c9e527f38 100644 --- a/code/modules/holiday/halloween/halloween.dm +++ b/code/modules/holiday/halloween/halloween.dm @@ -190,6 +190,7 @@ icon_dead = "scary_clown" icon_gib = "scary_clown" speak = list("...", ". . .") + threat = 3 maxHealth = 120 health = 120 emote_see = list("silently stares") diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 507c8a5026..ee441c21f7 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -63,6 +63,8 @@ //If a job complies with dresscodes, loadout items will not be equipped instead of the job's outfit, instead placing the items into the player's backpack. var/dresscodecompliant = TRUE + // How much threat this job is worth in dynamic. Is subtracted if the player's not an antag, added if they are. + var/threat = 0 //Only override this proc //H is usually a human unless an /equip override transformed it @@ -88,6 +90,11 @@ if(. == null) return antag_rep +/datum/job/proc/GetThreat() + . = CONFIG_GET(keyed_list/job_threat)[lowertext(title)] + if(. == null) + return threat + //Don't override this unless the job transforms into a non-human (Silicons do this for example) /datum/job/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE, announce = TRUE, latejoin = FALSE, datum/outfit/outfit_override = null, client/preference_source) if(!H) diff --git a/code/modules/jobs/job_types/ai.dm b/code/modules/jobs/job_types/ai.dm index 4bcfab5836..efe574ab66 100644 --- a/code/modules/jobs/job_types/ai.dm +++ b/code/modules/jobs/job_types/ai.dm @@ -15,6 +15,7 @@ exp_type_department = EXP_TYPE_SILICON display_order = JOB_DISPLAY_ORDER_AI var/do_special_check = TRUE + threat = 5 /datum/job/ai/equip(mob/living/carbon/human/H, visualsOnly, announce, latejoin, datum/outfit/outfit_override, client/preference_source = null) if(visualsOnly) diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index eec6e77578..c4fa213b61 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -16,6 +16,7 @@ Assistant antag_rep = 7 display_order = JOB_DISPLAY_ORDER_ASSISTANT dresscodecompliant = FALSE + threat = 0.2 /datum/job/assistant/get_access() if(CONFIG_GET(flag/assistants_have_maint_access) || !CONFIG_GET(flag/jobs_have_minimal_access)) //Config has assistant maint access set diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index 97d73db5ce..019e50799e 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -18,6 +18,7 @@ minimal_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EMERGENCY_STORAGE, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM) display_order = JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN + threat = 0.5 /datum/outfit/job/atmos name = "Atmospheric Technician" diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm index f542e96d50..709c53d51d 100644 --- a/code/modules/jobs/job_types/bartender.dm +++ b/code/modules/jobs/job_types/bartender.dm @@ -15,6 +15,7 @@ access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_BAR, ACCESS_MINERAL_STOREROOM) display_order = JOB_DISPLAY_ORDER_BARTENDER + threat = 0.5 /datum/outfit/job/bartender name = "Bartender" diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm index 916783fe60..4cf106ea99 100644 --- a/code/modules/jobs/job_types/botanist.dm +++ b/code/modules/jobs/job_types/botanist.dm @@ -14,6 +14,7 @@ access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_HYDROPONICS, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM) display_order = JOB_DISPLAY_ORDER_BOTANIST + threat = 1.5 // lol powergame /datum/outfit/job/botanist name = "Botanist" diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 40bfa0bbfa..d38a2a3ddf 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -25,6 +25,7 @@ display_order = JOB_DISPLAY_ORDER_CAPTAIN blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/insanity) + threat = 5 /datum/job/captain/get_access() return get_all_accesses() @@ -62,4 +63,4 @@ mask = /obj/item/clothing/mask/gas/sechailer suit = /obj/item/clothing/suit/space/hardsuit/captain - suit_store = /obj/item/tank/internals/oxygen \ No newline at end of file + suit_store = /obj/item/tank/internals/oxygen diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm index 74b06adff7..d574482444 100644 --- a/code/modules/jobs/job_types/cargo_technician.dm +++ b/code/modules/jobs/job_types/cargo_technician.dm @@ -16,6 +16,7 @@ minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) display_order = JOB_DISPLAY_ORDER_CARGO_TECHNICIAN + threat = 0.2 /datum/outfit/job/cargo_tech name = "Cargo Technician" diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index 70d8af317e..4aed218cf9 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -15,6 +15,7 @@ minimal_access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_THEATRE) display_order = JOB_DISPLAY_ORDER_CHAPLAIN + threat = 0.5 /datum/job/chaplain/after_spawn(mob/living/H, mob/M) diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index 66167a3827..44b0e90ec8 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -17,6 +17,7 @@ minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_MINERAL_STOREROOM) display_order = JOB_DISPLAY_ORDER_CHEMIST + threat = 1.5 /datum/outfit/job/chemist name = "Chemist" diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index d031653a31..c5065cd169 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -29,6 +29,7 @@ display_order = JOB_DISPLAY_ORDER_CHIEF_ENGINEER blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/paraplegic, /datum/quirk/insanity) + threat = 2 /datum/outfit/job/ce name = "Chief Engineer" diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index 4a80975bb9..8dd7fafab3 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -27,6 +27,7 @@ display_order = JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/insanity) + threat = 2 /datum/outfit/job/cmo name = "Chief Medical Officer" diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index a18aee474c..c65c062bce 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -17,6 +17,7 @@ mind_traits = list(TRAIT_CLOWN_MENTALITY) display_order = JOB_DISPLAY_ORDER_CLOWN + threat = 0 // honk /datum/outfit/job/clown name = "Clown" diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm index db76af4d32..20969bf1d9 100644 --- a/code/modules/jobs/job_types/cook.dm +++ b/code/modules/jobs/job_types/cook.dm @@ -16,6 +16,7 @@ minimal_access = list(ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM) display_order = JOB_DISPLAY_ORDER_COOK + threat = 0.2 /datum/outfit/job/cook name = "Cook" @@ -27,7 +28,7 @@ suit = /obj/item/clothing/suit/toggle/chef head = /obj/item/clothing/head/chefhat mask = /obj/item/clothing/mask/fakemoustache/italian - backpack_contents = list(/obj/item/sharpener = 1) + backpack_contents = list(/obj/item/sharpener = 1, /obj/item/choice_beacon/ingredients = 1) /datum/outfit/job/cook/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source) ..() @@ -43,10 +44,6 @@ ..() if(visualsOnly) return - var/list/possible_boxes = subtypesof(/obj/item/storage/box/ingredients) - var/chosen_box = pick(possible_boxes) - var/obj/item/storage/box/I = new chosen_box(src) - H.equip_to_slot_or_del(I,SLOT_IN_BACKPACK) var/datum/martial_art/cqc/under_siege/justacook = new justacook.teach(H) diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index 9e0a91e6aa..d73d909f4f 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -15,6 +15,7 @@ minimal_access = list(ACCESS_LIBRARY, ACCESS_CONSTRUCTION, ACCESS_MINING_STATION) display_order = JOB_DISPLAY_ORDER_CURATOR + threat = 0.3 /datum/outfit/job/curator name = "Curator" diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index 0c586d47a6..55c13df7a2 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -22,6 +22,7 @@ display_order = JOB_DISPLAY_ORDER_DETECTIVE blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/nonviolent, /datum/quirk/paraplegic) + threat = 1 /datum/outfit/job/detective name = "Detective" diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm index 35586c0bc8..2e8b18d772 100644 --- a/code/modules/jobs/job_types/geneticist.dm +++ b/code/modules/jobs/job_types/geneticist.dm @@ -17,6 +17,7 @@ minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM) display_order = JOB_DISPLAY_ORDER_GENETICIST + threat = 1.5 /datum/outfit/job/geneticist name = "Geneticist" diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index cf8310504d..b1fe3471f1 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -34,6 +34,8 @@ display_order = JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/prosopagnosia, /datum/quirk/insanity) + threat = 2 + /datum/outfit/job/hop name = "Head of Personnel" diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index 926eb0b068..811dff87e7 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -30,6 +30,7 @@ display_order = JOB_DISPLAY_ORDER_HEAD_OF_SECURITY blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/nonviolent, /datum/quirk/paraplegic, /datum/quirk/insanity) + threat = 3 /datum/outfit/job/hos name = "Head of Security" diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index bc3d2b8abd..73028255be 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -15,6 +15,7 @@ minimal_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) display_order = JOB_DISPLAY_ORDER_JANITOR + threat = 0.2 /datum/outfit/job/janitor name = "Janitor" diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm index 7bf9c39d45..3f80e44492 100644 --- a/code/modules/jobs/job_types/lawyer.dm +++ b/code/modules/jobs/job_types/lawyer.dm @@ -18,6 +18,7 @@ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) display_order = JOB_DISPLAY_ORDER_LAWYER + threat = 0.3 /datum/outfit/job/lawyer name = "Lawyer" diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 605727cf80..3eaa2ae10a 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -15,6 +15,7 @@ minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM) display_order = JOB_DISPLAY_ORDER_MEDICAL_DOCTOR + threat = 0.5 /datum/outfit/job/doctor name = "Medical Doctor" diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index f38b4edf52..72a6ac8e13 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -16,6 +16,8 @@ display_order = JOB_DISPLAY_ORDER_MIME + threat = 0 + /datum/job/mime/after_spawn(mob/living/carbon/human/H, mob/M) . = ..() H.apply_pref_name("mime", M.client) diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index b74f1a1c18..df6e1431ae 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -17,6 +17,8 @@ display_order = JOB_DISPLAY_ORDER_PARAMEDIC + threat = 0.5 + /datum/outfit/job/paramedic name = "Paramedic" jobtype = /datum/job/paramedic diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index 04460936af..897defb0ea 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -27,6 +27,7 @@ display_order = JOB_DISPLAY_ORDER_QUARTERMASTER blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/insanity) + threat = 0.5 /datum/outfit/job/quartermaster name = "Quartermaster" diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 9cc2f4b8bf..15e5c64654 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -31,6 +31,7 @@ display_order = JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/insanity) + threat = 5 /datum/outfit/job/rd name = "Research Director" diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index 345b1ac3d3..f9f1d20d3b 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -17,6 +17,7 @@ minimal_access = list(ACCESS_ROBOTICS, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM) display_order = JOB_DISPLAY_ORDER_ROBOTICIST + threat = 1 /datum/outfit/job/roboticist name = "Roboticist" diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index ce9a628ae0..9809e7b4dc 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -17,6 +17,7 @@ minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MINERAL_STOREROOM) display_order = JOB_DISPLAY_ORDER_SCIENTIST + threat = 1.2 /datum/outfit/job/scientist name = "Scientist" diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 92cc15673f..decb334423 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -22,6 +22,7 @@ display_order = JOB_DISPLAY_ORDER_SECURITY_OFFICER blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/nonviolent, /datum/quirk/paraplegic) + threat = 2 /datum/job/officer/get_access() var/list/L = list() diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index 4ba1fc9ac1..9eb268895e 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -19,6 +19,8 @@ display_order = JOB_DISPLAY_ORDER_SHAFT_MINER + threat = 1.5 + /datum/outfit/job/miner name = "Shaft Miner (Lavaland)" jobtype = /datum/job/mining diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index 144693aba1..66ddc90e9b 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -20,6 +20,8 @@ display_order = JOB_DISPLAY_ORDER_STATION_ENGINEER + threat = 1 + /datum/outfit/job/engineer name = "Station Engineer" jobtype = /datum/job/engineer diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm index c5a9c9e9fb..4ba65dff59 100644 --- a/code/modules/jobs/job_types/virologist.dm +++ b/code/modules/jobs/job_types/virologist.dm @@ -18,6 +18,8 @@ display_order = JOB_DISPLAY_ORDER_VIROLOGIST + threat = 1.5 + /datum/outfit/job/virologist name = "Virologist" jobtype = /datum/job/virologist diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 8ddcf1ad91..15d839ac48 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -22,6 +22,7 @@ display_order = JOB_DISPLAY_ORDER_WARDEN blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/nonviolent, /datum/quirk/paraplegic) + threat = 2 /datum/job/warden/get_access() var/list/L = list() diff --git a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm index abe51bf486..4365e59a7a 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm @@ -71,11 +71,13 @@ //for snowflake/donor specific sprites var/list/ckeys_allowed - + //For soft-restricting markings to species IDs var/list/recommended_species /datum/sprite_accessory/underwear icon = 'icons/mob/underwear.dmi' var/has_color = FALSE - var/has_digitigrade = FALSE \ No newline at end of file + var/has_digitigrade = FALSE + var/covers_groin = FALSE + var/covers_chest = FALSE \ No newline at end of file diff --git a/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm b/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm index 58c64dc7d0..73233f3e09 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm @@ -2,9 +2,13 @@ // Undershirt Definitions // //////////////////////////// +/datum/sprite_accessory/underwear/top + covers_chest = TRUE + /datum/sprite_accessory/underwear/top/nude name = "Nude" icon_state = null + covers_chest = FALSE // please make sure they're sorted alphabetically and categorized diff --git a/code/modules/mob/dead/new_player/sprite_accessories/underwear.dm b/code/modules/mob/dead/new_player/sprite_accessories/underwear.dm index 9441b5120a..58d5e1ba88 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/underwear.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/underwear.dm @@ -2,9 +2,13 @@ // Underwear Definitions // /////////////////////////// +/datum/sprite_accessory/underwear/bottom + covers_groin = TRUE + /datum/sprite_accessory/underwear/bottom/nude name = "Nude" icon_state = null + covers_groin = FALSE /datum/sprite_accessory/underwear/bottom/mankini name = "Mankini" @@ -155,16 +159,19 @@ name = "Swimsuit, One Piece - Red" icon_state = "swimming_red" gender = FEMALE + covers_chest = TRUE /datum/sprite_accessory/underwear/bottom/swimsuit name = "Swimsuit, One Piece - Black" icon_state = "swimming_black" gender = FEMALE + covers_chest = TRUE /datum/sprite_accessory/underwear/bottom/swimsuit_blue name = "Swimsuit, One Piece - Striped Blue" icon_state = "swimming_blue" gender = FEMALE + covers_chest = TRUE /datum/sprite_accessory/underwear/bottom/thong name = "Thong" diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index fb06ec8186..ef5a29c1c3 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -580,7 +580,7 @@ /mob/living/carbon/update_stamina() var/stam = getStaminaLoss() if(stam > DAMAGE_PRECISION) - var/total_health = (health - stam) + var/total_health = (maxHealth - stam) if(total_health <= crit_threshold && !stat) if(CHECK_MOBILITY(src, MOBILITY_STAND)) to_chat(src, "You're too exhausted to keep going...") diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 32d8d7e605..836560ca99 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -97,6 +97,7 @@ affecting = bodyparts[1] SEND_SIGNAL(I, COMSIG_ITEM_ATTACK_ZONE, src, user, affecting) send_item_attack_message(I, user, affecting.name) + I.do_stagger_action(src, user) if(I.force) apply_damage(totitemdamage, I.damtype, affecting) //CIT CHANGE - replaces I.force with totitemdamage if(I.damtype == BRUTE && affecting.status == BODYPART_ORGANIC) @@ -299,30 +300,12 @@ "You give [src] a pat on the head to make [p_them()] feel better!") SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "headpat", /datum/mood_event/headpat) friendly_check = TRUE - if(S?.can_wag_tail(src)) - if("tail_human" in S.default_features) - if(dna.features["tail_human"] == "None") - return - else - if(!dna.species.is_wagging_tail()) - emote("wag") - - if("tail_lizard" in S.default_features) - if(dna.features["tail_lizard"] == "None") - return - else - if(!dna.species.is_wagging_tail()) - emote("wag") - - if("mam_tail" in S.default_features) - if(dna.features["mam_tail"] == "None") - return - else - if(!dna.species.is_wagging_tail()) - emote("wag") - - else - return + if(S?.can_wag_tail(src) && !dna.species.is_wagging_tail()) + var/static/list/many_tails = list("tail_human", "tail_lizard", "mam_tail") + for(var/T in many_tails) + if(S.mutant_bodyparts[T] && dna.features[T] != "None") + emote("wag") + break else if(check_zone(M.zone_selected) == BODY_ZONE_R_ARM || check_zone(M.zone_selected) == BODY_ZONE_L_ARM) M.visible_message( \ diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index acaf713e28..cb0dbef332 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -128,7 +128,7 @@ /datum/emote/living/carbon/human/wing/select_message_type(mob/user) . = ..() var/mob/living/carbon/human/H = user - if("wings" in H.dna.species.mutant_bodyparts) + if(H.dna.species.mutant_bodyparts["wings"]) . = "opens " + message else . = "closes " + message @@ -143,17 +143,17 @@ /mob/living/carbon/human/proc/OpenWings() if(!dna || !dna.species) return - if("wings" in dna.species.mutant_bodyparts) + if(dna.species.mutant_bodyparts["wings"]) + dna.species.mutant_bodyparts["wingsopen"] = dna.species.mutant_bodyparts["wings"] dna.species.mutant_bodyparts -= "wings" - dna.species.mutant_bodyparts |= "wingsopen" update_body() /mob/living/carbon/human/proc/CloseWings() if(!dna || !dna.species) return - if("wingsopen" in dna.species.mutant_bodyparts) + if(dna.species.mutant_bodyparts["wingsopen"]) + dna.species.mutant_bodyparts["wings"] = dna.species.mutant_bodyparts["wingsopen"] dna.species.mutant_bodyparts -= "wingsopen" - dna.species.mutant_bodyparts |= "wings" update_body() if(isturf(loc)) var/turf/T = loc diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 57667293e7..a515693047 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -629,9 +629,8 @@ underwear = "Nude" undershirt = "Nude" socks = "Nude" - update_body() + update_body(TRUE) update_hair() - update_genitals() /mob/living/carbon/human/singularity_pull(S, current_size) ..() @@ -708,7 +707,7 @@ /mob/living/carbon/human/wash_cream() if(creamed) //clean both to prevent a rare bug - cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_lizard")) + cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_snout")) cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_human")) creamed = FALSE @@ -769,7 +768,7 @@ return else if(hud_used.healths) - var/health_amount = health - CLAMP(getStaminaLoss()-50, 0, 80)//CIT CHANGE - makes staminaloss have less of an impact on the health hud + var/health_amount = min(health, maxHealth - CLAMP(getStaminaLoss()-50, 0, 80))//CIT CHANGE - makes staminaloss have less of an impact on the health hud if(..(health_amount)) //not dead switch(hal_screwyhud) if(SCREWYHUD_CRIT) @@ -898,7 +897,7 @@ //Second check to make sure they're still valid to be carried if(can_be_firemanned(target) && !incapacitated(FALSE, TRUE)) target.set_resting(FALSE, TRUE) - buckle_mob(target, TRUE, TRUE, 90, 1, 0) + buckle_mob(target, TRUE, TRUE, 90, 1, 0, TRUE) return visible_message("[src] fails to fireman carry [target]!") else @@ -915,13 +914,13 @@ if(target.incapacitated(FALSE, TRUE) || incapacitated(FALSE, TRUE)) target.visible_message("[target] can't hang onto [src]!") return - buckle_mob(target, TRUE, TRUE, FALSE, 0, 2) + buckle_mob(target, TRUE, TRUE, FALSE, 0, 2, FALSE) else visible_message("[target] fails to climb onto [src]!") else to_chat(target, "You can't piggyback ride [src] right now!") -/mob/living/carbon/human/buckle_mob(mob/living/target, force = FALSE, check_loc = TRUE, lying_buckle = FALSE, hands_needed = 0, target_hands_needed = 0) +/mob/living/carbon/human/buckle_mob(mob/living/target, force = FALSE, check_loc = TRUE, lying_buckle = FALSE, hands_needed = 0, target_hands_needed = 0, fireman = FALSE) if(!force)//humans are only meant to be ridden through piggybacking and special cases return if(!is_type_in_typecache(target, can_ride_typecache)) @@ -952,6 +951,7 @@ stop_pulling() riding_datum.handle_vehicle_layer() + riding_datum.fireman_carrying = fireman . = ..(target, force, check_loc) /mob/living/carbon/human/proc/is_shove_knockdown_blocked() //If you want to add more things that block shove knockdown, extend this diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 1fc43f0d41..f4227e390e 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -121,7 +121,6 @@ // the attacked_by code varies among species return dna.species.spec_attacked_by(I, user, affecting, a_intent, src) - /mob/living/carbon/human/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE) if(user.a_intent == INTENT_HARM) . = ..(user, TRUE) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 2e5efa3105..d20c556c6c 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -8,6 +8,7 @@ mob_biotypes = MOB_ORGANIC|MOB_HUMANOID /// Enable stamina combat combat_flags = COMBAT_FLAGS_DEFAULT + status_flags = CANSTUN|CANKNOCKDOWN|CANUNCONSCIOUS|CANPUSH|CANSTAGGER //Hair colour and style var/hair_color = "000" diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index d464419b73..f0bf2fc23e 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -53,8 +53,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/blacklisted = 0 //Flag to exclude from green slime core species. var/dangerous_existence //A flag for transformation spells that tells them "hey if you turn a person into one of these without preperation, they'll probably die!" var/say_mod = "says" // affects the speech message - var/list/default_features = list() // Default mutant bodyparts for this species. Don't forget to set one for every mutant bodypart you allow this species to have. - var/list/mutant_bodyparts = list() // Visible CURRENT bodyparts that are unique to a species. DO NOT USE THIS AS A LIST OF ALL POSSIBLE BODYPARTS AS IT WILL FUCK SHIT UP! Changes to this list for non-species specific bodyparts (ie cat ears and tails) should be assigned at organ level if possible. Layer hiding is handled by handle_mutant_bodyparts() below. + var/list/mutant_bodyparts = list() // Visible CURRENT bodyparts that are unique to a species. Changes to this list for non-species specific bodyparts (ie cat ears and tails) should be assigned at organ level if possible. Layer hiding is handled by handle_mutant_bodyparts() below. var/list/mutant_organs = list() //Internal organs that are unique to this race. var/speedmod = 0 // this affects the race's speed. positive numbers make it move slower, negative numbers make it move faster var/armor = 0 // overall defense for the race... or less defense, if it's negative. @@ -63,9 +62,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/coldmod = 1 // multiplier for cold damage var/heatmod = 1 // multiplier for heat damage var/stunmod = 1 // multiplier for stun duration - var/punchdamagelow = 0 //lowest possible punch damage - var/punchdamagehigh = 9 //highest possible punch damage - var/punchstunthreshold = 9//damage at which punches from this race will stun //yes it should be to the attacked race but it's not useful that way even if it's logical + var/punchdamagelow = 1 //lowest possible punch damage. if this is set to 0, punches will always miss + var/punchdamagehigh = 10 //highest possible punch damage + var/punchstunthreshold = 10//damage at which punches from this race will stun //yes it should be to the attacked race but it's not useful that way even if it's logical var/siemens_coeff = 1 //base electrocution coefficient var/damage_overlay_type = "human" //what kind of damage overlays (if any) appear on our species when wounded? var/fixed_mut_color = "" //to use MUTCOLOR with a fixed color that's independent of dna.feature["mcolor"] @@ -291,7 +290,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) C.hud_used.update_locked_slots() // this needs to be FIRST because qdel calls update_body which checks if we have DIGITIGRADE legs or not and if not then removes DIGITIGRADE from species_traits - if(("legs" in C.dna.species.mutant_bodyparts) && (C.dna.features["legs"] == "Digitigrade" || C.dna.features["legs"] == "Avian")) + if(C.dna.species.mutant_bodyparts["legs"] && (C.dna.features["legs"] == "Digitigrade" || C.dna.features["legs"] == "Avian")) species_traits |= DIGITIGRADE if(DIGITIGRADE in species_traits) C.Digitigrade_Leg_Swap(FALSE) @@ -329,7 +328,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/mob/living/carbon/human/H = C if(NOGENITALS in H.dna.species.species_traits) H.give_genitals(TRUE) //call the clean up proc to delete anything on the mob then return. - if("meat_type" in default_features) //I can't believe it's come to the meat + if(mutant_bodyparts["meat_type"]) //I can't believe it's come to the meat H.type_of_meat = GLOB.meat_types[H.dna.features["meat_type"]] C.add_movespeed_modifier(MOVESPEED_ID_SPECIES, TRUE, 100, override=TRUE, multiplicative_slowdown=speedmod, movetypes=(~FLYING)) @@ -352,7 +351,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) C.remove_movespeed_modifier(MOVESPEED_ID_SPECIES) - if("meat_type" in default_features) + if(mutant_bodyparts["meat_type"]) C.type_of_meat = GLOB.meat_types[C.dna.features["meat_type"]] else C.type_of_meat = initial(meat) @@ -550,48 +549,45 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) //Underwear, Undershirts & Socks if(!(NO_UNDERWEAR in species_traits)) - if(H.socks && H.get_num_legs(FALSE) >= 2) - if(H.hidden_socks) - H.socks = "Nude" - else + if(H.socks && !H.hidden_socks && H.get_num_legs(FALSE) >= 2) + if(H.saved_socks) H.socks = H.saved_socks - var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[H.socks] - if(S) - var/digilegs = ((DIGITIGRADE in species_traits) && S.has_digitigrade) ? "_d" : "" - var/mutable_appearance/MA = mutable_appearance(S.icon, "[S.icon_state][digilegs]", -BODY_LAYER) - if(S.has_color) - MA.color = "#[H.socks_color]" - standing += MA + H.saved_socks = "" + var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[H.socks] + if(S) + var/digilegs = ((DIGITIGRADE in species_traits) && S.has_digitigrade) ? "_d" : "" + var/mutable_appearance/MA = mutable_appearance(S.icon, "[S.icon_state][digilegs]", -BODY_LAYER) + if(S.has_color) + MA.color = "#[H.socks_color]" + standing += MA - if(H.underwear) - if(H.hidden_underwear) - H.underwear = "Nude" - else + if(H.underwear && !H.hidden_underwear) + if(H.saved_underwear) H.underwear = H.saved_underwear - var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[H.underwear] - if(B) - var/digilegs = ((DIGITIGRADE in species_traits) && B.has_digitigrade) ? "_d" : "" - var/mutable_appearance/MA = mutable_appearance(B.icon, "[B.icon_state][digilegs]", -BODY_LAYER) - if(B.has_color) - MA.color = "#[H.undie_color]" - standing += MA + H.saved_underwear = "" + var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[H.underwear] + if(B) + var/digilegs = ((DIGITIGRADE in species_traits) && B.has_digitigrade) ? "_d" : "" + var/mutable_appearance/MA = mutable_appearance(B.icon, "[B.icon_state][digilegs]", -BODY_LAYER) + if(B.has_color) + MA.color = "#[H.undie_color]" + standing += MA - if(H.undershirt) - if(H.hidden_undershirt) - H.undershirt = "Nude" - else + if(H.undershirt && !H.hidden_undershirt) + if(H.saved_undershirt) H.undershirt = H.saved_undershirt - var/datum/sprite_accessory/underwear/top/T = GLOB.undershirt_list[H.undershirt] - if(T) - var/state = "[T.icon_state][((DIGITIGRADE in species_traits) && T.has_digitigrade) ? "_d" : ""]" - var/mutable_appearance/MA - if(H.dna.species.sexes && H.dna.features["body_model"] == FEMALE) - MA = wear_female_version(state, T.icon, BODY_LAYER) - else - MA = mutable_appearance(T.icon, state, -BODY_LAYER) - if(T.has_color) - MA.color = "#[H.shirt_color]" - standing += MA + H.saved_undershirt = "" + var/datum/sprite_accessory/underwear/top/T = GLOB.undershirt_list[H.undershirt] + if(T) + var/state = "[T.icon_state][((DIGITIGRADE in species_traits) && T.has_digitigrade) ? "_d" : ""]" + var/mutable_appearance/MA + if(H.dna.species.sexes && H.dna.features["body_model"] == FEMALE) + MA = wear_female_version(state, T.icon, BODY_LAYER) + else + MA = mutable_appearance(T.icon, state, -BODY_LAYER) + if(T.has_color) + MA.color = "#[H.shirt_color]" + standing += MA if(standing.len) H.overlays_standing[BODY_LAYER] = standing @@ -617,99 +613,99 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD) var/tauric = H.dna.features["taur"] && H.dna.features["taur"] != "None" - if("tail_lizard" in mutant_bodyparts) + if(mutant_bodyparts["tail_lizard"]) if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric) bodyparts_to_add -= "tail_lizard" - if("waggingtail_lizard" in mutant_bodyparts) + if(mutant_bodyparts["waggingtail_lizard"]) if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric) bodyparts_to_add -= "waggingtail_lizard" - else if ("tail_lizard" in mutant_bodyparts) + else if (mutant_bodyparts["tail_lizard"]) bodyparts_to_add -= "waggingtail_lizard" - if("tail_human" in mutant_bodyparts) + if(mutant_bodyparts["tail_human"]) if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric) bodyparts_to_add -= "tail_human" - if("waggingtail_human" in mutant_bodyparts) + if(mutant_bodyparts["waggingtail_human"]) if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric) bodyparts_to_add -= "waggingtail_human" - else if ("tail_human" in mutant_bodyparts) + else if (mutant_bodyparts["tail_human"]) bodyparts_to_add -= "waggingtail_human" - if("spines" in mutant_bodyparts) + if(mutant_bodyparts["spines"]) if(!H.dna.features["spines"] || H.dna.features["spines"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) bodyparts_to_add -= "spines" - if("waggingspines" in mutant_bodyparts) + if(mutant_bodyparts["waggingspines"]) if(!H.dna.features["spines"] || H.dna.features["spines"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) bodyparts_to_add -= "waggingspines" - else if ("tail" in mutant_bodyparts) + else if (mutant_bodyparts["tail"]) bodyparts_to_add -= "waggingspines" - if("snout" in mutant_bodyparts) //Take a closer look at that snout! + if(mutant_bodyparts["snout"]) //Take a closer look at that snout! if((H.wear_mask && (H.wear_mask.flags_inv & HIDESNOUT)) || (H.head && (H.head.flags_inv & HIDESNOUT)) || !HD || HD.status == BODYPART_ROBOTIC) bodyparts_to_add -= "snout" - if("frills" in mutant_bodyparts) + if(mutant_bodyparts["frills"]) if(!H.dna.features["frills"] || H.dna.features["frills"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || !HD || HD.status == BODYPART_ROBOTIC) bodyparts_to_add -= "frills" - if("horns" in mutant_bodyparts) + if(mutant_bodyparts["horns"]) if(!H.dna.features["horns"] || H.dna.features["horns"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD || HD.status == BODYPART_ROBOTIC) bodyparts_to_add -= "horns" - if("ears" in mutant_bodyparts) + if(mutant_bodyparts["ears"]) if(!H.dna.features["ears"] || H.dna.features["ears"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEEARS)) || !HD || HD.status == BODYPART_ROBOTIC) bodyparts_to_add -= "ears" - if("wings" in mutant_bodyparts) + if(mutant_bodyparts["wings"]) if(!H.dna.features["wings"] || H.dna.features["wings"] == "None" || (H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT) && (!H.wear_suit.species_exception || !is_type_in_list(src, H.wear_suit.species_exception)))) bodyparts_to_add -= "wings" - if("wings_open" in mutant_bodyparts) + if(mutant_bodyparts["wings_open"]) if(H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT) && (!H.wear_suit.species_exception || !is_type_in_list(src, H.wear_suit.species_exception))) bodyparts_to_add -= "wings_open" - else if ("wings" in mutant_bodyparts) + else if (mutant_bodyparts["wings"]) bodyparts_to_add -= "wings_open" - if("insect_fluff" in mutant_bodyparts) + if(mutant_bodyparts["insect_fluff"]) if(!H.dna.features["insect_fluff"] || H.dna.features["insect_fluff"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT)) bodyparts_to_add -= "insect_fluff" //CITADEL EDIT //Race specific bodyparts: //Xenos - if("xenodorsal" in mutant_bodyparts) + if(mutant_bodyparts["xenodorsal"]) if(!H.dna.features["xenodorsal"] || H.dna.features["xenodorsal"] == "None" || (H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))) bodyparts_to_add -= "xenodorsal" - if("xenohead" in mutant_bodyparts)//This is an overlay for different castes using different head crests + if(mutant_bodyparts["xenohead"])//This is an overlay for different castes using different head crests if(!H.dna.features["xenohead"] || H.dna.features["xenohead"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD || HD.status == BODYPART_ROBOTIC) bodyparts_to_add -= "xenohead" - if("xenotail" in mutant_bodyparts) + if(mutant_bodyparts["xenotail"]) if(!H.dna.features["xenotail"] || H.dna.features["xenotail"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT)) bodyparts_to_add -= "xenotail" //Other Races - if("mam_tail" in mutant_bodyparts) + if(mutant_bodyparts["mam_tail"]) if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric) bodyparts_to_add -= "mam_tail" - if("mam_waggingtail" in mutant_bodyparts) + if(mutant_bodyparts["mam_waggingtail"]) if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric) bodyparts_to_add -= "mam_waggingtail" - else if ("mam_tail" in mutant_bodyparts) + else if (mutant_bodyparts["mam_tail"]) bodyparts_to_add -= "mam_waggingtail" - if("mam_ears" in mutant_bodyparts) + if(mutant_bodyparts["mam_ears"]) if(!H.dna.features["mam_ears"] || H.dna.features["mam_ears"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEEARS)) || !HD || HD.status == BODYPART_ROBOTIC) bodyparts_to_add -= "mam_ears" - if("mam_snouts" in mutant_bodyparts) //Take a closer look at that snout! + if(mutant_bodyparts["mam_snouts"]) //Take a closer look at that snout! if((H.wear_mask && (H.wear_mask.flags_inv & HIDESNOUT)) || (H.head && (H.head.flags_inv & HIDESNOUT)) || !HD || HD.status == BODYPART_ROBOTIC) bodyparts_to_add -= "mam_snouts" - if("taur" in mutant_bodyparts) + if(mutant_bodyparts["taur"]) if(!tauric || (H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR))) bodyparts_to_add -= "taur" @@ -1465,15 +1461,15 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) else var/atk_verb = user.dna.species.attack_verb - if(target.lying) - atk_verb = "kick" + if(!(target.mobility_flags & MOBILITY_STAND)) + atk_verb = ATTACK_EFFECT_KICK switch(atk_verb) - if("kick") + if(ATTACK_EFFECT_KICK) user.do_attack_animation(target, ATTACK_EFFECT_KICK) - if("slash") + if(ATTACK_EFFECT_CLAW) user.do_attack_animation(target, ATTACK_EFFECT_CLAW) - if("smash") + if(ATTACK_EFFECT_SMASH) user.do_attack_animation(target, ATTACK_EFFECT_SMASH) else user.do_attack_animation(target, ATTACK_EFFECT_PUNCH) @@ -1493,10 +1489,19 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/obj/item/bodypart/affecting = target.get_bodypart(ran_zone(user.zone_selected)) - if(!damage || !affecting) - playsound(target.loc, user.dna.species.miss_sound, 25, 1, -1) - target.visible_message("[user] has attempted to [atk_verb] [target]!",\ - "[user] has attempted to [atk_verb] [target]!", null, COMBAT_MESSAGE_RANGE) + var/miss_chance = 100//calculate the odds that a punch misses entirely. considers stamina and brute damage of the puncher. punches miss by default to prevent weird cases + if(user.dna.species.punchdamagelow) + if(atk_verb == ATTACK_EFFECT_KICK) //kicks never miss (provided your species deals more than 0 damage) + miss_chance = 0 + else + miss_chance = min((user.dna.species.punchdamagehigh/user.dna.species.punchdamagelow) + user.getStaminaLoss() + (user.getBruteLoss()*0.5), 100) //old base chance for a miss + various damage. capped at 100 to prevent weirdness in prob() + + if(!damage || !affecting || prob(miss_chance))//future-proofing for species that have 0 damage/weird cases where no zone is targeted + playsound(target.loc, user.dna.species.miss_sound, 25, TRUE, -1) + target.visible_message("[user]'s [atk_verb] misses [target]!", \ + "You avoid [user]'s [atk_verb]!", "You hear a swoosh!", COMBAT_MESSAGE_RANGE, user) + to_chat(user, "Your [atk_verb] misses [target]!") + log_combat(user, target, "attempted to punch") return FALSE @@ -1513,14 +1518,25 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if(user.limb_destroyer) target.dismembering_strike(user, affecting.body_zone) - target.apply_damage(damage, BRUTE, affecting, armor_block) - log_combat(user, target, "punched") + + if(atk_verb == ATTACK_EFFECT_KICK)//kicks deal 1.5x raw damage + 0.5x stamina damage + target.apply_damage(damage*1.5, BRUTE, affecting, armor_block) + target.apply_damage(damage*0.5, STAMINA, affecting, armor_block) + log_combat(user, target, "kicked") + else//other attacks deal full raw damage + 2x in stamina damage + target.apply_damage(damage, BRUTE, affecting, armor_block) + target.apply_damage(damage*2, STAMINA, affecting, armor_block) + log_combat(user, target, "punched") + if((target.stat != DEAD) && damage >= user.dna.species.punchstunthreshold) - target.visible_message("[user] has knocked [target] down!", \ - "[user] has knocked [target] down!", null, COMBAT_MESSAGE_RANGE) - target.apply_effect(80, EFFECT_KNOCKDOWN, armor_block) + target.visible_message("[user] knocks [target] down!", \ + "You're knocked down by [user]!", "You hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, user) + to_chat(user, "You knock [target] down!") + var/knockdown_duration = 40 + (target.getStaminaLoss() + (target.getBruteLoss()*0.5))*0.8 - armor_block + target.DefaultCombatKnockdown(knockdown_duration) target.forcesay(GLOB.hit_appends) - else if(target.lying) + log_combat(user, target, "got a stun punch with their previous punch") + else if(!(target.mobility_flags & MOBILITY_STAND)) target.forcesay(GLOB.hit_appends) /datum/species/proc/spec_unarmedattacked(mob/living/carbon/human/user, mob/living/carbon/human/target) @@ -1556,7 +1572,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if (!HAS_TRAIT(target, TRAIT_PERMABONER)) stop_wagging_tail(target) return FALSE - else if(!(user.client?.prefs.cit_toggles & NO_ASS_SLAP) && aim_for_groin && (target == user || target.lying || same_dir) && (target_on_help || target_restrained || target_aiming_for_groin)) + else if(aim_for_groin && (target == user || target.lying || same_dir) && (target_on_help || target_restrained || target_aiming_for_groin)) if(target.client?.prefs.cit_toggles & NO_ASS_SLAP) to_chat(user,"A force stays your hand, preventing you from slapping \the [target]'s ass!") return FALSE @@ -1695,6 +1711,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) H.send_item_attack_message(I, user, hit_area) + I.do_stagger_action(H, user) + if(!I.force) return 0 //item force is zero @@ -2050,7 +2068,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "hot") SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "cold", /datum/mood_event/cold) //Sorry for the nasty oneline but I don't want to assign a variable on something run pretty frequently - H.add_movespeed_modifier(MOVESPEED_ID_COLD, override = TRUE, multiplicative_slowdown = ((BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR)) + H.add_movespeed_modifier(MOVESPEED_ID_COLD, override = TRUE, multiplicative_slowdown = ((BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR), blacklisted_movetypes = FLOATING) switch(H.bodytemperature) if(200 to BODYTEMP_COLD_DAMAGE_LIMIT) H.apply_damage(COLD_DAMAGE_LEVEL_1*coldmod*H.physiology.cold_mod, BURN) diff --git a/code/modules/mob/living/carbon/human/species_types/angel.dm b/code/modules/mob/living/carbon/human/species_types/angel.dm index 924f5f9c6a..5474adcf88 100644 --- a/code/modules/mob/living/carbon/human/species_types/angel.dm +++ b/code/modules/mob/living/carbon/human/species_types/angel.dm @@ -3,8 +3,7 @@ id = "angel" default_color = "FFFFFF" species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS) - mutant_bodyparts = list("wings") - default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "wings" = "Angel") + mutant_bodyparts = list("tail_human" = "None", "ears" = "None", "wings" = "Angel") use_skintones = 1 no_equip = list(SLOT_BACK) blacklisted = 1 @@ -16,8 +15,8 @@ /datum/species/angel/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) ..() if(H.dna && H.dna.species && (H.dna.features["wings"] != "Angel")) - if(!("wings" in H.dna.species.mutant_bodyparts)) - H.dna.species.mutant_bodyparts |= "wings" + if(!H.dna.species.mutant_bodyparts["wings"]) + H.dna.species.mutant_bodyparts["wings"] = "Angel" H.dna.features["wings"] = "Angel" H.update_body() if(ishuman(H) && !fly) @@ -32,7 +31,7 @@ H.setMovetype(H.movement_type & ~FLYING) ToggleFlight(H,0) if(H.dna && H.dna.species && (H.dna.features["wings"] == "Angel")) - if("wings" in H.dna.species.mutant_bodyparts) + if(H.dna.species.mutant_bodyparts["wings"]) H.dna.species.mutant_bodyparts -= "wings" H.dna.features["wings"] = "None" H.update_body() diff --git a/code/modules/mob/living/carbon/human/species_types/bugmen.dm b/code/modules/mob/living/carbon/human/species_types/bugmen.dm index 6bd8a44e0a..da53adece3 100644 --- a/code/modules/mob/living/carbon/human/species_types/bugmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/bugmen.dm @@ -4,8 +4,7 @@ default_color = "00FF00" species_traits = list(LIPS,EYECOLOR,HAIR,FACEHAIR,MUTCOLORS,HORNCOLOR,WINGCOLOR) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG - mutant_bodyparts = list("mam_ears","mam_tail", "taur", "insect_wings","mam_snout", "mam_snouts", "insect_fluff","insect_markings") - default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", + mutant_bodyparts = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "insect_wings" = "None", "insect_fluff" = "None", "mam_snouts" = "None", "taur" = "None", "insect_markings" = "None") attack_verb = "slash" attack_sound = 'sound/weapons/slash.ogg' @@ -25,21 +24,21 @@ . = ..() /datum/species/insect/can_wag_tail(mob/living/carbon/human/H) - return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts) + return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] /datum/species/insect/is_wagging_tail(mob/living/carbon/human/H) - return ("mam_waggingtail" in mutant_bodyparts) + return mutant_bodyparts["mam_waggingtail"] /datum/species/insect/start_wagging_tail(mob/living/carbon/human/H) - if("mam_tail" in mutant_bodyparts) + if(mutant_bodyparts["mam_tail"]) + mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"] mutant_bodyparts -= "mam_tail" - mutant_bodyparts |= "mam_waggingtail" H.update_body() /datum/species/insect/stop_wagging_tail(mob/living/carbon/human/H) - if("mam_waggingtail" in mutant_bodyparts) + if(mutant_bodyparts["mam_waggingtail"]) + mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"] mutant_bodyparts -= "mam_waggingtail" - mutant_bodyparts |= "mam_tail" H.update_body() /datum/species/insect/qualifies_for_rank(rank, list/features) diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index 499e3b0276..a41cc8c55a 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -4,7 +4,7 @@ default_color = "FFFFFF" species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS) inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH) - default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "wings" = "None") + mutant_bodyparts = list("tail_human" = "None", "ears" = "None", "deco_wings" = "None") use_skintones = TRUE mutant_brain = /obj/item/organ/brain/dullahan mutanteyes = /obj/item/organ/eyes/dullahan diff --git a/code/modules/mob/living/carbon/human/species_types/dwarves.dm b/code/modules/mob/living/carbon/human/species_types/dwarves.dm index 15422b2cdd..5a9b830bc8 100644 --- a/code/modules/mob/living/carbon/human/species_types/dwarves.dm +++ b/code/modules/mob/living/carbon/human/species_types/dwarves.dm @@ -8,7 +8,6 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) // default_color = "FFFFFF" species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,NO_UNDERWEAR) inherent_traits = list() - default_features = list("mcolor" = "FFF", "wings" = "None") limbs_id = "human" use_skintones = 1 say_mod = "bellows" //high energy, EXTRA BIOLOGICAL FUEL diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index 5801e163e5..2f0595e2c0 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -4,8 +4,7 @@ id = "felinid" limbs_id = "human" - mutant_bodyparts = list("mam_ears", "mam_tail", "deco_wings") - default_features = list("mcolor" = "FFF", "mam_tail" = "Cat", "mam_ears" = "Cat", "wings" = "None", "deco_wings" = "None") + mutant_bodyparts = list("mam_tail" = "Cat", "mam_ears" = "Cat", "deco_wings" = "None") mutantears = /obj/item/organ/ears/cat mutanttail = /obj/item/organ/tail/cat @@ -25,21 +24,21 @@ /datum/species/human/felinid/can_wag_tail(mob/living/carbon/human/H) - return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts) + return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] /datum/species/human/felinid/is_wagging_tail(mob/living/carbon/human/H) - return ("mam_waggingtail" in mutant_bodyparts) + return mutant_bodyparts["mam_waggingtail"] /datum/species/human/felinid/start_wagging_tail(mob/living/carbon/human/H) - if("mam_tail" in mutant_bodyparts) + if(mutant_bodyparts["mam_tail"]) + mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"] mutant_bodyparts -= "mam_tail" - mutant_bodyparts |= "mam_waggingtail" H.update_body() /datum/species/human/felinid/stop_wagging_tail(mob/living/carbon/human/H) - if("mam_waggingtail" in mutant_bodyparts) + if(mutant_bodyparts["mam_waggingtail"]) + mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"] mutant_bodyparts -= "mam_waggingtail" - mutant_bodyparts |= "mam_tail" H.update_body() /datum/species/human/felinid/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load) diff --git a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm index 608d71e2c5..d4b8ea7897 100644 --- a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm @@ -5,8 +5,7 @@ icon_limbs = DEFAULT_BODYPART_ICON_CITADEL species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR,WINGCOLOR) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BEAST - mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "deco_wings", "taur", "horns", "legs") - default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "deco_wings" = "None", + mutant_bodyparts = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "deco_wings" = "None", "mam_body_markings" = "Husky", "taur" = "None", "horns" = "None", "legs" = "Plantigrade", "meat_type" = "Mammalian") attack_verb = "claw" attack_sound = 'sound/weapons/slash.ogg' @@ -26,21 +25,21 @@ . = ..() /datum/species/mammal/can_wag_tail(mob/living/carbon/human/H) - return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts) + return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] /datum/species/mammal/is_wagging_tail(mob/living/carbon/human/H) - return ("mam_waggingtail" in mutant_bodyparts) + return mutant_bodyparts["mam_waggingtail"] /datum/species/mammal/start_wagging_tail(mob/living/carbon/human/H) - if("mam_tail" in mutant_bodyparts) + if(mutant_bodyparts["mam_tail"]) + mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"] mutant_bodyparts -= "mam_tail" - mutant_bodyparts |= "mam_waggingtail" H.update_body() /datum/species/mammal/stop_wagging_tail(mob/living/carbon/human/H) - if("mam_waggingtail" in mutant_bodyparts) + if(mutant_bodyparts["mam_waggingtail"]) + mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"] mutant_bodyparts -= "mam_waggingtail" - mutant_bodyparts |= "mam_tail" H.update_body() @@ -57,8 +56,7 @@ default_color = "00FF00" icon_limbs = DEFAULT_BODYPART_ICON_CITADEL species_traits = list(MUTCOLORS,EYECOLOR,LIPS) - mutant_bodyparts = list("xenotail", "xenohead", "xenodorsal", "mam_body_markings", "taur", "legs") - default_features = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade") + mutant_bodyparts = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade") attack_verb = "slash" attack_sound = 'sound/weapons/slash.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index 3332465c78..02cff6d924 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -4,8 +4,7 @@ default_color = "FFFFFF" species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS_PARTSONLY,WINGCOLOR) - mutant_bodyparts = list("ears", "tail_human", "wings", "taur", "deco_wings") // CITADEL EDIT gives humans snowflake parts - default_features = list("mcolor" = "FFF", "mcolor2" = "FFF","mcolor3" = "FFF","tail_human" = "None", "ears" = "None", "wings" = "None", "taur" = "None", "deco_wings" = "None") + mutant_bodyparts = list("mcolor" = "FFF", "mcolor2" = "FFF","mcolor3" = "FFF","tail_human" = "None", "ears" = "None", "taur" = "None", "deco_wings" = "None") use_skintones = 1 skinned_type = /obj/item/stack/sheet/animalhide/human disliked_food = GROSS | RAW @@ -24,19 +23,19 @@ . = ..() /datum/species/human/can_wag_tail(mob/living/carbon/human/H) - return ("tail_human" in mutant_bodyparts) || ("waggingtail_human" in mutant_bodyparts) + return mutant_bodyparts["tail_human"] || mutant_bodyparts["waggingtail_human"] /datum/species/human/is_wagging_tail(mob/living/carbon/human/H) - return ("waggingtail_human" in mutant_bodyparts) + return mutant_bodyparts["waggingtail_human"] /datum/species/human/start_wagging_tail(mob/living/carbon/human/H) - if("tail_human" in mutant_bodyparts) + if(mutant_bodyparts["tail_human"]) + mutant_bodyparts["waggingtail_human"] = mutant_bodyparts["tail_human"] mutant_bodyparts -= "tail_human" - mutant_bodyparts |= "waggingtail_human" H.update_body() /datum/species/human/stop_wagging_tail(mob/living/carbon/human/H) - if("waggingtail_human" in mutant_bodyparts) + if(mutant_bodyparts["waggingtail_human"]) + mutant_bodyparts["tail_human"] = mutant_bodyparts["waggingtail_human"] mutant_bodyparts -= "waggingtail_human" - mutant_bodyparts |= "tail_human" H.update_body() diff --git a/code/modules/mob/living/carbon/human/species_types/ipc.dm b/code/modules/mob/living/carbon/human/species_types/ipc.dm index b7305a9228..94d5456c3d 100644 --- a/code/modules/mob/living/carbon/human/species_types/ipc.dm +++ b/code/modules/mob/living/carbon/human/species_types/ipc.dm @@ -8,8 +8,7 @@ sexes = 0 species_traits = list(MUTCOLORS,NOEYES,NOTRANSSTING) inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID - mutant_bodyparts = list("ipc_screen", "ipc_antenna") - default_features = list("ipc_screen" = "Blank", "ipc_antenna" = "None") + mutant_bodyparts = list("ipc_screen" = "Blank", "ipc_antenna" = "None") meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc gib_types = list(/obj/effect/gibspawner/ipc, /obj/effect/gibspawner/ipc/bodypartless) mutanttongue = /obj/item/organ/tongue/robot/ipc diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index d81251eca9..98c4cedeb9 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -7,8 +7,7 @@ species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,WINGCOLOR) mutantlungs = /obj/item/organ/lungs/slime mutant_heart = /obj/item/organ/heart/slime - mutant_bodyparts = list("mam_tail", "mam_ears", "mam_snouts", "taur", "deco_wings") //CIT CHANGE - default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None", "deco_wings" = "None") //CIT CHANGE + mutant_bodyparts = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None", "deco_wings" = "None") inherent_traits = list(TRAIT_TOXINLOVER) meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime gib_types = list(/obj/effect/gibspawner/slime, /obj/effect/gibspawner/slime/bodypartless) @@ -127,23 +126,24 @@ . = ..() /datum/species/jelly/can_wag_tail(mob/living/carbon/human/H) - return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts) + return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] /datum/species/jelly/is_wagging_tail(mob/living/carbon/human/H) - return ("mam_waggingtail" in mutant_bodyparts) + return mutant_bodyparts["mam_waggingtail"] /datum/species/jelly/start_wagging_tail(mob/living/carbon/human/H) - if("mam_tail" in mutant_bodyparts) + if(mutant_bodyparts["mam_tail"]) + mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"] mutant_bodyparts -= "mam_tail" - mutant_bodyparts |= "mam_waggingtail" H.update_body() /datum/species/jelly/stop_wagging_tail(mob/living/carbon/human/H) - if("mam_waggingtail" in mutant_bodyparts) + if(mutant_bodyparts["mam_waggingtail"]) + mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"] mutant_bodyparts -= "mam_waggingtail" - mutant_bodyparts |= "mam_tail" H.update_body() + ////////////////////////////////////////////////////////SLIMEPEOPLE/////////////////////////////////////////////////////////////////// //Slime people are able to split like slimes, retaining a single mind that can swap between bodies at will, even after death. @@ -431,8 +431,7 @@ default_color = "00FFFF" species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR) inherent_traits = list(TRAIT_TOXINLOVER) - mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "taur") - default_features = list("mcolor" = "FFF", "mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Plain", "mam_snouts" = "None", "taur" = "None") + mutant_bodyparts = list("mcolor" = "FFF", "mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Plain", "mam_snouts" = "None", "taur" = "None") say_mod = "says" hair_color = "mutcolor" hair_alpha = 160 //a notch brighter so it blends better. diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 6468bd1544..9a6bc2659d 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -11,7 +11,7 @@ mutanttail = /obj/item/organ/tail/lizard coldmod = 1.5 heatmod = 0.67 - default_features = list("mcolor" = "0F0", "mcolor2" = "0F0", "mcolor3" = "0F0", "tail_lizard" = "Smooth", "snout" = "Round", + mutant_bodyparts = list("mcolor" = "0F0", "mcolor2" = "0F0", "mcolor3" = "0F0", "tail_lizard" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Digitigrade", "taur" = "None", "deco_wings" = "None") attack_verb = "slash" @@ -53,25 +53,25 @@ . = ..() /datum/species/lizard/can_wag_tail(mob/living/carbon/human/H) - return ("tail_lizard" in mutant_bodyparts) || ("waggingtail_lizard" in mutant_bodyparts) + return mutant_bodyparts["tail_lizard"] || mutant_bodyparts["waggingtail_lizard"] /datum/species/lizard/is_wagging_tail(mob/living/carbon/human/H) - return ("waggingtail_lizard" in mutant_bodyparts) + return mutant_bodyparts["waggingtail_lizard"] /datum/species/lizard/start_wagging_tail(mob/living/carbon/human/H) - if("tail_lizard" in mutant_bodyparts) + if(mutant_bodyparts["tail_lizard"]) + mutant_bodyparts["waggingtail_lizard"] = mutant_bodyparts["tail_lizard"] + mutant_bodyparts["waggingspines"] = mutant_bodyparts["spines"] mutant_bodyparts -= "tail_lizard" mutant_bodyparts -= "spines" - mutant_bodyparts |= "waggingtail_lizard" - mutant_bodyparts |= "waggingspines" H.update_body() /datum/species/lizard/stop_wagging_tail(mob/living/carbon/human/H) - if("waggingtail_lizard" in mutant_bodyparts) + if(mutant_bodyparts["waggingtail_lizard"]) + mutant_bodyparts["tail_lizard"] = mutant_bodyparts["waggingtail_lizard"] + mutant_bodyparts["spines"] = mutant_bodyparts["waggingspines"] mutant_bodyparts -= "waggingtail_lizard" mutant_bodyparts -= "waggingspines" - mutant_bodyparts |= "tail_lizard" - mutant_bodyparts |= "spines" H.update_body() /* diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm index 9d5ca92894..3c17ef9066 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -1,8 +1,7 @@ /datum/species/mush //mush mush codecuck name = "Anthromorphic Mushroom" id = "mush" - mutant_bodyparts = list("caps") - default_features = list("caps" = "Round") + mutant_bodyparts = list("caps" = "Round") fixed_mut_color = "DBBF92" hair_color = "FF4B19" //cap color, spot color uses eye color diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 7ccccd588d..44a794c2ab 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -76,14 +76,13 @@ name = "Anthromorphic Plant" id = "podweak" species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS) - mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "taur", "legs") - default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "mam_body_markings" = "Husky", "taur" = "None", "legs" = "Normal Legs") + mutant_bodyparts = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "mam_body_markings" = "Husky", "taur" = "None", "legs" = "Normal Legs") limbs_id = "pod" light_nutrition_gain_factor = 7.5 light_bruteheal = 0.2 light_burnheal = 0.2 light_toxheal = 0.7 - + /datum/species/pod/pseudo_weak/spec_death(gibbed, mob/living/carbon/human/H) if(H) stop_wagging_tail(H) @@ -94,19 +93,19 @@ . = ..() /datum/species/pod/pseudo_weak/can_wag_tail(mob/living/carbon/human/H) - return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts) + return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] /datum/species/pod/pseudo_weak/is_wagging_tail(mob/living/carbon/human/H) - return ("mam_waggingtail" in mutant_bodyparts) + return mutant_bodyparts["mam_waggingtail"] /datum/species/pod/pseudo_weak/start_wagging_tail(mob/living/carbon/human/H) - if("mam_tail" in mutant_bodyparts) + if(mutant_bodyparts["mam_tail"]) + mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"] mutant_bodyparts -= "mam_tail" - mutant_bodyparts |= "mam_waggingtail" H.update_body() /datum/species/pod/pseudo_weak/stop_wagging_tail(mob/living/carbon/human/H) - if("mam_waggingtail" in mutant_bodyparts) + if(mutant_bodyparts["mam_waggingtail"]) + mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"] mutant_bodyparts -= "mam_waggingtail" - mutant_bodyparts |= "mam_tail" H.update_body() diff --git a/code/modules/mob/living/carbon/human/species_types/synthliz.dm b/code/modules/mob/living/carbon/human/species_types/synthliz.dm index 40441c45fd..408d264546 100644 --- a/code/modules/mob/living/carbon/human/species_types/synthliz.dm +++ b/code/modules/mob/living/carbon/human/species_types/synthliz.dm @@ -6,8 +6,7 @@ default_color = "00FF00" species_traits = list(MUTCOLORS,NOTRANSSTING,EYECOLOR,LIPS,HAIR) inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID - mutant_bodyparts = list("ipc_antenna","mam_tail", "mam_snouts","legs", "mam_body_markings", "taur") - default_features = list("ipc_antenna" = "Synthetic Lizard - Antennae","mam_tail" = "Synthetic Lizard", "mam_snouts" = "Synthetic Lizard - Snout", "legs" = "Digitigrade", "mam_body_markings" = "Synthetic Lizard - Plates", "taur" = "None") + mutant_bodyparts = list("ipc_antenna" = "Synthetic Lizard - Antennae","mam_tail" = "Synthetic Lizard", "mam_snouts" = "Synthetic Lizard - Snout", "legs" = "Digitigrade", "mam_body_markings" = "Synthetic Lizard - Plates", "taur" = "None") meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc gib_types = list(/obj/effect/gibspawner/ipc, /obj/effect/gibspawner/ipc/bodypartless) mutanttongue = /obj/item/organ/tongue/robot/ipc @@ -35,19 +34,19 @@ . = ..() /datum/species/synthliz/can_wag_tail(mob/living/carbon/human/H) - return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts) + return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] /datum/species/synthliz/is_wagging_tail(mob/living/carbon/human/H) - return ("mam_waggingtail" in mutant_bodyparts) + return mutant_bodyparts["mam_waggingtail"] /datum/species/synthliz/start_wagging_tail(mob/living/carbon/human/H) - if("mam_tail" in mutant_bodyparts) + if(mutant_bodyparts["mam_tail"]) + mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"] mutant_bodyparts -= "mam_tail" - mutant_bodyparts |= "mam_waggingtail" H.update_body() /datum/species/synthliz/stop_wagging_tail(mob/living/carbon/human/H) - if("mam_waggingtail" in mutant_bodyparts) + if(mutant_bodyparts["mam_waggingtail"]) + mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"] mutant_bodyparts -= "mam_waggingtail" - mutant_bodyparts |= "mam_tail" - H.update_body() \ No newline at end of file + H.update_body() diff --git a/code/modules/mob/living/carbon/human/species_types/synths.dm b/code/modules/mob/living/carbon/human/species_types/synths.dm index cb7822ad7e..1700927a24 100644 --- a/code/modules/mob/living/carbon/human/species_types/synths.dm +++ b/code/modules/mob/living/carbon/human/species_types/synths.dm @@ -58,7 +58,6 @@ meat = S.meat mutant_bodyparts = S.mutant_bodyparts.Copy() mutant_organs = S.mutant_organs.Copy() - default_features = S.default_features.Copy() nojumpsuit = S.nojumpsuit no_equip = S.no_equip.Copy() limbs_id = S.limbs_id @@ -75,7 +74,6 @@ attack_sound = initial(attack_sound) miss_sound = initial(miss_sound) mutant_bodyparts = list() - default_features = list() nojumpsuit = initial(nojumpsuit) no_equip = list() qdel(fake_species) diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 6a4ef2e9d9..03da959171 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -5,7 +5,7 @@ species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,DRINKSBLOOD) inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID - default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "wings" = "None") + mutant_bodyparts = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "deco_wings" = "None") exotic_bloodtype = "U" use_skintones = TRUE mutant_heart = /obj/item/organ/heart/vampire diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 66233f7243..cb603dee90 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -57,10 +57,12 @@ There are several things that need to be remembered: dna.species.handle_mutant_bodyparts(src) -/mob/living/carbon/human/update_body() +/mob/living/carbon/human/update_body(update_genitals = FALSE) remove_overlay(BODY_LAYER) dna.species.handle_body(src) ..() + if(update_genitals) + update_genitals() /mob/living/carbon/human/update_fire() ..((fire_stacks > 3) ? "Standing" : "Generic_mob_burning") @@ -72,7 +74,7 @@ There are several things that need to be remembered: if(!..()) icon_render_key = null //invalidate bodyparts cache - update_body() + update_body(TRUE) update_hair() update_inv_w_uniform() update_inv_wear_id() @@ -330,9 +332,9 @@ There are several things that need to be remembered: var/alt_icon = H.alternate_worn_icon || 'icons/mob/head.dmi' var/muzzled = FALSE var/variation_flag = NONE - if(("mam_snouts" in dna.species.default_features) && dna.features["mam_snouts"] != "None") + if(dna.species.mutant_bodyparts["mam_snouts"] && dna.features["mam_snouts"] != "None") muzzled = TRUE - if(!muzzled && ("snout" in dna.species.default_features) && dna.features["snout"] != "None") + else if(dna.species.mutant_bodyparts["snout"] && dna.features["snout"] != "None") muzzled = TRUE if(muzzled && H.mutantrace_variation & STYLE_MUZZLE) alt_icon = 'icons/mob/head_muzzled.dmi' @@ -394,7 +396,7 @@ There are several things that need to be remembered: var/dimension_y = 32 var/variation_flag = NONE var/datum/sprite_accessory/taur/T - if("taur" in dna.species.mutant_bodyparts) + if(dna.species.mutant_bodyparts["taur"]) T = GLOB.taur_list[dna.features["taur"]] if(S.mutantrace_variation) @@ -463,9 +465,9 @@ There are several things that need to be remembered: var/variation_flag = NONE if(head && (head.flags_inv & HIDEMASK)) return - if(("mam_snouts" in dna.species.default_features) && dna.features["mam_snouts"] != "None") + if(dna.species.mutant_bodyparts["mam_snouts"] && dna.features["mam_snouts"] != "None") muzzled = TRUE - if(!muzzled && ("snout" in dna.species.default_features) && dna.features["snout"] != "None") + else if(dna.species.mutant_bodyparts["snout"] && dna.features["snout"] != "None") muzzled = TRUE if(muzzled && M.mutantrace_variation & STYLE_MUZZLE) alt_icon = 'icons/mob/mask_muzzled.dmi' @@ -652,7 +654,7 @@ generate/load female uniform sprites matching all previously decided variables var/is_taur = FALSE - if(("taur" in dna.species.mutant_bodyparts) && (dna.features["taur"] != "None")) + if(dna.species.mutant_bodyparts["taur"] && dna.features["taur"] != "None") is_taur = TRUE diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 3aae3e36ed..111054c383 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -125,7 +125,7 @@ var/mob/living/carbon/human/H = user var/open = FALSE if(H.dna.features["wings"] != "None") - if("wingsopen" in H.dna.species.mutant_bodyparts) + if(H.dna.species.mutant_bodyparts["wingsopen"]) open = TRUE H.CloseWings() else diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 1309fae60c..103e8164f9 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -702,8 +702,8 @@ /mob/living/do_resist_grab(moving_resist, forced, silent = FALSE) . = ..() - if(pulledby.grab_state) - if(CHECK_MOBILITY(src, MOBILITY_STAND) && prob(30/pulledby.grab_state)) + if(pulledby.grab_state > GRAB_PASSIVE) + if(CHECK_MOBILITY(src, MOBILITY_RESIST) && prob(30/pulledby.grab_state)) visible_message("[src] has broken free of [pulledby]'s grip!") pulledby.stop_pulling() return TRUE diff --git a/code/modules/mob/living/living_combat.dm b/code/modules/mob/living/living_combat.dm index 4cd2def5a8..493f2ffdff 100644 --- a/code/modules/mob/living/living_combat.dm +++ b/code/modules/mob/living/living_combat.dm @@ -43,7 +43,7 @@ /// Updates the combat mode HUD icon. /mob/living/proc/update_combat_mode_icon() var/obj/screen/combattoggle/T = locate() in hud_used?.static_inventory - T?.update_icon_state() + T?.update_icon() /// Enables intentionally being in combat mode. Please try not to use this proc for feedback whenever possible. /mob/living/proc/enable_intentional_combat_mode(silent = TRUE, visible = FALSE) diff --git a/code/modules/mob/living/living_sprint.dm b/code/modules/mob/living/living_sprint.dm index 66aa3ebc6f..55d5f3320c 100644 --- a/code/modules/mob/living/living_sprint.dm +++ b/code/modules/mob/living/living_sprint.dm @@ -4,7 +4,7 @@ /mob/living/proc/update_sprint_icon() var/obj/screen/sprintbutton/S = locate() in hud_used?.static_inventory - S?.update_icon_state() + S?.update_icon() /mob/living/proc/update_hud_sprint_bar() hud_used?.sprint_buffer?.update_to_mob(src) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 708c9ea2cd..a6366c03fe 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -8,6 +8,7 @@ response_help = "thinks better of touching" response_disarm = "flails at" response_harm = "punches" + threat = 1 speak_chance = 1 icon = 'icons/mob/mob.dmi' speed = 0 @@ -118,6 +119,7 @@ desc = "A massive, armored construct built to spearhead attacks and soak up enemy fire." icon_state = "behemoth" icon_living = "behemoth" + threat = 3 maxHealth = 150 health = 150 response_harm = "harmlessly punches" @@ -180,6 +182,7 @@ desc = "A wicked, clawed shell constructed to assassinate enemies and sow chaos behind enemy lines." icon_state = "floating" icon_living = "floating" + threat = 3 maxHealth = 65 health = 65 melee_damage_lower = 20 diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index ff42512666..f7ebde4758 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -8,6 +8,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians name = "Guardian Spirit" real_name = "Guardian Spirit" desc = "A mysterious being that stands by its charge, ever vigilant." + threat = 5 speak_emote = list("hisses") gender = NEUTER mob_biotypes = NONE diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index bb51358192..3b9700bb58 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -7,6 +7,7 @@ icon_dead = "alienh_dead" icon_gib = "syndicate_gib" gender = FEMALE + threat = 1 response_help = "pokes" response_disarm = "shoves" response_harm = "hits" @@ -62,6 +63,7 @@ icon_state = "aliens" icon_living = "aliens" icon_dead = "aliens_dead" + threat = 3 health = 150 maxHealth = 150 melee_damage_lower = 15 @@ -78,6 +80,7 @@ icon_state = "alienq" icon_living = "alienq" icon_dead = "alienq_dead" + threat = 8 health = 250 maxHealth = 250 melee_damage_lower = 15 @@ -157,6 +160,7 @@ name = "lusty xenomorph maid" melee_damage_lower = 0 melee_damage_upper = 0 + threat = -1 a_intent = INTENT_HELP friendly = "caresses" obj_damage = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index dca7bc7006..a77098cb80 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -2,6 +2,7 @@ /mob/living/simple_animal/hostile/bear name = "space bear" desc = "You don't need to be faster than a space bear, you just need to outrun your crewmates." + threat = 1 icon_state = "bear" icon_living = "bear" icon_dead = "bear_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 524c220fa4..f5454933c8 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -16,6 +16,7 @@ icon_state = "" icon_living = "" icon = 'icons/mob/bees.dmi' + threat = 0.3 gender = FEMALE speak_emote = list("buzzes") emote_hear = list("buzzes") @@ -269,9 +270,12 @@ var/datum/reagent/R = GLOB.chemical_reagents_list[S.reagents.get_master_reagent_id()] if(R && S.reagents.has_reagent(R.type, 5)) S.reagents.remove_reagent(R.type,5) - queen.assign_reagent(R) - user.visible_message("[user] injects [src]'s genome with [R.name], mutating it's DNA!","You inject [src]'s genome with [R.name], mutating it's DNA!") - name = queen.name + if(R.can_synth) + queen.assign_reagent(R) + user.visible_message("[user] injects [src]'s genome with [R.name], mutating it's DNA!","You inject [src]'s genome with [R.name], mutating it's DNA!") + name = queen.name + else + user.visible_message("[user] injects [src]'s genome with [R.name]... but nothing happens.","You inject [src]'s genome with [R.name]... but nothing happens.") else to_chat(user, "You don't have enough units of that chemical to modify the bee's DNA!") ..() diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm b/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm index be88394692..dbb957a96b 100644 --- a/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm +++ b/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm @@ -1,6 +1,7 @@ /mob/living/simple_animal/hostile/boss name = "A Perfectly Generic Boss Placeholder" desc = "" + threat = 10 robust_searching = 1 stat_attack = UNCONSCIOUS status_flags = 0 @@ -134,4 +135,4 @@ /datum/boss_active_timed_battle/Destroy() abilities = null SSobj.processing.Remove(src) - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 36968a1ab0..9c89ff4a4f 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -7,6 +7,7 @@ icon_living = "carp" icon_dead = "carp_dead" icon_gib = "carp_gib" + threat = 0.2 mob_biotypes = MOB_ORGANIC|MOB_BEAST speak_chance = 0 turns_per_move = 5 @@ -70,7 +71,7 @@ icon_living = "megacarp" icon_dead = "megacarp_dead" icon_gib = "megacarp_gib" - + threat = 3 regen_amount = 6 maxHealth = 30 @@ -94,7 +95,7 @@ name = "Cayenne" desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot." gender = FEMALE - + threat = 5 regen_amount = 8 speak_emote = list("squeaks") diff --git a/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm b/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm index aec136af7d..6ca6eac0cc 100644 --- a/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm @@ -1,6 +1,7 @@ /mob/living/simple_animal/hostile/dark_wizard name = "Dark Wizard" desc = "Killing amateurs since the dawn of times." + threat = 3 icon = 'icons/mob/simple_human.dmi' icon_state = "dark_wizard" icon_living = "dark_wizard" @@ -36,4 +37,4 @@ icon_state = "declone" damage = 4 damage_type = BURN - flag = "energy" \ No newline at end of file + flag = "energy" diff --git a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm index 2d438dbf1c..dbb9048ca4 100644 --- a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm +++ b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm @@ -26,4 +26,4 @@ movement_type = FLYING faction = list("spooky") - del_on_death = 1 \ No newline at end of file + del_on_death = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm index 69956c5d0d..7ac0ea2b44 100644 --- a/code/modules/mob/living/simple_animal/hostile/faithless.dm +++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm @@ -4,6 +4,7 @@ icon_state = "faithless" icon_living = "faithless" icon_dead = "faithless_dead" + threat = 1 mob_biotypes = MOB_ORGANIC|MOB_HUMANOID gender = MALE speak_chance = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index cc7b1e19d1..3c3612f434 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -17,6 +17,7 @@ //basic spider mob, these generally guard nests /mob/living/simple_animal/hostile/poison/giant_spider + threat = 1 name = "giant spider" desc = "Furry and black, it makes you shudder to look at it. This one has deep red eyes." icon_state = "guard" diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm index 9b5b428f44..7c6f9e9c7b 100644 --- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm +++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm @@ -9,6 +9,7 @@ icon_state = "crawling" icon_living = "crawling" icon_dead = "dead" + threat = 0.5 mob_biotypes = MOB_ORGANIC|MOB_HUMANOID speak_chance = 80 maxHealth = 220 @@ -114,4 +115,4 @@ unique_name = FALSE AIStatus = AI_OFF atmos_requirements = list("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 \ No newline at end of file + minbodytemp = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index cc225f4bac..9d64b76198 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -6,6 +6,7 @@ icon_state = "headcrab" icon_living = "headcrab" icon_dead = "headcrab_dead" + threat = 1 gender = NEUTER health = 50 maxHealth = 50 diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index bd4f334476..e496d007a2 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -3,6 +3,7 @@ stop_automated_movement_when_pulled = 0 obj_damage = 40 environment_smash = ENVIRONMENT_SMASH_STRUCTURES //Bitflags. Set to ENVIRONMENT_SMASH_STRUCTURES to break closets,tables,racks, etc; ENVIRONMENT_SMASH_WALLS for walls; ENVIRONMENT_SMASH_RWALLS for rwalls + var/threat = 0 // for dynamic var/atom/target var/ranged = FALSE var/rapid = 0 //How many shots per volley. @@ -594,3 +595,6 @@ mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with mega . += M else if (M.loc.type in hostile_machines) . += M.loc + +/mob/living/simple_animal/hostile/proc/threat() + return threat diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm index e558982fbb..05c4007b6f 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm @@ -11,6 +11,7 @@ icon_living = "leaper" icon_dead = "leaper_dead" mob_biotypes = MOB_ORGANIC|MOB_BEAST + threat = 2 maxHealth = 300 health = 300 ranged = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm index 91e17e8e57..ae161d596d 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm @@ -8,6 +8,7 @@ icon_living = "arachnid" icon_dead = "arachnid_dead" mob_biotypes = MOB_ORGANIC|MOB_BUG + threat = 2 melee_damage_lower = 30 melee_damage_upper = 30 maxHealth = 300 diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm index b2e6fa9704..c05d14965e 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm @@ -14,6 +14,7 @@ icon_living = "mook" icon_dead = "mook_dead" mob_biotypes = MOB_ORGANIC|MOB_HUMANOID + threat = 0.5 pixel_x = -16 maxHealth = 45 health = 45 diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm index 7565a686bf..0521afa9e9 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm @@ -13,6 +13,7 @@ icon_state = "seedling" icon_living = "seedling" icon_dead = "seedling_dead" + threat = 0.5 maxHealth = 100 health = 100 melee_damage_lower = 30 diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm index 17658cc7c1..e418cc4ab0 100644 --- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm +++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm @@ -5,6 +5,7 @@ icon_living = "tomato" icon_dead = "tomato_dead" gender = NEUTER + threat = 0.3 speak_chance = 0 turns_per_move = 5 maxHealth = 30 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index a0e6561c68..c90ebe8a5c 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -23,6 +23,7 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner name = "blood-drunk miner" desc = "A miner destined to wander forever, engaged in an endless hunt." + threat = 15 health = 900 maxHealth = 900 icon_state = "miner" diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index b50ebfe160..0d4b7d1b1f 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -26,6 +26,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum name = "bubblegum" desc = "In what passes for a hierarchy among slaughter demons, this one is king." + threat = 35 health = 2500 maxHealth = 2500 attacktext = "rends" diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index f8ba050864..08bd1cedbc 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -24,6 +24,7 @@ Difficulty: Very Hard /mob/living/simple_animal/hostile/megafauna/colossus name = "colossus" desc = "A monstrous creature protected by heavy shielding." + threat = 40 health = 2500 maxHealth = 2500 attacktext = "judges" @@ -603,6 +604,7 @@ Difficulty: Very Hard icon_state = "lightgeist" icon_living = "lightgeist" icon_dead = "butterfly_dead" + threat = -0.7 turns_per_move = 1 response_help = "waves away" response_disarm = "brushes aside" diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 0e3cde5628..4644992ad0 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -33,6 +33,7 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/dragon name = "ash drake" desc = "Guardians of the necropolis." + threat = 30 health = 2500 maxHealth = 2500 spacewalk = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index 7cfae9310a..a9d42373a2 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -37,6 +37,7 @@ Difficulty: Normal /mob/living/simple_animal/hostile/megafauna/hierophant name = "hierophant" desc = "A massive metal club that hangs in the air as though waiting. It'll make you dance to its beat." + threat = 30 health = 2500 maxHealth = 2500 attacktext = "clubs" diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 43ce940d57..62a09dff65 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -18,6 +18,7 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/legion name = "Legion" + threat = 30 health = 800 maxHealth = 800 spacewalk = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index 1cbabd41dd..4d20d4c7fb 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -8,6 +8,7 @@ icon_aggro = "Basilisk_alert" icon_dead = "Basilisk_dead" icon_gib = "syndicate_gib" + threat = 4 mob_biotypes = MOB_ORGANIC|MOB_BEAST move_to_delay = 20 projectiletype = /obj/item/projectile/temp/basilisk diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm index 8687b2d14c..652840f7e3 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm @@ -10,6 +10,7 @@ move_to_delay = 5 vision_range = 20 aggro_vision_range = 20 + threat = 1 maxHealth = 40 //easy to kill, but oh, will you be seeing a lot of them. health = 40 melee_damage_lower = 10 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index 1156b11db3..2114612fce 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -11,6 +11,7 @@ robust_searching = TRUE ranged_ignores_vision = TRUE ranged = TRUE + threat = 5 obj_damage = 5 vision_range = 6 aggro_vision_range = 18 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm index fdc3e2e9b7..68a0e81cc7 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm @@ -25,6 +25,7 @@ icon_aggro = "broodmother" icon_dead = "egg_sac" icon_gib = "syndicate_gib" + threat = 10 maxHealth = 800 health = 800 melee_damage_lower = 30 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm index 0d62eb260d..95fafbabfd 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm @@ -24,6 +24,7 @@ icon_aggro = "herald" icon_dead = "herald_dying" icon_gib = "syndicate_gib" + threat = 10 maxHealth = 800 health = 800 melee_damage_lower = 20 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm index 1bc9ea1e4e..d83a38ae24 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm @@ -24,6 +24,7 @@ icon_aggro = "legionnaire" icon_dead = "legionnaire_dead" icon_gib = "syndicate_gib" + threat = 10 maxHealth = 800 health = 800 melee_damage_lower = 30 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm index e65c4f5b20..3276965fa2 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm @@ -24,6 +24,7 @@ icon_aggro = "pandora" icon_dead = "pandora_dead" icon_gib = "syndicate_gib" + threat = 10 maxHealth = 800 health = 800 melee_damage_lower = 15 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm index 25e38652e1..c43e9a7461 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm @@ -8,6 +8,7 @@ icon_aggro = "Goldgrub_alert" icon_dead = "Goldgrub_dead" icon_gib = "syndicate_gib" + threat = 0.2 mob_biotypes = MOB_ORGANIC|MOB_BEAST vision_range = 2 aggro_vision_range = 9 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm index 87abc1ea14..3c8cf9025f 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm @@ -10,6 +10,7 @@ icon_gib = "syndicate_gib" mob_biotypes = MOB_ORGANIC|MOB_BEAST mouse_opacity = MOUSE_OPACITY_OPAQUE + threat = 2 move_to_delay = 10 ranged = 1 ranged_cooldown_time = 60 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 800c35493b..b41ca15948 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -9,6 +9,7 @@ icon_gib = "syndicate_gib" mob_biotypes = MOB_ORGANIC mouse_opacity = MOUSE_OPACITY_OPAQUE + threat = 4 move_to_delay = 14 ranged = 1 vision_range = 4 @@ -233,6 +234,7 @@ icon_state = "legion" icon_living = "legion" icon_dead = "legion" + threat = 5 health = 450 maxHealth = 450 melee_damage_lower = 20 diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm index 363e3ec573..1c8b171738 100644 --- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm +++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm @@ -10,6 +10,7 @@ obj_damage = 100 melee_damage_lower = 25 melee_damage_upper = 50 + threat = 2 attacktext = "slashes" attack_sound = 'sound/weapons/bladeslice.ogg' faction = list("creature") diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm index 1b2212bf55..d8737d1edc 100644 --- a/code/modules/mob/living/simple_animal/hostile/pirate.dm +++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm @@ -11,6 +11,7 @@ response_help = "pushes" response_disarm = "shoves" response_harm = "hits" + threat = 3 speed = 0 maxHealth = 115 health = 115 diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm index c99c7a04b5..9c3e3e0b92 100644 --- a/code/modules/mob/living/simple_animal/hostile/russian.dm +++ b/code/modules/mob/living/simple_animal/hostile/russian.dm @@ -13,6 +13,7 @@ response_disarm = "shoves" response_harm = "hits" speed = 0 + threat = 1 maxHealth = 100 health = 100 harm_intent_damage = 5 diff --git a/code/modules/mob/living/simple_animal/hostile/sharks.dm b/code/modules/mob/living/simple_animal/hostile/sharks.dm index 4e16a1f7bd..4008334a57 100644 --- a/code/modules/mob/living/simple_animal/hostile/sharks.dm +++ b/code/modules/mob/living/simple_animal/hostile/sharks.dm @@ -16,6 +16,7 @@ response_disarm = "gently pushes aside" response_harm = "hits" speed = 0 + threat = 1 maxHealth = 75 health = 75 harm_intent_damage = 18 diff --git a/code/modules/mob/living/simple_animal/hostile/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/skeleton.dm index 51c55cbf65..df71701bb7 100644 --- a/code/modules/mob/living/simple_animal/hostile/skeleton.dm +++ b/code/modules/mob/living/simple_animal/hostile/skeleton.dm @@ -11,6 +11,7 @@ speak_emote = list("rattles") emote_see = list("rattles") a_intent = INTENT_HARM + threat = 0.5 maxHealth = 40 blood_volume = 0 health = 40 @@ -62,6 +63,7 @@ icon_state = "templar" icon_living = "templar" icon_dead = "templar_dead" + threat = 1.5 maxHealth = 150 health = 150 weather_immunities = list("snow") @@ -95,6 +97,7 @@ icon_state = "plasma_miner" icon_living = "plasma_miner" icon_dead = "plasma_miner" + threat = 2 maxHealth = 150 health = 150 harm_intent_damage = 10 @@ -111,6 +114,7 @@ icon_state = "plasma_miner_tool" icon_living = "plasma_miner_tool" icon_dead = "plasma_miner_tool" + threat = 3 maxHealth = 185 health = 185 harm_intent_damage = 15 diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index 2bab332cd0..fb31e48d90 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -10,7 +10,7 @@ gender = NEUTER a_intent = INTENT_HARM mob_biotypes = MOB_HUMANOID - + threat = 3 response_help = "touches" response_disarm = "pushes" diff --git a/code/modules/mob/living/simple_animal/hostile/stickman.dm b/code/modules/mob/living/simple_animal/hostile/stickman.dm index 855d55938d..24bf5e9ea9 100644 --- a/code/modules/mob/living/simple_animal/hostile/stickman.dm +++ b/code/modules/mob/living/simple_animal/hostile/stickman.dm @@ -5,6 +5,7 @@ icon_living = "stickman" icon_dead = "stickman_dead" icon_gib = "syndicate_gib" + threat = 0.5 mob_biotypes = MOB_HUMANOID gender = MALE speak_chance = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 22bc968f84..8c4e19774d 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -28,6 +28,7 @@ response_help = "pokes" response_disarm = "shoves" response_harm = "hits" + threat = 1 speed = 0 stat_attack = UNCONSCIOUS robust_searching = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm index a915ede835..bc932666f6 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -7,6 +7,7 @@ icon_dead = "pine_1" icon_gib = "pine_1" gender = NEUTER + threat = 1 speak_chance = 0 turns_per_move = 5 response_help = "brushes" diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm index 976f8df229..13a4d1793e 100644 --- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm +++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm @@ -50,6 +50,7 @@ name = "venus human trap" desc = "Now you know how the fly feels." icon_state = "venus_human_trap" + threat = 1 layer = SPACEVINE_MOB_LAYER health = 50 maxHealth = 50 diff --git a/code/modules/mob/living/simple_animal/hostile/wizard.dm b/code/modules/mob/living/simple_animal/hostile/wizard.dm index f97613fe8f..7265540679 100644 --- a/code/modules/mob/living/simple_animal/hostile/wizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/wizard.dm @@ -11,6 +11,7 @@ response_help = "pokes" response_disarm = "shoves" response_harm = "hits" + threat = 3 speed = 0 maxHealth = 100 health = 100 diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm index 88b5bcc373..8878f17893 100644 --- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm +++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm @@ -11,6 +11,7 @@ mob_biotypes = MOB_ORGANIC|MOB_BEAST mouse_opacity = MOUSE_OPACITY_ICON move_to_delay = 5 + threat = 1 friendly = "floats near" speak_emote = list("puffs") vision_range = 5 diff --git a/code/modules/mob/living/simple_animal/hostile/zombie.dm b/code/modules/mob/living/simple_animal/hostile/zombie.dm index e926a5d332..503f5c121e 100644 --- a/code/modules/mob/living/simple_animal/hostile/zombie.dm +++ b/code/modules/mob/living/simple_animal/hostile/zombie.dm @@ -7,6 +7,7 @@ mob_biotypes = MOB_ORGANIC|MOB_HUMANOID speak_chance = 0 stat_attack = UNCONSCIOUS //braains + threat = 1 maxHealth = 100 health = 100 harm_intent_damage = 5 diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index f638281f27..fc202b29ad 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -84,8 +84,6 @@ /// The last mob/living/carbon to push/drag/grab this mob (mostly used by slimes friend recognition) var/datum/weakref/LAssailant - var/list/obj/user_movement_hooks //Passes movement in client/Move() to these! - var/list/mob_spell_list = list() //construct spells and mime spells. Spells that do not transfer from one mob to another and can not be lost in mindswap. diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index a7e739b70e..ffc0970bdf 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -100,13 +100,12 @@ if(mob.throwing) mob.throwing.finalize(FALSE) - for(var/obj/O in mob.user_movement_hooks) - O.intercept_user_move(direction, mob, n, oldloc) - var/atom/movable/P = mob.pulling if(P && !ismob(P) && P.density) mob.setDir(turn(mob.dir, 180)) + SEND_SIGNAL(mob, COMSIG_MOB_CLIENT_MOVE, src, direction, n, oldloc) + /// Process_Grab(): checks for grab, attempts to break if so. Return TRUE to prevent movement. /client/proc/Process_Grab() if(mob.pulledby) diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 39428275c8..31823dccf6 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -365,6 +365,7 @@ can_unsuppress = TRUE can_suppress = TRUE w_class = WEIGHT_CLASS_NORMAL + inaccuracy_modifier = 0 zoomable = TRUE zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you. zoom_out_amt = 13 diff --git a/code/modules/projectiles/guns/ballistic/bow.dm b/code/modules/projectiles/guns/ballistic/bow.dm index 83f95c2c54..3f3d2c6f47 100644 --- a/code/modules/projectiles/guns/ballistic/bow.dm +++ b/code/modules/projectiles/guns/ballistic/bow.dm @@ -11,7 +11,7 @@ slot_flags = ITEM_SLOT_BACK item_flags = NONE casing_ejector = FALSE - inaccuracy_modifier = 0.33 //to counteract the innaccuracy from WEAPON_HEAVY, bows are supposed to be accurate but only able to be fired with both hands + inaccuracy_modifier = 0 //to counteract the innaccuracy from WEAPON_HEAVY, bows are supposed to be accurate but only able to be fired with both hands pin = null no_pin_required = TRUE trigger_guard = TRIGGER_GUARD_NONE //so ashwalkers can use it @@ -62,5 +62,4 @@ desc = "Some sort of pipe made projectile weapon made of a silk string and lots of bending. Used to fire arrows." icon_state = "pipebow" item_state = "pipebow" - inaccuracy_modifier = 1.1 //Made of pipe and in a rush force = 0 diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm index 12006440d2..db614b97d3 100644 --- a/code/modules/projectiles/guns/ballistic/launchers.dm +++ b/code/modules/projectiles/guns/ballistic/launchers.dm @@ -6,6 +6,7 @@ name = "grenade launcher" icon_state = "dshotgun-sawn" item_state = "gun" + inaccuracy_modifier = 0 mag_type = /obj/item/ammo_box/magazine/internal/grenadelauncher fire_sound = 'sound/weapons/grenadelaunch.ogg' w_class = WEIGHT_CLASS_NORMAL @@ -86,7 +87,7 @@ pin = /obj/item/firing_pin/implant/pindicate burst_size = 1 fire_delay = 0 - inaccuracy_modifier = 0.7 + inaccuracy_modifier = 0 casing_ejector = FALSE weapon_weight = WEAPON_HEAVY magazine_wording = "rocket" diff --git a/code/modules/projectiles/guns/ballistic/magweapon.dm b/code/modules/projectiles/guns/ballistic/magweapon.dm index 4e37017b79..f1d02e5cc2 100644 --- a/code/modules/projectiles/guns/ballistic/magweapon.dm +++ b/code/modules/projectiles/guns/ballistic/magweapon.dm @@ -14,7 +14,7 @@ spread = 0 recoil = 0.1 casing_ejector = FALSE - inaccuracy_modifier = 0.5 + inaccuracy_modifier = 0 dualwield_spread_mult = 1.4 weapon_weight = WEAPON_MEDIUM var/obj/item/stock_parts/cell/cell diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 17dd1341b9..7d2910fad3 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -176,6 +176,10 @@ mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357 var/spun = FALSE +/obj/item/gun/ballistic/revolver/russian/do_spin() + . = ..() + spun = TRUE + /obj/item/gun/ballistic/revolver/russian/Initialize() . = ..() do_spin() @@ -192,7 +196,7 @@ return /obj/item/gun/ballistic/revolver/russian/attack_self(mob/user) - if(!spun && can_shoot()) + if(!spun) spin() spun = TRUE return @@ -217,7 +221,7 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user if(!spun) - to_chat(user, "You need to spin the revolver's chamber first!") + to_chat(user, "You need to spin \the [src]'s chamber first!") return spun = FALSE @@ -238,6 +242,11 @@ user.visible_message("*click*") playsound(src, "gun_dry_fire", 30, 1) +/obj/item/gun/ballistic/revolver/russian/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) + add_fingerprint(user) + playsound(src, "gun_dry_fire", 30, TRUE) + user.visible_message("[user.name] tries to fire \the [src] at the same time, but only succeeds at looking like an idiot.", "\The [src]'s anti-combat mechanism prevents you from firing it at the same time!") + /obj/item/gun/ballistic/revolver/russian/proc/shoot_self(mob/living/carbon/human/user, affecting = BODY_ZONE_HEAD) user.apply_damage(300, BRUTE, affecting) user.visible_message("[user.name] fires [src] at [user.p_their()] head!", "You fire [src] at your head!", "You hear a gunshot!") @@ -264,7 +273,7 @@ icon_state = "dshotgun" item_state = "shotgun" w_class = WEIGHT_CLASS_BULKY - weapon_weight = WEAPON_MEDIUM + weapon_weight = WEAPON_HEAVY force = 10 flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BACK diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 56aebc891d..7fb17ced57 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -10,7 +10,7 @@ mag_type = /obj/item/ammo_box/magazine/internal/shot casing_ejector = FALSE var/recentpump = 0 // to prevent spammage - weapon_weight = WEAPON_MEDIUM + weapon_weight = WEAPON_HEAVY /obj/item/gun/ballistic/shotgun/attackby(obj/item/A, mob/user, params) . = ..() @@ -87,6 +87,7 @@ name = "riot shotgun" desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control." icon_state = "riotshotgun" + fire_delay = 7 mag_type = /obj/item/ammo_box/magazine/internal/shot/riot sawn_desc = "Come with me if you want to live." unique_reskin = list("Tatical" = "riotshotgun", @@ -112,6 +113,7 @@ icon_state = "moistnugget" item_state = "moistnugget" slot_flags = 0 //no ITEM_SLOT_BACK sprite, alas + inaccuracy_modifier = 0 mag_type = /obj/item/ammo_box/magazine/internal/boltaction var/bolt_open = FALSE can_bayonet = TRUE @@ -207,7 +209,7 @@ name = "combat shotgun" desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath." icon_state = "cshotgun" - fire_delay = 3 + fire_delay = 5 mag_type = /obj/item/ammo_box/magazine/internal/shot/com w_class = WEIGHT_CLASS_HUGE unique_reskin = list("Tatical" = "cshotgun", diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 42de0dcae8..807b414ce4 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -89,6 +89,7 @@ suppressed = TRUE ammo_type = list(/obj/item/ammo_casing/energy/bolt) weapon_weight = WEAPON_LIGHT + inaccuracy_modifier = 0 obj_flags = 0 overheat_time = 20 holds_charge = TRUE @@ -125,6 +126,7 @@ attack_verb = list("attacked", "slashed", "cut", "sliced") force = 12 sharpness = IS_SHARP + inaccuracy_modifier = 0 can_charge = 0 heat = 3800 @@ -180,6 +182,7 @@ item_state = null icon_state = "wormhole_projector" pin = null + inaccuracy_modifier = 0 var/obj/effect/portal/p_blue var/obj/effect/portal/p_orange var/atmos_link = FALSE @@ -315,6 +318,7 @@ icon_state = "emitter_carbine" force = 12 w_class = WEIGHT_CLASS_SMALL + inaccuracy_modifier = 0 cell_type = /obj/item/stock_parts/cell/super ammo_type = list(/obj/item/ammo_casing/energy/emitter) diff --git a/code/modules/projectiles/guns/misc/chem_gun.dm b/code/modules/projectiles/guns/misc/chem_gun.dm index 3d400f0e16..c05ec1c4be 100644 --- a/code/modules/projectiles/guns/misc/chem_gun.dm +++ b/code/modules/projectiles/guns/misc/chem_gun.dm @@ -9,6 +9,7 @@ throw_speed = 3 throw_range = 7 force = 4 + inaccuracy_modifier = 0 custom_materials = list(/datum/material/iron=2000) clumsy_check = FALSE fire_sound = 'sound/items/syringeproj.ogg' diff --git a/code/modules/projectiles/guns/misc/syringe_gun.dm b/code/modules/projectiles/guns/misc/syringe_gun.dm index b3838751eb..a5f871bdf0 100644 --- a/code/modules/projectiles/guns/misc/syringe_gun.dm +++ b/code/modules/projectiles/guns/misc/syringe_gun.dm @@ -7,6 +7,7 @@ throw_speed = 3 throw_range = 7 force = 4 + inaccuracy_modifier = 0 custom_materials = list(/datum/material/iron=2000) clumsy_check = 0 fire_sound = 'sound/items/syringeproj.ogg' diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 0b634ba2d8..bf090302c8 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -467,7 +467,9 @@ if(H.physiology) H.physiology.stamina_mod *= 0.5 if(H.dna && H.dna.species) - H.dna.species.punchdamagehigh *= 5 + H.dna.species.punchdamagehigh *= 4 + H.dna.species.punchdamagelow *= 4 + H.dna.species.punchstunthreshold *= 2 /datum/reagent/drug/skooma/on_mob_end_metabolize(mob/living/L) . = ..() @@ -478,7 +480,9 @@ if(H.physiology) H.physiology.stamina_mod *= 2 if(H.dna && H.dna.species) - H.dna.species.punchdamagehigh *= 0.2 + H.dna.species.punchdamagehigh *= 0.25 + H.dna.species.punchdamagelow *= 0.25 + H.dna.species.punchstunthreshold *= 0.5 /datum/reagent/drug/skooma/on_mob_life(mob/living/carbon/M) M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1*REM) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index cfb0588f8f..305d12b3c5 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -495,6 +495,24 @@ toxpwr = 0.5 taste_description = "bad cooking" +/datum/reagent/toxin/condensed_cooking_oil + name = "Condensed Cooking Oil" + description = "Taste the consequences of your mistakes." + reagent_state = LIQUID + color = "#d6d6d8" + metabolization_rate = 0.25 * REAGENTS_METABOLISM + toxpwr = 0 + taste_mult = -2 + taste_description = "awful cooking" + +/datum/reagent/toxin/condensed_cooking_oil/on_mob_life(mob/living/carbon/M) + if(prob(15)) + M.vomit() + else + if(prob(40)) + M.adjustOrganLoss(ORGAN_SLOT_HEART, 0.5) //For reference, bungotoxin does 3 + ..() + /datum/reagent/toxin/itching_powder name = "Itching Powder" description = "A powder that induces itching upon contact with the skin. Causes the victim to scratch at their itches and has a very low chance to decay into Histamine." diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 74e99cc326..800d66969d 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -388,3 +388,67 @@ /obj/item/reagent_containers/glass/get_belt_overlay() return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "bottle") + +//Mortar & Pestle + +/obj/item/pestle + name = "pestle" + desc = "An ancient, simple tool used in conjunction with a mortar to grind or juice items." + icon = 'icons/obj/chemical.dmi' + icon_state = "pestle" + force = 4 + +/obj/item/reagent_containers/glass/mortar + name = "mortar" + desc = "A specially formed bowl of ancient design. It is possible to crush or juice items placed in it using a pestle; however the process, unlike modern methods, is slow and physically exhausting. Alt click to eject the item." + icon_state = "mortar" + amount_per_transfer_from_this = 10 + possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50) + item_flags = NO_MAT_REDEMPTION + reagent_flags = OPENCONTAINER + spillable = TRUE + var/obj/item/grinded + +/obj/item/reagent_containers/glass/mortar/AltClick(mob/user) + . = ..() + if(grinded) + grinded.forceMove(drop_location()) + grinded = null + to_chat(user, "You eject the item inside.") + return TRUE + +/obj/item/reagent_containers/glass/mortar/attackby(obj/item/I, mob/living/carbon/human/user) + ..() + if(istype(I,/obj/item/pestle)) + if(grinded) + if(IS_STAMCRIT(user)) + to_chat(user, "You are too tired to work!") + return + to_chat(user, "You start grinding...") + if((do_after(user, 25, target = src)) && grinded) + user.adjustStaminaLoss(20) + if(grinded.juice_results) //prioritize juicing + grinded.on_juice() + reagents.add_reagent_list(grinded.juice_results) + to_chat(user, "You juice [grinded] into a fine liquid.") + QDEL_NULL(grinded) + return + grinded.on_grind() + reagents.add_reagent_list(grinded.grind_results) + if(grinded.reagents) //food and pills + grinded.reagents.trans_to(src, grinded.reagents.total_volume) + to_chat(user, "You break [grinded] into powder.") + QDEL_NULL(grinded) + return + return + else + to_chat(user, "There is nothing to grind!") + return + if(grinded) + to_chat(user, "There is something inside already!") + return + if(I.juice_results || I.grind_results) + I.forceMove(src) + grinded = I + return + to_chat(user, "You can't grind this!") diff --git a/code/modules/ruins/spaceruin_code/clericsden.dm b/code/modules/ruins/spaceruin_code/clericsden.dm index 46f8f806e4..67e071b274 100644 --- a/code/modules/ruins/spaceruin_code/clericsden.dm +++ b/code/modules/ruins/spaceruin_code/clericsden.dm @@ -21,6 +21,7 @@ desc = "A weaker construct meant to scour ruins for objects of Nar'Sie's affection. Those barbed claws are no joke." icon_state = "proteon" icon_living = "proteon" + threat = 0.4 maxHealth = 35 health = 35 melee_damage_lower = 8 diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 210a5e349d..4b169173ed 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -23,7 +23,7 @@ var/disabled = BODYPART_NOT_DISABLED //If disabled, limb is as good as missing var/body_damage_coeff = 1 //Multiplier of the limb's damage that gets applied to the mob - var/stam_damage_coeff = 0.5 + var/stam_damage_coeff = 0.75 var/brutestate = 0 var/burnstate = 0 var/brute_dam = 0 @@ -220,7 +220,7 @@ /obj/item/bodypart/proc/get_damage(include_stamina = FALSE) var/total = brute_dam + burn_dam if(include_stamina) - total += stamina_dam + total = max(total, stamina_dam) return total //Checks disabled status thresholds @@ -362,14 +362,14 @@ if(base_bp_icon != DEFAULT_BODYPART_ICON) color_src = MUTCOLORS //TODO - Add color matrix support to base limbs - if("legs" in S.default_features) + if(S.mutant_bodyparts["legs"]) if(body_zone == BODY_ZONE_L_LEG || body_zone == BODY_ZONE_R_LEG) if(DIGITIGRADE in S.species_traits) digitigrade_type = lowertext(H.dna.features["legs"]) else digitigrade_type = null - if("mam_body_markings" in S.default_features) + if(S.mutant_bodyparts["mam_body_markings"]) var/datum/sprite_accessory/Smark Smark = GLOB.mam_body_markings_list[H.dna.features["mam_body_markings"]] if(Smark) diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm index 65847042a1..63febd1a9f 100644 --- a/code/modules/surgery/organs/ears.dm +++ b/code/modules/surgery/organs/ears.dm @@ -100,16 +100,16 @@ ..() if(istype(H)) color = H.hair_color - H.dna.species.mutant_bodyparts |= "ears" - H.dna.features["ears"] = "Cat" + H.dna.species.mutant_bodyparts["mam_ears"] = "Cat" + H.dna.features["mam_ears"] = "Cat" H.update_body() /obj/item/organ/ears/cat/Remove(special = FALSE) if(!QDELETED(owner) && ishuman(owner)) var/mob/living/carbon/human/H = owner color = H.hair_color - H.dna.features["ears"] = "None" - H.dna.species.mutant_bodyparts -= "ears" + H.dna.features["mam_ears"] = "None" + H.dna.species.mutant_bodyparts -= "mam_ears" H.update_body() return ..() diff --git a/code/modules/surgery/organs/tails.dm b/code/modules/surgery/organs/tails.dm index fe881df221..55a656f42d 100644 --- a/code/modules/surgery/organs/tails.dm +++ b/code/modules/surgery/organs/tails.dm @@ -21,16 +21,16 @@ /obj/item/organ/tail/cat/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE) ..() if(istype(H)) - if(!("tail_human" in H.dna.species.mutant_bodyparts)) - H.dna.species.mutant_bodyparts |= "tail_human" - H.dna.features["tail_human"] = tail_type + if(!H.dna.species.mutant_bodyparts["mam_tail"]) + H.dna.species.mutant_bodyparts["mam_tail"] = tail_type + H.dna.features["mam_tail"] = tail_type H.update_body() /obj/item/organ/tail/cat/Remove(special = FALSE) if(!QDELETED(owner) && ishuman(owner)) var/mob/living/carbon/human/H = owner - H.dna.features["tail_human"] = "None" - H.dna.species.mutant_bodyparts -= "tail_human" + H.dna.features["mam_tail"] = "None" + H.dna.species.mutant_bodyparts -= "mam_tail" color = H.hair_color H.update_body() return ..() @@ -46,13 +46,13 @@ ..() if(istype(H)) // Checks here are necessary so it wouldn't overwrite the tail of a lizard it spawned in - if(!("tail_lizard" in H.dna.species.mutant_bodyparts)) + if(!H.dna.species.mutant_bodyparts["tail_lizard"]) H.dna.features["tail_lizard"] = tail_type - H.dna.species.mutant_bodyparts |= "tail_lizard" + H.dna.species.mutant_bodyparts["tail_lizard"] = tail_type - if(!("spines" in H.dna.species.mutant_bodyparts)) + if(!H.dna.species.mutant_bodyparts["spines"]) H.dna.features["spines"] = spines - H.dna.species.mutant_bodyparts |= "spines" + H.dna.species.mutant_bodyparts["spines"] = spines H.update_body() /obj/item/organ/tail/lizard/Remove(special = FALSE) diff --git a/code/modules/uplink/uplink_items/uplink_bundles.dm b/code/modules/uplink/uplink_items/uplink_bundles.dm index 2fc996c1ed..a748f49322 100644 --- a/code/modules/uplink/uplink_items/uplink_bundles.dm +++ b/code/modules/uplink/uplink_items/uplink_bundles.dm @@ -47,7 +47,7 @@ this suit proves to be cheaper than your standard issue hardsuit, with none of the movement restrictions (or the space proofing) of the outdated spacesuits employed by the company. \ Comes with an armored vest, helmet, blood-red sneaksuit, sneakboots, specialized combat gloves and a high-tech balaclava which obfuscates both your voice and your face. The case is also rather useful as a storage container and bludgeoning implement." item = /obj/item/storage/toolbox/infiltrator - cost = 3 + cost = 5 limited_stock = 1 //you only get one so you don't end up with too many gun cases exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) diff --git a/config/config.txt b/config/config.txt index 306d1d9a6d..fd5dc968fb 100644 --- a/config/config.txt +++ b/config/config.txt @@ -7,6 +7,7 @@ $include antag_rep.txt $include donator_groupings.txt $include dynamic_config.txt $include plushies/defines.txt +$include job_threats.txt # You can use the @ character at the beginning of a config option to lock it from being edited in-game # Example usage: diff --git a/config/job_threats.txt b/config/job_threats.txt new file mode 100644 index 0000000000..b3f0e2162d --- /dev/null +++ b/config/job_threats.txt @@ -0,0 +1,5 @@ +## Custom job threat values +## List of job titles followed by dynamic threat value, all prefixed with JOB_THREAT. See code/modules/jobs/job_types for titles +## e.g. +## JOB_THREAT Captain 5 +## JOB_THREAT Assistant 0.2 \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-11404.yml b/html/changelogs/AutoChangeLog-pr-11404.yml new file mode 100644 index 0000000000..18e0145b34 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11404.yml @@ -0,0 +1,8 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - balance: "torches take less staminda to use." + - balance: "Glowsticks dont last as long" + - balance: "Penlights are better at being lights" + - balance: "Torches are brighter then before - Indian Johns want to be on lava land rejoy!" + - balance: "Eye lights have 30% less light coming out of them." diff --git a/html/changelogs/AutoChangeLog-pr-11443.yml b/html/changelogs/AutoChangeLog-pr-11443.yml new file mode 100644 index 0000000000..d4b32df2eb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11443.yml @@ -0,0 +1,4 @@ +author: "kevinz000" +delete-after: True +changes: + - rscadd: "Melee attacks now stagger people, preventing them from sprinting until the (relatively short lived) effect runs out. Duration equation is [(1.5 + (w_class/7.5)) * force]." diff --git a/html/changelogs/AutoChangeLog-pr-11515.yml b/html/changelogs/AutoChangeLog-pr-11515.yml new file mode 100644 index 0000000000..63e6de4526 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11515.yml @@ -0,0 +1,8 @@ +author: "Putnam3145" +delete-after: True +changes: + - tweak: "Dynamic reworked to be more \"storyteller-like\": threat is now how threatened the station is right now and threat level is how much the mode wants the station to be threatened." + - tweak: "Random storyteller is now truly random." + - tweak: "Story storyteller now gives a nice rising-action-climax-falling action curve for threat level." + - tweak: "\"Chaotic\" storyteller now simply ramps up threat level as round goes on." + - rscadd: "\"Classic\" storyteller, basically doing what \"random\" did before." diff --git a/html/changelogs/AutoChangeLog-pr-11546.yml b/html/changelogs/AutoChangeLog-pr-11546.yml new file mode 100644 index 0000000000..260204e8e0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11546.yml @@ -0,0 +1,4 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - rscadd: "Ports over TG's Mortars and Pestles." diff --git a/html/changelogs/AutoChangeLog-pr-11555.yml b/html/changelogs/AutoChangeLog-pr-11555.yml new file mode 100644 index 0000000000..8eca88fa7b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11555.yml @@ -0,0 +1,4 @@ +author: "kevinz000" +delete-after: True +changes: + - balance: "Fireman carrying now makes the person being carried unable to use items. Piggybacking now slows down the person being ridden. In both cases, the person riding will be dazed when forcefully dismounted, and dazed for a second if dismounting from piggybacking" diff --git a/html/changelogs/AutoChangeLog-pr-11580.yml b/html/changelogs/AutoChangeLog-pr-11580.yml new file mode 100644 index 0000000000..4dd8e6daf3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11580.yml @@ -0,0 +1,5 @@ +author: "timothyteakettle" +delete-after: True +changes: + - rscadd: "new reagent 'Condensed Cooking Oil'" + - tweak: "list of chems that can go into fried non-food items was changed" diff --git a/html/changelogs/AutoChangeLog-pr-11585.yml b/html/changelogs/AutoChangeLog-pr-11585.yml new file mode 100644 index 0000000000..78390b808e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11585.yml @@ -0,0 +1,4 @@ +author: "kevinz000" +delete-after: True +changes: + - bugfix: "beams should no longer go across the map and mess everything up if their source or target isn't on a turf." diff --git a/html/changelogs/AutoChangeLog-pr-11589.yml b/html/changelogs/AutoChangeLog-pr-11589.yml new file mode 100644 index 0000000000..526d95b927 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11589.yml @@ -0,0 +1,6 @@ +author: "Ghommie" +delete-after: True +changes: + - refactor: "Made votes obfuscation settings more robust." + - admin: "Also included them in custom votes." + - tweak: "The map rotation vote will only hide ongoing votes now, not the results." diff --git a/html/changelogs/AutoChangeLog-pr-11590.yml b/html/changelogs/AutoChangeLog-pr-11590.yml new file mode 100644 index 0000000000..e8241cb0ec --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11590.yml @@ -0,0 +1,6 @@ +author: "timothyteakettle" +delete-after: True +changes: + - rscadd: "added beacon for cooks to choose an ingredient box, which replaces the random box they used to receive" + - rscadd: "added a new sushi ingredients box" + - rscadd: "added more items to the wildcard box's possible contents" diff --git a/html/changelogs/AutoChangeLog-pr-11591.yml b/html/changelogs/AutoChangeLog-pr-11591.yml new file mode 100644 index 0000000000..f2c06035f1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11591.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - bugfix: "insidious balaclava muzzlepsprite works" diff --git a/html/changelogs/AutoChangeLog-pr-11592.yml b/html/changelogs/AutoChangeLog-pr-11592.yml new file mode 100644 index 0000000000..a1667601eb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11592.yml @@ -0,0 +1,5 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Near-station nuclear explosions now display the on-station nuke explosion cinematic, consistently with its clearance of the station level and its nuclear victory / total annihilation ending status." + - balance: "Nuclear bombs can't be anchored in space areas (not just turfs) anymore, as a quick effortless way to discourage players from anchoring the device on the edge of the map." diff --git a/html/changelogs/AutoChangeLog-pr-11594.yml b/html/changelogs/AutoChangeLog-pr-11594.yml new file mode 100644 index 0000000000..f6de9ad977 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11594.yml @@ -0,0 +1,4 @@ +author: "Kraseo" +delete-after: True +changes: + - balance: "Sneaksuit now costs 5 TC rather than 3." diff --git a/html/changelogs/AutoChangeLog-pr-11595.yml b/html/changelogs/AutoChangeLog-pr-11595.yml new file mode 100644 index 0000000000..c604c1ac97 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11595.yml @@ -0,0 +1,4 @@ +author: "Detective-Google" +delete-after: True +changes: + - balance: "Shotguns are now slower and require two hands to fire." diff --git a/html/changelogs/AutoChangeLog-pr-11598.yml b/html/changelogs/AutoChangeLog-pr-11598.yml new file mode 100644 index 0000000000..46d0d73d6c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11598.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Fixed crafting hud icon overlapping the second pocket on 1:1 screen mode." diff --git a/html/changelogs/AutoChangeLog-pr-11600.yml b/html/changelogs/AutoChangeLog-pr-11600.yml new file mode 100644 index 0000000000..2c0c5e5a4f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11600.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - code_imp: "Removed some dead flightsuit code leftovers." diff --git a/html/changelogs/AutoChangeLog-pr-11601.yml b/html/changelogs/AutoChangeLog-pr-11601.yml new file mode 100644 index 0000000000..d327045d12 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11601.yml @@ -0,0 +1,4 @@ +author: "Kraseo" +delete-after: True +changes: + - bugfix: "You can break out of neckgrabs once more." diff --git a/html/changelogs/AutoChangeLog-pr-11602.yml b/html/changelogs/AutoChangeLog-pr-11602.yml new file mode 100644 index 0000000000..a2e3a1f8f3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11602.yml @@ -0,0 +1,4 @@ +author: "necromanceranne" +delete-after: True +changes: + - balance: "Several guns now shoot exactly where you click regardless of movement or turning." diff --git a/html/changelogs/AutoChangeLog-pr-11603.yml b/html/changelogs/AutoChangeLog-pr-11603.yml new file mode 100644 index 0000000000..56bf29fd55 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11603.yml @@ -0,0 +1,9 @@ +author: "KathrinBailey" +delete-after: True +changes: + - rscadd: "New shutter sprites" + - rscadd: "Reinforced Shutter" + - rscadd: "Radiation Shutter" + - rscadd: "Window Shutter" + - tweak: "Shutters not being blast doors functionally." + - balance: "Shutter armour block and health." diff --git a/html/changelogs/AutoChangeLog-pr-11605.yml b/html/changelogs/AutoChangeLog-pr-11605.yml new file mode 100644 index 0000000000..caa3cf5c92 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11605.yml @@ -0,0 +1,8 @@ +author: "necromanceranne" +delete-after: True +changes: + - balance: "HEALTH AND STAMINA DON'T STACK FOR PUTTING YOU INTO STAMINA CRIT." + - balance: "YOUR FISTS ARE HELLA GODDAMN STRONG." + - balance: "ACCEPT THE FELINIDS WARES, FOR SKOOMA HAS INCREDIBLE LETHAL PROPERTIES: YOUR HANDS BECOME LIKE SWORDS." + - balance: "BOXERS CAN ONLY KNOCK OUT OTHER BOXERS BECAUSE THEY HAVE HONOR OR SOME SHIT" + - balance: "INCREASED STAMINA DAMAGE TO LIMBS FROM 50% TO 75%." diff --git a/html/changelogs/AutoChangeLog-pr-11607.yml b/html/changelogs/AutoChangeLog-pr-11607.yml new file mode 100644 index 0000000000..46dac6a318 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11607.yml @@ -0,0 +1,5 @@ +author: "Ghommie" +delete-after: True +changes: + - rscadd: "Underwear now fulfills its purpose." + - rscadd: "Privates visibility preferences." diff --git a/html/changelogs/AutoChangeLog-pr-11610.yml b/html/changelogs/AutoChangeLog-pr-11610.yml new file mode 100644 index 0000000000..a3a7714f8f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11610.yml @@ -0,0 +1,4 @@ +author: "necromanceranne" +delete-after: True +changes: + - bugfix: "Russian Revolver can no longer be exploited for a free 357." diff --git a/html/changelogs/AutoChangeLog-pr-11619.yml b/html/changelogs/AutoChangeLog-pr-11619.yml new file mode 100644 index 0000000000..4fe72246c3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11619.yml @@ -0,0 +1,4 @@ +author: "necromanceranne" +delete-after: True +changes: + - bugfix: "Fixed limb damage calc" diff --git a/html/changelogs/AutoChangeLog-pr-11622.yml b/html/changelogs/AutoChangeLog-pr-11622.yml new file mode 100644 index 0000000000..f1976ce8ea --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11622.yml @@ -0,0 +1,5 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "mobs with antag statuses such as wizard, ert and nuke ops get their flavor text removed now." + - bugfix: "Fixed megafauna mobs, goliaths and \"anchored\" AIs being stuffable into closets." diff --git a/html/changelogs/AutoChangeLog-pr-11623.yml b/html/changelogs/AutoChangeLog-pr-11623.yml new file mode 100644 index 0000000000..69fe5dbc6e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11623.yml @@ -0,0 +1,4 @@ +author: "Bhijn" +delete-after: True +changes: + - rscadd: "Added a lfwb-inspired orbiting pixel + flashing outline animation to the sprint and combat mode buttons. This can be toggled via the preferences menu, and is completely independent from all HUD themes." diff --git a/html/changelogs/AutoChangeLog-pr-11630.yml b/html/changelogs/AutoChangeLog-pr-11630.yml new file mode 100644 index 0000000000..c65ecfe3bd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11630.yml @@ -0,0 +1,4 @@ +author: "bunny232" +delete-after: True +changes: + - bugfix: "Box secmos now is now longer connected to the scrubber loop" diff --git a/html/changelogs/AutoChangeLog-pr-11632.yml b/html/changelogs/AutoChangeLog-pr-11632.yml new file mode 100644 index 0000000000..01114f0772 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11632.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - tweak: "Chaplains are now inelegible for bloodsuckers." diff --git a/html/changelogs/AutoChangeLog-pr-11633.yml b/html/changelogs/AutoChangeLog-pr-11633.yml new file mode 100644 index 0000000000..87ba396950 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11633.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - tweak: "Blacklists unsynthetizable reagents from botany bees honey production." diff --git a/html/changelogs/AutoChangeLog-pr-11641.yml b/html/changelogs/AutoChangeLog-pr-11641.yml new file mode 100644 index 0000000000..27729e62e6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11641.yml @@ -0,0 +1,6 @@ +author: "Putnam3145" +delete-after: True +changes: + - rscdel: "Nymphomania removed" + - code_imp: "Exhibitionism ignored by preferences now, since it was also removed" + - code_imp: "Quirk migration now does an admin log instead of a stack trace" diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi index f1fafb8946..ea946f60d9 100644 Binary files a/icons/mob/screen_gen.dmi and b/icons/mob/screen_gen.dmi differ diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index b13e06e824..76094938e8 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ diff --git a/icons/obj/doors/shutters.dmi b/icons/obj/doors/shutters.dmi index a79e9889c9..6f10860cfa 100644 Binary files a/icons/obj/doors/shutters.dmi and b/icons/obj/doors/shutters.dmi differ diff --git a/icons/obj/doors/shutters_old.dmi b/icons/obj/doors/shutters_old.dmi new file mode 100644 index 0000000000..57ac75d251 Binary files /dev/null and b/icons/obj/doors/shutters_old.dmi differ diff --git a/icons/obj/doors/shutters_radiation.dmi b/icons/obj/doors/shutters_radiation.dmi new file mode 100644 index 0000000000..36d232b197 Binary files /dev/null and b/icons/obj/doors/shutters_radiation.dmi differ diff --git a/icons/obj/doors/shutters_window.dmi b/icons/obj/doors/shutters_window.dmi new file mode 100644 index 0000000000..20197593c1 Binary files /dev/null and b/icons/obj/doors/shutters_window.dmi differ diff --git a/modular_citadel/code/_onclick/hud/screen_objects.dm b/modular_citadel/code/_onclick/hud/screen_objects.dm index bcb44af84b..2101a6045f 100644 --- a/modular_citadel/code/_onclick/hud/screen_objects.dm +++ b/modular_citadel/code/_onclick/hud/screen_objects.dm @@ -12,6 +12,7 @@ name = "toggle combat mode" icon = 'modular_citadel/icons/ui/screen_midnight.dmi' icon_state = "combat_off" + var/mutable_appearance/flashy /obj/screen/combattoggle/Click() if(iscarbon(usr)) @@ -29,6 +30,19 @@ else icon_state = "combat_off" +/obj/screen/combattoggle/update_overlays() + . = ..() + var/mob/living/carbon/user = hud?.mymob + if(!istype(user) || !user.client) + return + + if((user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE) && user.client.prefs.hud_toggle_flash) + if(!flashy) + flashy = mutable_appearance('icons/mob/screen_gen.dmi', "togglefull_flash") + if(flashy.color != user.client.prefs.hud_toggle_color) + flashy.color = user.client.prefs.hud_toggle_color + . += flashy //TODO - beg lummox jr for the ability to force mutable appearances or images to be created rendering from their first frame of animation rather than being based entirely around the client's frame count + /obj/screen/voretoggle name = "toggle vore mode" icon = 'modular_citadel/icons/ui/screen_midnight.dmi' diff --git a/modular_citadel/code/_onclick/hud/sprint.dm b/modular_citadel/code/_onclick/hud/sprint.dm index 7199f0286e..89547c0feb 100644 --- a/modular_citadel/code/_onclick/hud/sprint.dm +++ b/modular_citadel/code/_onclick/hud/sprint.dm @@ -6,6 +6,7 @@ icon = 'modular_citadel/icons/ui/screen_midnight.dmi' icon_state = "act_sprint" layer = ABOVE_HUD_LAYER - 0.1 + var/mutable_appearance/flashy /obj/screen/sprintbutton/Click() if(ishuman(usr)) @@ -23,6 +24,19 @@ else icon_state = "act_sprint" +/obj/screen/sprintbutton/update_overlays() + . = ..() + var/mob/living/carbon/user = hud?.mymob + if(!istype(user) || !user.client) + return + + if((user.combat_flags & COMBAT_FLAG_SPRINT_ACTIVE) && user.client.prefs.hud_toggle_flash) + if(!flashy) + flashy = mutable_appearance('icons/mob/screen_gen.dmi', "togglehalf_flash") + if(flashy.color != user.client.prefs.hud_toggle_color) + flashy.color = user.client.prefs.hud_toggle_color + . += flashy + //Sprint buffer onscreen code. /datum/hud/var/obj/screen/sprint_buffer/sprint_buffer diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm index 5c7d5a39e9..843672877e 100644 --- a/modular_citadel/code/modules/arousal/arousal.dm +++ b/modular_citadel/code/modules/arousal/arousal.dm @@ -33,7 +33,7 @@ hidden_underwear = on_off hidden_socks = on_off - update_body() + update_body(TRUE) /mob/living/carbon/human/proc/adjust_arousal(strength,aphro = FALSE,maso = FALSE) // returns all genitals that were adjust diff --git a/modular_citadel/code/modules/arousal/genitals.dm b/modular_citadel/code/modules/arousal/genitals.dm index 6f0588f76e..7705dcafd1 100644 --- a/modular_citadel/code/modules/arousal/genitals.dm +++ b/modular_citadel/code/modules/arousal/genitals.dm @@ -41,6 +41,9 @@ return update_size() update_appearance() + if(genital_flags & UPDATE_OWNER_APPEARANCE && owner && ishuman(owner)) + var/mob/living/carbon/human/H = owner + H.update_genitals() if(linked_organ_slot || (linked_organ && !owner)) update_link() @@ -49,9 +52,16 @@ var/list/exposed_genitals = list() //Keeping track of them so we don't have to iterate through every genitalia and see if exposed /obj/item/organ/genital/proc/is_exposed() - if(!owner || CHECK_BITFIELD(genital_flags, GENITAL_INTERNAL) || CHECK_BITFIELD(genital_flags, GENITAL_HIDDEN)) + if(!owner || genital_flags & (GENITAL_INTERNAL|GENITAL_HIDDEN)) return FALSE - if(CHECK_BITFIELD(genital_flags, GENITAL_THROUGH_CLOTHES)) + if(genital_flags & GENITAL_UNDIES_HIDDEN && ishuman(owner)) + var/mob/living/carbon/human/H = owner + if(!(NO_UNDERWEAR in H.dna.species.species_traits)) + var/datum/sprite_accessory/underwear/top/T = H.hidden_undershirt ? null : GLOB.undershirt_list[H.undershirt] + var/datum/sprite_accessory/underwear/bottom/B = H.hidden_underwear ? null : GLOB.underwear_list[H.underwear] + if(zone == BODY_ZONE_CHEST ? (T?.covers_chest || B?.covers_chest) : (T?.covers_groin || B?.covers_groin)) + return FALSE + if(genital_flags & GENITAL_THROUGH_CLOTHES) return TRUE switch(zone) //update as more genitals are added @@ -60,25 +70,21 @@ if(BODY_ZONE_PRECISE_GROIN) return owner.is_groin_exposed() -/obj/item/organ/genital/proc/toggle_visibility(visibility) +/obj/item/organ/genital/proc/toggle_visibility(visibility, update = TRUE) + genital_flags &= ~(GENITAL_THROUGH_CLOTHES|GENITAL_HIDDEN|GENITAL_UNDIES_HIDDEN) + if(owner) + owner.exposed_genitals -= src switch(visibility) - if("Always visible") - ENABLE_BITFIELD(genital_flags, GENITAL_THROUGH_CLOTHES) - DISABLE_BITFIELD(genital_flags, GENITAL_HIDDEN) - if(!(src in owner.exposed_genitals)) + if(GEN_VISIBLE_ALWAYS) + genital_flags |= GENITAL_THROUGH_CLOTHES + if(owner) owner.exposed_genitals += src - if("Hidden by clothes") - DISABLE_BITFIELD(genital_flags, GENITAL_THROUGH_CLOTHES) - DISABLE_BITFIELD(genital_flags, GENITAL_HIDDEN) - if(src in owner.exposed_genitals) - owner.exposed_genitals -= src - if("Always hidden") - DISABLE_BITFIELD(genital_flags, GENITAL_THROUGH_CLOTHES) - ENABLE_BITFIELD(genital_flags, GENITAL_HIDDEN) - if(src in owner.exposed_genitals) - owner.exposed_genitals -= src + if(GEN_VISIBLE_NO_UNDIES) + genital_flags |= GENITAL_UNDIES_HIDDEN + if(GEN_VISIBLE_NEVER) + genital_flags |= GENITAL_HIDDEN - if(ishuman(owner)) //recast to use update genitals proc + if(update && owner && ishuman(owner)) //recast to use update genitals proc var/mob/living/carbon/human/H = owner H.update_genitals() @@ -87,6 +93,10 @@ set name = "Expose/Hide genitals" set desc = "Allows you to toggle which genitals should show through clothes or not." + if(stat != CONSCIOUS) + to_chat(usr, "You can toggle genitals visibility right now...") + return + var/list/genital_list = list() for(var/obj/item/organ/genital/G in internal_organs) if(!CHECK_BITFIELD(G.genital_flags, GENITAL_INTERNAL)) @@ -95,10 +105,11 @@ return //Full list of exposable genitals created var/obj/item/organ/genital/picked_organ - picked_organ = input(src, "Choose which genitalia to expose/hide", "Expose/Hide genitals", null) in genital_list - if(picked_organ) - var/picked_visibility = input(src, "Choose visibility setting", "Expose/Hide genitals", "Hidden by clothes") in list("Always visible", "Hidden by clothes", "Always hidden") - picked_organ.toggle_visibility(picked_visibility) + picked_organ = input(src, "Choose which genitalia to expose/hide", "Expose/Hide genitals") as null|anything in genital_list + if(picked_organ && (picked_organ in internal_organs)) + var/picked_visibility = input(src, "Choose visibility setting", "Expose/Hide genitals") as null|anything in GLOB.genitals_visibility_toggles + if(picked_visibility && picked_organ && (picked_organ in internal_organs)) + picked_organ.toggle_visibility(picked_visibility) return /mob/living/carbon/verb/toggle_arousal_state() @@ -182,14 +193,19 @@ if(.) update() RegisterSignal(owner, COMSIG_MOB_DEATH, .proc/update_appearance) + if(genital_flags & GENITAL_THROUGH_CLOTHES) + owner.exposed_genitals += src /obj/item/organ/genital/Remove(special = FALSE) . = ..() - var/mob/living/carbon/human/H = . + var/mob/living/carbon/C = . update() - if(!QDELETED(H)) - UnregisterSignal(H, COMSIG_MOB_DEATH) - H.update_genitals() + if(!QDELETED(C)) + if(genital_flags & UPDATE_OWNER_APPEARANCE && ishuman(C)) + var/mob/living/carbon/human/H = . + H.update_genitals() + C.exposed_genitals -= src + UnregisterSignal(C, COMSIG_MOB_DEATH) //proc to give a player their genitals and stuff when they log in /mob/living/carbon/human/proc/give_genitals(clean = FALSE)//clean will remove all pre-existing genitals. proc will then give them any genitals that are enabled in their DNA @@ -306,9 +322,9 @@ genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size][dna.species.use_skintones ? "_s" : ""]_[aroused_state]_[layertext]" - if(layers_num[layer] == GENITALS_FRONT_LAYER && CHECK_BITFIELD(G.genital_flags, GENITAL_THROUGH_CLOTHES)) + if(layers_num[layer] == GENITALS_FRONT_LAYER && G.genital_flags & GENITAL_THROUGH_CLOTHES) genital_overlay.layer = -GENITALS_EXPOSED_LAYER - LAZYADD(fully_exposed, genital_overlay) // to be added to a layer with higher priority than clothes, hence the name of the bitflag. + LAZYADD(fully_exposed, genital_overlay) else genital_overlay.layer = -layers_num[layer] standing += genital_overlay diff --git a/modular_citadel/code/modules/arousal/genitals_sprite_accessories.dm b/modular_citadel/code/modules/arousal/genitals_sprite_accessories.dm index 07453facdf..92c643c4bd 100644 --- a/modular_citadel/code/modules/arousal/genitals_sprite_accessories.dm +++ b/modular_citadel/code/modules/arousal/genitals_sprite_accessories.dm @@ -74,13 +74,9 @@ name = "testicle" //the preview name of the accessory color_src = "balls_color" -/datum/sprite_accessory/testicles/hidden - icon_state = "none" - name = "Hidden" - /datum/sprite_accessory/testicles/single icon_state = "single" - name = "Single" + name = "Single" //Single as "single pair", for clarity. //Vaginas /datum/sprite_accessory/vagina diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index bfa506da6d..8183ba92bc 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -12,7 +12,7 @@ fluid_id = /datum/reagent/consumable/milk fluid_rate = MILK_RATE shape = DEF_BREASTS_SHAPE - genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_FUID_PRODUCTION|GENITAL_CAN_AROUSE + genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_FUID_PRODUCTION|GENITAL_CAN_AROUSE|UPDATE_OWNER_APPEARANCE|GENITAL_UNDIES_HIDDEN masturbation_verb = "massage" arousal_verb = "Your breasts start feeling sensitive" unarousal_verb = "Your breasts no longer feel sensitive" @@ -64,9 +64,6 @@ icon_state += "_s" else color = "#[owner.dna.features["breasts_color"]]" - if(ishuman(owner)) - var/mob/living/carbon/human/H = owner - H.update_genitals() //Allows breasts to grow and change size, with sprite changes too. //maximum wah @@ -133,6 +130,7 @@ cached_size = size size = breast_values[size] prev_size = cached_size + toggle_visibility(D.features["breasts_visibility"], FALSE) #undef BREASTS_ICON_MIN_SIZE #undef BREASTS_ICON_MAX_SIZE \ No newline at end of file diff --git a/modular_citadel/code/modules/arousal/organs/penis.dm b/modular_citadel/code/modules/arousal/organs/penis.dm index 294ac6c877..ded05134a9 100644 --- a/modular_citadel/code/modules/arousal/organs/penis.dm +++ b/modular_citadel/code/modules/arousal/organs/penis.dm @@ -8,7 +8,7 @@ masturbation_verb = "stroke" arousal_verb = "You pop a boner" unarousal_verb = "Your boner goes down" - genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_CAN_AROUSE + genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_CAN_AROUSE|UPDATE_OWNER_APPEARANCE|GENITAL_UNDIES_HIDDEN linked_organ_slot = ORGAN_SLOT_TESTICLES fluid_transfer_factor = 0.5 shape = DEF_COCK_SHAPE @@ -66,9 +66,9 @@ if(owner) if (round(length) > round(prev_length)) - to_chat(owner, "Your [pick(GLOB.gentlemans_organ_names)] [pick("swells up to", "flourishes into", "expands into", "bursts forth into", "grows eagerly into", "amplifys into")] a [uppertext(round(length))] inch penis.") + to_chat(owner, "Your [pick(GLOB.dick_nouns)] [pick("swells up to", "flourishes into", "expands into", "bursts forth into", "grows eagerly into", "amplifys into")] a [uppertext(round(length))] inch penis.") else if ((round(length) < round(prev_length)) && (length > 0.5)) - to_chat(owner, "Your [pick(GLOB.gentlemans_organ_names)] [pick("shrinks down to", "decreases into", "diminishes into", "deflates into", "shrivels regretfully into", "contracts into")] a [uppertext(round(length))] inch penis.") + to_chat(owner, "Your [pick(GLOB.dick_nouns)] [pick("shrinks down to", "decreases into", "diminishes into", "deflates into", "shrivels regretfully into", "contracts into")] a [uppertext(round(length))] inch penis.") icon_state = sanitize_text("penis_[shape]_[size]") diameter = (length * diameter_ratio)//Is it just me or is this ludicous, why not make it exponentially decay? @@ -89,9 +89,6 @@ icon_state += "_s" else color = "#[owner.dna.features["cock_color"]]" - if(ishuman(owner)) - var/mob/living/carbon/human/H = owner - H.update_genitals() /obj/item/organ/genital/penis/get_features(mob/living/carbon/human/H) var/datum/dna/D = H.dna @@ -103,3 +100,4 @@ diameter_ratio = D.features["cock_diameter_ratio"] shape = D.features["cock_shape"] prev_length = length + toggle_visibility(D.features["cock_visibility"], FALSE) \ No newline at end of file diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm index cf4480ff1f..4264cf5e48 100644 --- a/modular_citadel/code/modules/arousal/organs/testicles.dm +++ b/modular_citadel/code/modules/arousal/organs/testicles.dm @@ -9,7 +9,7 @@ arousal_verb = "Your balls ache a little" unarousal_verb = "Your balls finally stop aching, again" linked_organ_slot = ORGAN_SLOT_PENIS - genital_flags = CAN_MASTURBATE_WITH|MASTURBATE_LINKED_ORGAN|GENITAL_FUID_PRODUCTION + genital_flags = CAN_MASTURBATE_WITH|MASTURBATE_LINKED_ORGAN|GENITAL_FUID_PRODUCTION|UPDATE_OWNER_APPEARANCE|GENITAL_UNDIES_HIDDEN var/size_name = "average" shape = DEF_BALLS_SHAPE fluid_id = /datum/reagent/consumable/semen @@ -53,9 +53,6 @@ icon_state += "_s" else color = "#[owner.dna.features["balls_color"]]" - if(ishuman(owner)) - var/mob/living/carbon/human/H = owner - H.update_genitals() /obj/item/organ/genital/testicles/get_features(mob/living/carbon/human/H) var/datum/dna/D = H.dna @@ -64,8 +61,7 @@ else color = "#[D.features["balls_color"]]" shape = D.features["balls_shape"] - if(D.features["balls_shape"] == "Hidden") - ENABLE_BITFIELD(genital_flags, GENITAL_INTERNAL) fluid_rate = D.features["balls_cum_rate"] fluid_mult = D.features["balls_cum_mult"] fluid_efficiency = D.features["balls_efficiency"] + toggle_visibility(D.features["balls_visibility"], FALSE) \ No newline at end of file diff --git a/modular_citadel/code/modules/arousal/organs/vagina.dm b/modular_citadel/code/modules/arousal/organs/vagina.dm index 91c3b8b8e9..f7e8eddcbd 100644 --- a/modular_citadel/code/modules/arousal/organs/vagina.dm +++ b/modular_citadel/code/modules/arousal/organs/vagina.dm @@ -7,7 +7,7 @@ slot = "vagina" size = 1 //There is only 1 size right now shape = DEF_VAGINA_SHAPE - genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_CAN_AROUSE + genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_CAN_AROUSE|GENITAL_UNDIES_HIDDEN masturbation_verb = "finger" arousal_verb = "You feel wetness on your crotch" unarousal_verb = "You no longer feel wet" @@ -70,3 +70,4 @@ else color = "[D.features["vag_color"]]" shape = "[D.features["vag_shape"]]" + toggle_visibility(D.features["vag_visibility"], FALSE) diff --git a/modular_citadel/code/modules/client/preferences.dm b/modular_citadel/code/modules/client/preferences.dm index f1dbe31d02..8c55f2d9a8 100644 --- a/modular_citadel/code/modules/client/preferences.dm +++ b/modular_citadel/code/modules/client/preferences.dm @@ -45,9 +45,3 @@ else if(L[slot_to_string(slot)] < DEFAULT_SLOT_AMT) return TRUE - -/datum/preferences/copy_to(mob/living/carbon/human/character, icon_updates = 1) - ..() - character.give_genitals(TRUE) - if(icon_updates) - character.update_genitals() diff --git a/modular_citadel/code/modules/client/preferences_savefile.dm b/modular_citadel/code/modules/client/preferences_savefile.dm index 80e20c9f48..d9b902656f 100644 --- a/modular_citadel/code/modules/client/preferences_savefile.dm +++ b/modular_citadel/code/modules/client/preferences_savefile.dm @@ -44,29 +44,6 @@ WRITE_FILE(S["feature_xeno_tail"], features["xenotail"]) WRITE_FILE(S["feature_xeno_dors"], features["xenodorsal"]) WRITE_FILE(S["feature_xeno_head"], features["xenohead"]) - //cock features - WRITE_FILE(S["feature_has_cock"], features["has_cock"]) - WRITE_FILE(S["feature_cock_shape"], features["cock_shape"]) - WRITE_FILE(S["feature_cock_color"], features["cock_color"]) - WRITE_FILE(S["feature_cock_length"], features["cock_length"]) - WRITE_FILE(S["feature_cock_girth"], features["cock_girth"]) - //balls features - WRITE_FILE(S["feature_has_balls"], features["has_balls"]) - WRITE_FILE(S["feature_balls_color"], features["balls_color"]) - WRITE_FILE(S["feature_balls_size"], features["balls_size"]) - WRITE_FILE(S["feature_balls_shape"], features["balls_shape"]) - //breasts features - WRITE_FILE(S["feature_has_breasts"], features["has_breasts"]) - WRITE_FILE(S["feature_breasts_size"], features["breasts_size"]) - WRITE_FILE(S["feature_breasts_shape"], features["breasts_shape"]) - WRITE_FILE(S["feature_breasts_color"], features["breasts_color"]) - WRITE_FILE(S["feature_breasts_producing"], features["breasts_producing"]) - //vagina features - WRITE_FILE(S["feature_has_vag"], features["has_vag"]) - WRITE_FILE(S["feature_vag_shape"], features["vag_shape"]) - WRITE_FILE(S["feature_vag_color"], features["vag_color"]) - //womb features - WRITE_FILE(S["feature_has_womb"], features["has_womb"]) //flavor text WRITE_FILE(S["feature_flavor_text"], features["flavor_text"]) diff --git a/modular_citadel/code/modules/clothing/spacesuits/flightsuit.dm b/modular_citadel/code/modules/clothing/spacesuits/flightsuit.dm deleted file mode 100644 index 44bb1f3473..0000000000 --- a/modular_citadel/code/modules/clothing/spacesuits/flightsuit.dm +++ /dev/null @@ -1,9 +0,0 @@ - -/obj/item/flightpack - armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 20, "fire" = 20, "acid" = 20) - -/obj/item/clothing/suit/space/hardsuit/flightsuit - armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 20, "fire" = 20, "acid" = 20) - -/obj/item/clothing/head/helmet/space/hardsuit/flightsuit - armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 20, "fire" = 20, "acid" = 20) \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 1c0716d0e7..2800b55b00 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3258,7 +3258,6 @@ #include "modular_citadel\code\modules\client\verbs\who.dm" #include "modular_citadel\code\modules\clothing\neck.dm" #include "modular_citadel\code\modules\clothing\trek.dm" -#include "modular_citadel\code\modules\clothing\spacesuits\flightsuit.dm" #include "modular_citadel\code\modules\clothing\suits\polychromic_cloaks.dm" #include "modular_citadel\code\modules\clothing\suits\suits.dm" #include "modular_citadel\code\modules\custom_loadout\custom_items.dm"