From 8ce7ac885429909ed061c43b34e49ca87ede044a Mon Sep 17 00:00:00 2001 From: Seris02 Date: Tue, 14 Jan 2020 22:10:41 +0800 Subject: [PATCH 01/18] custom reagent creampie --- code/__DEFINES/admin.dm | 1 + code/modules/admin/verbs/randomverbs.dm | 32 ++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index 3acd1443af..268a367e2a 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -73,6 +73,7 @@ #define ADMIN_PUNISHMENT_SUPPLYPOD "Supply Pod" #define ADMIN_PUNISHMENT_MAZING "Puzzle" #define ADMIN_PUNISHMENT_PIE "Cream Pie" +#define ADMIN_PUNISHMENT_CUSTOM_PIE "Custom Cream Pie" #define AHELP_ACTIVE 1 #define AHELP_CLOSED 2 diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 1437555af1..e05f4ee255 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1249,7 +1249,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits if(!check_rights(R_ADMIN) || !check_rights(R_FUN)) return - var/list/punishment_list = list(ADMIN_PUNISHMENT_PIE, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_SUPPLYPOD_QUICK, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING, ADMIN_PUNISHMENT_ROD) + var/list/punishment_list = list(ADMIN_PUNISHMENT_PIE, ADMIN_PUNISHMENT_CUSTOM_PIE, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_SUPPLYPOD_QUICK, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING, ADMIN_PUNISHMENT_ROD) var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in punishment_list @@ -1314,6 +1314,36 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits if(ADMIN_PUNISHMENT_PIE) var/obj/item/reagent_containers/food/snacks/pie/cream/nostun/creamy = new(get_turf(target)) creamy.splat(target) + if (ADMIN_PUNISHMENT_CUSTOM_PIE) + var/obj/item/reagent_containers/food/snacks/pie/cream/nostun/A = new(get_turf(target)) + if(!A.reagents) + var/amount = input(usr, "Specify the reagent size of [A]", "Set Reagent Size", 50) as num + if(amount) + A.create_reagents(amount) + if(A.reagents) + var/chosen_id + switch(alert(usr, "Choose a method.", "Add Reagents", "Search", "Choose from a list")) + if("Search") + var/valid_id + while(!valid_id) + chosen_id = input(usr, "Enter the ID of the reagent you want to add.", "Search reagents") as null|text + if(isnull(chosen_id)) //Get me out of here! + break + if(!ispath(text2path(chosen_id))) + chosen_id = pick_closest_path(chosen_id, make_types_fancy(subtypesof(/datum/reagent))) + if(ispath(chosen_id)) + valid_id = TRUE + else + valid_id = TRUE + if(!valid_id) + to_chat(usr, "A reagent with that ID doesn't exist!") + if("Choose from a list") + chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in subtypesof(/datum/reagent) + if(chosen_id) + var/amount = input(usr, "Choose the amount to add.", "Choose the amount.", A.reagents.maximum_volume) as num + if(amount) + A.reagents.add_reagent(chosen_id, amount) + A.splat(target) punish_log(target, punishment) From 0ea3e275e33843e93f702ad4a46aba5f140bbd56 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Sun, 19 Jan 2020 16:54:46 +0800 Subject: [PATCH 02/18] yep --- code/__HELPERS/reagents.dm | 21 +++++++++++++++++++++ code/datums/datumvars.dm | 21 +-------------------- code/modules/admin/verbs/randomverbs.dm | 19 +------------------ 3 files changed, 23 insertions(+), 38 deletions(-) diff --git a/code/__HELPERS/reagents.dm b/code/__HELPERS/reagents.dm index f1208abdd3..49d6b5825e 100644 --- a/code/__HELPERS/reagents.dm +++ b/code/__HELPERS/reagents.dm @@ -72,3 +72,24 @@ if(!GLOB.chemical_reactions_list[primary_reagent]) GLOB.chemical_reactions_list[primary_reagent] = list() GLOB.chemical_reactions_list[primary_reagent] += R + +/proc/choose_reagent_id(mob/user) + var/chosen_id + switch(alert(user, "Choose a method.", "Add Reagents", "Search", "Choose from a list")) + if("Search") + var/valid_id + while(!valid_id) + chosen_id = input(user, "Enter the ID of the reagent you want to add.", "Search reagents") as null|text + if(isnull(chosen_id)) //Get me out of here! + break + if(!ispath(text2path(chosen_id))) + chosen_id = pick_closest_path(chosen_id, make_types_fancy(subtypesof(/datum/reagent))) + if(ispath(chosen_id)) + valid_id = TRUE + else + valid_id = TRUE + if(!valid_id) + to_chat(user, "A reagent with that ID doesn't exist!") + if("Choose from a list") + chosen_id = input(user, "Choose a reagent to add.", "Choose a reagent.") as null|anything in subtypesof(/datum/reagent) + return chosen_id \ No newline at end of file diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 5caa491e4c..26a0ba71b3 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -946,26 +946,7 @@ A.create_reagents(amount) if(A.reagents) - var/chosen_id - switch(alert(usr, "Choose a method.", "Add Reagents", "Search", "Choose from a list", "I'm feeling lucky")) - if("Search") - var/valid_id - while(!valid_id) - chosen_id = input(usr, "Enter the ID of the reagent you want to add.", "Search reagents") as null|text - if(isnull(chosen_id)) //Get me out of here! - break - if(!ispath(text2path(chosen_id))) - chosen_id = pick_closest_path(chosen_id, make_types_fancy(subtypesof(/datum/reagent))) - if(ispath(chosen_id)) - valid_id = TRUE - else - valid_id = TRUE - if(!valid_id) - to_chat(usr, "A reagent with that ID doesn't exist!") - if("Choose from a list") - chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in subtypesof(/datum/reagent) - if("I'm feeling lucky") - chosen_id = pick(subtypesof(/datum/reagent)) + var/chosen_id = choose_reagent_id(usr) if(chosen_id) var/amount = input(usr, "Choose the amount to add.", "Choose the amount.", A.reagents.maximum_volume) as num if(amount) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index e05f4ee255..8b20eabb1b 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1321,24 +1321,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits if(amount) A.create_reagents(amount) if(A.reagents) - var/chosen_id - switch(alert(usr, "Choose a method.", "Add Reagents", "Search", "Choose from a list")) - if("Search") - var/valid_id - while(!valid_id) - chosen_id = input(usr, "Enter the ID of the reagent you want to add.", "Search reagents") as null|text - if(isnull(chosen_id)) //Get me out of here! - break - if(!ispath(text2path(chosen_id))) - chosen_id = pick_closest_path(chosen_id, make_types_fancy(subtypesof(/datum/reagent))) - if(ispath(chosen_id)) - valid_id = TRUE - else - valid_id = TRUE - if(!valid_id) - to_chat(usr, "A reagent with that ID doesn't exist!") - if("Choose from a list") - chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in subtypesof(/datum/reagent) + var/chosen_id = choose_reagent_id(usr) if(chosen_id) var/amount = input(usr, "Choose the amount to add.", "Choose the amount.", A.reagents.maximum_volume) as num if(amount) From 41a3dc64d552a2fee323f980e2b080c6529e353a Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 29 Jan 2020 16:44:01 -0600 Subject: [PATCH 03/18] what --- code/modules/mining/equipment/explorer_gear.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index 09bd774a6a..5165d95340 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -70,7 +70,7 @@ item_state = "hostile_env" clothing_flags = THICKMATERIAL //not spaceproof max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - resistance_flags = FIRE_PROOF | LAVA_PROOF + resistance_flags = FIRE_PROOF | LAVA_PROOF | ACID_PROOF | GOLIATH_RESISTANCE mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC slowdown = 0 armor = list("melee" = 70, "bullet" = 40, "laser" = 10, "energy" = 10, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) From 0f4e30c2db86f5cf006a8661ed098d761804cd20 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 29 Jan 2020 16:13:29 -0700 Subject: [PATCH 04/18] Update crayons.dm --- code/game/objects/items/crayons.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index cb77a58769..a3d2200eba 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -619,8 +619,7 @@ is_capped = TRUE self_contained = FALSE // Don't disappear when they're empty can_change_colour = TRUE - gang = TRUE //Gang check is true for all things upon the honored hierarchy of spraycans, except those that are FALSE. - + reagent_contents = list(/datum/reagent/fuel = 1, /datum/reagent/consumable/ethanol = 1) pre_noise = TRUE @@ -774,7 +773,6 @@ icon_capped = "deathcan2_cap" icon_uncapped = "deathcan2" use_overlays = FALSE - gang = FALSE volume_multiplier = 25 charges = 100 @@ -789,7 +787,6 @@ icon_capped = "clowncan2_cap" icon_uncapped = "clowncan2" use_overlays = FALSE - gang = FALSE reagent_contents = list(/datum/reagent/lube = 1, /datum/reagent/consumable/banana = 1) volume_multiplier = 5 @@ -804,7 +801,6 @@ icon_capped = "mimecan_cap" icon_uncapped = "mimecan" use_overlays = FALSE - gang = FALSE can_change_colour = FALSE paint_color = "#FFFFFF" //RGB From 58b969b8c6a6dd30517d6cdd26cfd2d65c83ba3b Mon Sep 17 00:00:00 2001 From: r4d6 Date: Wed, 29 Jan 2020 20:34:57 -0500 Subject: [PATCH 05/18] Update RPD.dm --- code/game/objects/items/RPD.dm | 68 +++++++++++++++++----------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 8df1ae49de..12793df842 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -7,35 +7,35 @@ RPD #define DISPOSALS_CATEGORY 1 #define TRANSIT_CATEGORY 2 -#define BUILD_MODE 1 -#define WRENCH_MODE 2 -#define DESTROY_MODE 4 -#define PAINT_MODE 8 +#define BUILD_MODE (1<<0) +#define WRENCH_MODE (1<<1) +#define DESTROY_MODE (1<<2) +#define PAINT_MODE (1<<3) GLOBAL_LIST_INIT(atmos_pipe_recipes, list( "Pipes" = list( new /datum/pipe_info/pipe("Pipe", /obj/machinery/atmospherics/pipe/simple), new /datum/pipe_info/pipe("Manifold", /obj/machinery/atmospherics/pipe/manifold), - new /datum/pipe_info/pipe("Manual Valve", /obj/machinery/atmospherics/components/binary/valve), - new /datum/pipe_info/pipe("Digital Valve", /obj/machinery/atmospherics/components/binary/valve/digital), - new /datum/pipe_info/pipe("Relief Valve", /obj/machinery/atmospherics/components/binary/relief_valve), new /datum/pipe_info/pipe("4-Way Manifold", /obj/machinery/atmospherics/pipe/manifold4w), new /datum/pipe_info/pipe("Layer Manifold", /obj/machinery/atmospherics/pipe/layer_manifold), ), "Devices" = list( new /datum/pipe_info/pipe("Connector", /obj/machinery/atmospherics/components/unary/portables_connector), - new /datum/pipe_info/pipe("Unary Vent", /obj/machinery/atmospherics/components/unary/vent_pump), - new /datum/pipe_info/pipe("Relief Valve", /obj/machinery/atmospherics/components/unary/relief_valve), new /datum/pipe_info/pipe("Gas Pump", /obj/machinery/atmospherics/components/binary/pump), - new /datum/pipe_info/pipe("Passive Gate", /obj/machinery/atmospherics/components/binary/passive_gate), new /datum/pipe_info/pipe("Volume Pump", /obj/machinery/atmospherics/components/binary/volume_pump), - new /datum/pipe_info/pipe("Scrubber", /obj/machinery/atmospherics/components/unary/vent_scrubber), - new /datum/pipe_info/pipe("Injector", /obj/machinery/atmospherics/components/unary/outlet_injector), - new /datum/pipe_info/meter("Meter"), new /datum/pipe_info/pipe("Gas Filter", /obj/machinery/atmospherics/components/trinary/filter), new /datum/pipe_info/pipe("Gas Mixer", /obj/machinery/atmospherics/components/trinary/mixer), + new /datum/pipe_info/pipe("Passive Gate", /obj/machinery/atmospherics/components/binary/passive_gate), + new /datum/pipe_info/pipe("Injector", /obj/machinery/atmospherics/components/unary/outlet_injector), + new /datum/pipe_info/pipe("Scrubber", /obj/machinery/atmospherics/components/unary/vent_scrubber), + new /datum/pipe_info/pipe("Unary Vent", /obj/machinery/atmospherics/components/unary/vent_pump), new /datum/pipe_info/pipe("Passive Vent", /obj/machinery/atmospherics/components/unary/passive_vent), + new /datum/pipe_info/pipe("Manual Valve", /obj/machinery/atmospherics/components/binary/valve), + new /datum/pipe_info/pipe("Digital Valve", /obj/machinery/atmospherics/components/binary/valve/digital), + new /datum/pipe_info/pipe("Relief Valve (Binary)", /obj/machinery/atmospherics/components/binary/relief_valve), + new /datum/pipe_info/pipe("Relief Valve (Unary)", /obj/machinery/atmospherics/components/unary/relief_valve), + new /datum/pipe_info/meter("Meter"), ), "Heat Exchange" = list( new /datum/pipe_info/pipe("Pipe", /obj/machinery/atmospherics/pipe/heat_exchanging/simple), @@ -102,22 +102,22 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( dirs = list("[NORTH]" = "Vertical", "[EAST]" = "Horizontal") if(dirtype == PIPE_BENDABLE) dirs += list("[NORTHWEST]" = "West to North", "[NORTHEAST]" = "North to East", - "[SOUTHWEST]" = "South to West", "[SOUTHEAST]" = "East to South") + "[SOUTHWEST]" = "South to West", "[SOUTHEAST]" = "East to South") if(PIPE_TRINARY) - dirs = list("[NORTH]" = "West South East", "[EAST]" = "North West South", - "[SOUTH]" = "East North West", "[WEST]" = "South East North") + dirs = list("[NORTH]" = "West South East", "[SOUTH]" = "East North West", + "[EAST]" = "North West South", "[WEST]" = "South East North") if(PIPE_TRIN_M) - dirs = list("[NORTH]" = "North East South", "[EAST]" = "East South West", - "[SOUTH]" = "South West North", "[WEST]" = "West North East", - "[SOUTHEAST]" = "West South East", "[NORTHEAST]" = "South East North", - "[NORTHWEST]" = "East North West", "[SOUTHWEST]" = "North West South") + dirs = list("[NORTH]" = "North East South", "[SOUTHWEST]" = "North West South", + "[NORTHEAST]" = "South East North", "[SOUTH]" = "South West North", + "[WEST]" = "West North East", "[SOUTHEAST]" = "West South East", + "[NORTHWEST]" = "East North West", "[EAST]" = "East South West",) if(PIPE_UNARY) - dirs = list("[NORTH]" = "North", "[EAST]" = "East", "[SOUTH]" = "South", "[WEST]" = "West") + dirs = list("[NORTH]" = "North", "[SOUTH]" = "South", "[WEST]" = "West", "[EAST]" = "East") if(PIPE_ONEDIR) dirs = list("[SOUTH]" = name) if(PIPE_UNARY_FLIPPABLE) - dirs = list("[NORTH]" = "North", "[NORTHEAST]" = "North Flipped", "[EAST]" = "East", "[SOUTHEAST]" = "East Flipped", - "[SOUTH]" = "South", "[SOUTHWEST]" = "South Flipped", "[WEST]" = "West", "[NORTHWEST]" = "West Flipped") + dirs = list("[NORTH]" = "North", "[EAST]" = "East", "[SOUTH]" = "South", "[WEST]" = "West", + "[NORTHEAST]" = "North Flipped", "[SOUTHEAST]" = "East Flipped", "[SOUTHWEST]" = "South Flipped", "[NORTHWEST]" = "West Flipped") var/list/rows = list() @@ -208,7 +208,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( var/static/datum/pipe_info/first_atmos var/static/datum/pipe_info/first_disposal var/static/datum/pipe_info/first_transit - var/mode = BUILD_MODE | PAINT_MODE | DESTROY_MODE | WRENCH_MODE + var/mode = BUILD_MODE | DESTROY_MODE | WRENCH_MODE /obj/item/pipe_dispenser/New() . = ..() @@ -249,7 +249,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( var/datum/asset/assets = get_asset_datum(/datum/asset/spritesheet/pipes) assets.send(user) - ui = new(user, src, ui_key, "rpd", name, 300, 550, master_ui, state) + ui = new(user, src, ui_key, "rpd", name, 425, 515, master_ui, state) ui.open() /obj/item/pipe_dispenser/ui_data(mob/user) @@ -342,11 +342,13 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( var/static/list/make_pipe_whitelist if(!make_pipe_whitelist) make_pipe_whitelist = typecacheof(list(/obj/structure/lattice, /obj/structure/girder, /obj/item/pipe, /obj/structure/window, /obj/structure/grille)) + if(istype(A, /obj/machinery/atmospherics) && (mode & BUILD_MODE && !(mode & PAINT_MODE))) //Reduces pixelhunt when coloring is off. + A = get_turf(A) var/can_make_pipe = (isturf(A) || is_type_in_typecache(A, make_pipe_whitelist)) . = FALSE - if((mode&DESTROY_MODE) && istype(A, /obj/item/pipe) || istype(A, /obj/structure/disposalconstruct) || istype(A, /obj/structure/c_transit_tube) || istype(A, /obj/structure/c_transit_tube_pod) || istype(A, /obj/item/pipe_meter)) + if((mode & DESTROY_MODE) && istype(A, /obj/item/pipe) || istype(A, /obj/structure/disposalconstruct) || istype(A, /obj/structure/c_transit_tube) || istype(A, /obj/structure/c_transit_tube_pod) || istype(A, /obj/item/pipe_meter)) to_chat(user, "You start destroying a pipe...") playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) if(do_after(user, destroy_speed, target = A)) @@ -354,7 +356,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( qdel(A) return - if((mode&PAINT_MODE)) + if((mode & PAINT_MODE)) if(istype(A, /obj/machinery/atmospherics/pipe) && !istype(A, /obj/machinery/atmospherics/pipe/layer_manifold)) var/obj/machinery/atmospherics/pipe/P = A to_chat(user, "You start painting \the [P] [paint_color]...") @@ -372,7 +374,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( user.visible_message("[user] paints \the [A] [paint_color].","You paint \the [A] [paint_color].") return - if(mode&BUILD_MODE) + if(mode & BUILD_MODE) switch(category) //if we've gotten this var, the target is valid if(ATMOS_CATEGORY) //Making pipes if(!can_make_pipe) @@ -388,7 +390,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( activate() var/obj/item/pipe_meter/PM = new /obj/item/pipe_meter(A) PM.setAttachLayer(piping_layer) - if(mode&WRENCH_MODE) + if(mode & WRENCH_MODE) PM.wrench_act(user, src) else to_chat(user, "You start building a pipe...") @@ -407,7 +409,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( P.setPipingLayer(piping_layer) if(findtext("[queued_p_type]", "/obj/machinery/atmospherics/pipe") && !findtext("[queued_p_type]", "layer_manifold")) P.add_atom_colour(GLOB.pipe_paint_colors[paint_color], FIXED_COLOUR_PRIORITY) - if(mode&WRENCH_MODE) + if(mode & WRENCH_MODE) P.wrench_act(user, src) if(DISPOSALS_CATEGORY) //Making disposals pipes @@ -431,7 +433,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( C.add_fingerprint(usr) C.update_icon() - if(mode&WRENCH_MODE) + if(mode & WRENCH_MODE) C.wrench_act(user, src) return @@ -453,7 +455,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( if(queued_p_type == /obj/structure/c_transit_tube_pod) var/obj/structure/c_transit_tube_pod/pod = new /obj/structure/c_transit_tube_pod(A) pod.add_fingerprint(usr) - if(mode&WRENCH_MODE) + if(mode & WRENCH_MODE) pod.wrench_act(user, src) else @@ -465,7 +467,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( tube.simple_rotate_flip() tube.add_fingerprint(usr) - if(mode&WRENCH_MODE) + if(mode & WRENCH_MODE) tube.wrench_act(user, src) return From 27c915ec7519c288bff1f64fcf22db666a84145a Mon Sep 17 00:00:00 2001 From: Commandersand Date: Thu, 30 Jan 2020 02:04:48 -0600 Subject: [PATCH 06/18] honk --- code/game/objects/items/storage/uplink_kits.dm | 2 +- code/modules/clothing/under/miscellaneous.dm | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 35429c2f42..611870912c 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -343,7 +343,7 @@ new /obj/item/implanter/radio/syndicate(src) /obj/item/storage/box/syndie_kit/centcom_costume/PopulateContents() - new /obj/item/clothing/under/rank/centcom_officer(src) + new /obj/item/clothing/under/rank/centcom_officer/syndicate(src) new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/clothing/gloves/color/black(src) new /obj/item/radio/headset/headset_cent/empty(src) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 251ff50173..235506a8c3 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -131,6 +131,10 @@ item_color = "officer" alt_covers_chest = TRUE +/obj/item/clothing/under/rank/centcom_officer/syndicate + has_sensor = NO_SENSORS + + /obj/item/clothing/under/rank/centcom_commander desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders." name = "\improper CentCom officer's jumpsuit" From 7054e697dbfb6593560b1e9e1f86b1094e4c4748 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Thu, 30 Jan 2020 02:07:59 -0600 Subject: [PATCH 07/18] spacing --- code/modules/clothing/under/miscellaneous.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 235506a8c3..a3a2b6b97e 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -134,7 +134,6 @@ /obj/item/clothing/under/rank/centcom_officer/syndicate has_sensor = NO_SENSORS - /obj/item/clothing/under/rank/centcom_commander desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders." name = "\improper CentCom officer's jumpsuit" From e9c3eb9eb44d2be9aa5a36e976cf75bd59fc4184 Mon Sep 17 00:00:00 2001 From: Putnam Date: Thu, 30 Jan 2020 04:24:18 -0800 Subject: [PATCH 08/18] . --- modular_citadel/code/modules/arousal/organs/vagina.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/arousal/organs/vagina.dm b/modular_citadel/code/modules/arousal/organs/vagina.dm index 31d116b48e..3f1bcc5f9b 100644 --- a/modular_citadel/code/modules/arousal/organs/vagina.dm +++ b/modular_citadel/code/modules/arousal/organs/vagina.dm @@ -8,8 +8,8 @@ size = 1 //There is only 1 size right now genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH masturbation_verb = "finger" - arousal_verb = "You feel wetness on your crotch." - unarousal_verb = "You no longer feel wet." + arousal_verb = "You feel wetness on your crotch" + unarousal_verb = "You no longer feel wet" fluid_transfer_factor = 0.1 //Yes, some amount is exposed to you, go get your AIDS layer_index = VAGINA_LAYER_INDEX var/cap_length = 8//D E P T H (cap = capacity) From e5ee5595e0319ec488fa8e9b314cf185b17d434c Mon Sep 17 00:00:00 2001 From: Tupinambis Date: Thu, 30 Jan 2020 15:22:41 -0600 Subject: [PATCH 09/18] How the fuck was this not fixed for like a year. --- code/modules/mob/living/carbon/human/update_icons.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index cd68dabbef..fa6cc44fca 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -461,6 +461,8 @@ There are several things that need to be remembered: var/alt_icon = M.alternate_worn_icon || 'icons/mob/mask.dmi' var/muzzled = FALSE var/variation_flag = NONE + if(head && (head.flags_inv & HIDEMASK)) + return if(("mam_snouts" in dna.species.default_features) && dna.features["mam_snouts"] != "None") muzzled = TRUE if(!muzzled && ("snout" in dna.species.default_features) && dna.features["snout"] != "None") From 70c41e5bd7052dbb6e04459bc693abcde0a8bb06 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Fri, 31 Jan 2020 15:08:16 +0800 Subject: [PATCH 10/18] happy now --- code/__HELPERS/reagents.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/__HELPERS/reagents.dm b/code/__HELPERS/reagents.dm index 49d6b5825e..50c866b30b 100644 --- a/code/__HELPERS/reagents.dm +++ b/code/__HELPERS/reagents.dm @@ -75,7 +75,7 @@ /proc/choose_reagent_id(mob/user) var/chosen_id - switch(alert(user, "Choose a method.", "Add Reagents", "Search", "Choose from a list")) + switch(alert(user, "Choose a method.", "Add Reagents", "Search", "Choose from a list", "I'm feeling lucky")) if("Search") var/valid_id while(!valid_id) @@ -92,4 +92,6 @@ to_chat(user, "A reagent with that ID doesn't exist!") if("Choose from a list") chosen_id = input(user, "Choose a reagent to add.", "Choose a reagent.") as null|anything in subtypesof(/datum/reagent) + if("I'm feeling lucky") + chosen_id = pick(subtypesof(/datum/reagent)) return chosen_id \ No newline at end of file From 396d7128579ed48fa137b6837783702a04c71de9 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 31 Jan 2020 18:41:39 -0600 Subject: [PATCH 11/18] Automatic changelog generation for PR #10793 [ci skip] --- html/changelogs/AutoChangeLog-pr-10793.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10793.yml diff --git a/html/changelogs/AutoChangeLog-pr-10793.yml b/html/changelogs/AutoChangeLog-pr-10793.yml new file mode 100644 index 0000000000..21cfc5d539 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10793.yml @@ -0,0 +1,4 @@ +author: "Tupinambis" +delete-after: True +changes: + - bugfix: "masks no longer improperly stick out of helmets when they should be hidden." From d292b102b35ad5ef213ddb0488284a8847db4c4f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 31 Jan 2020 18:42:58 -0600 Subject: [PATCH 12/18] Automatic changelog generation for PR #10786 [ci skip] --- html/changelogs/AutoChangeLog-pr-10786.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10786.yml diff --git a/html/changelogs/AutoChangeLog-pr-10786.yml b/html/changelogs/AutoChangeLog-pr-10786.yml new file mode 100644 index 0000000000..7e758122a2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10786.yml @@ -0,0 +1,4 @@ +author: "Commandersand" +delete-after: True +changes: + - tweak: "uplink centcomm suit doesn't have sensors" From bf4e07cc7589112ef3063f19428abb1afd82bf22 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 31 Jan 2020 18:44:22 -0600 Subject: [PATCH 13/18] Automatic changelog generation for PR #10777 [ci skip] --- html/changelogs/AutoChangeLog-pr-10777.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10777.yml diff --git a/html/changelogs/AutoChangeLog-pr-10777.yml b/html/changelogs/AutoChangeLog-pr-10777.yml new file mode 100644 index 0000000000..76ce4000d8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10777.yml @@ -0,0 +1,4 @@ +author: "kevinz000" +delete-after: True +changes: + - balance: "Gangs can now only tag with a gang uplink bought spraycan." From f5aa5f50f964ecc0f63787f64594f4dfc21f649f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 31 Jan 2020 18:44:57 -0600 Subject: [PATCH 14/18] Automatic changelog generation for PR #10776 [ci skip] --- html/changelogs/AutoChangeLog-pr-10776.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10776.yml diff --git a/html/changelogs/AutoChangeLog-pr-10776.yml b/html/changelogs/AutoChangeLog-pr-10776.yml new file mode 100644 index 0000000000..cd95cb49d4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10776.yml @@ -0,0 +1,4 @@ +author: "Hatterhat" +delete-after: True +changes: + - tweak: "The H.E.C.K. suit is now goliath tentacle resistant and probably better for acid resistance." From c9823699108b78ae152aa4a8e26d7c656b732f3e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 31 Jan 2020 18:46:18 -0600 Subject: [PATCH 15/18] Automatic changelog generation for PR #10559 [ci skip] --- html/changelogs/AutoChangeLog-pr-10559.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10559.yml diff --git a/html/changelogs/AutoChangeLog-pr-10559.yml b/html/changelogs/AutoChangeLog-pr-10559.yml new file mode 100644 index 0000000000..a48fc6c289 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10559.yml @@ -0,0 +1,4 @@ +author: "Seris02" +delete-after: True +changes: + - rscadd: "custom reagent pie smite" From 4d1f0144ef424e5db824ae39c2c44205db7f9062 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 31 Jan 2020 18:49:02 -0600 Subject: [PATCH 16/18] Automatic changelog generation for PR #10781 [ci skip] --- html/changelogs/AutoChangeLog-pr-10781.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10781.yml diff --git a/html/changelogs/AutoChangeLog-pr-10781.yml b/html/changelogs/AutoChangeLog-pr-10781.yml new file mode 100644 index 0000000000..cd3474adca --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10781.yml @@ -0,0 +1,5 @@ +author: "r4d6" +delete-after: True +changes: + - tweak: "RPD subcategories and preview icons reorganized." + - rscadd: "RPD now starts with painting turned off, hitting pipes with build and no paint will target the turf underneath instead. Bye bye turf pixelhunting." From c46c683664c6ffd0d722593392a7f2d0405b2ee5 Mon Sep 17 00:00:00 2001 From: ShadeAware <57020074+ShadeAware@users.noreply.github.com> Date: Fri, 31 Jan 2020 21:12:08 -0500 Subject: [PATCH 17/18] FIXES FANCY SWITCHBLADES ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!! --- code/game/objects/items/weaponry.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 9083783a48..cd6cc5f520 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -315,6 +315,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 var/extended_force = 20 var/extended_throwforce = 23 var/extended_icon_state = "switchblade_ext" + var/retracted_icon_state = "switchblade" /obj/item/switchblade/attack_self(mob/user) extended = !extended @@ -331,7 +332,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 force = initial(force) w_class = WEIGHT_CLASS_SMALL throwforce = initial(throwforce) - icon_state = initial(icon_state) + icon_state = retracted_icon_state attack_verb = list("stubbed", "poked") hitsound = 'sound/weapons/genhit.ogg' sharpness = IS_BLUNT @@ -348,12 +349,14 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 extended_force = 15 extended_throwforce = 18 extended_icon_state = "switchblade_ext_ms" + retracted_icon_state = "switchblade_ms" /obj/item/switchblade/crafted/attackby(obj/item/I, mob/user, params) . = ..() if(istype(I, /obj/item/stack/sheet/mineral/silver)) icon_state = extended ? "switchblade_ext_msf" : "switchblade_msf" extended_icon_state = "switchblade_ext_msf" + retracted_icon_state = "switchblade_msf" icon_state = "switchblade_msf" to_chat(user, "You use part of the silver to improve your Switchblade. Stylish!") From 133da9bdef817d75d8679fd199330b6101be4539 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 31 Jan 2020 20:35:24 -0600 Subject: [PATCH 18/18] Automatic changelog generation for PR #10821 [ci skip] --- html/changelogs/AutoChangeLog-pr-10821.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10821.yml diff --git a/html/changelogs/AutoChangeLog-pr-10821.yml b/html/changelogs/AutoChangeLog-pr-10821.yml new file mode 100644 index 0000000000..a1661764cf --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10821.yml @@ -0,0 +1,4 @@ +author: "ShadeAware" +delete-after: True +changes: + - bugfix: "Switchblades no longer regain their old Makeshift sprite after retracting if you've made them fancy with Silver."