From c674f13de4f22a097bb6cb8c7713896fbd7d0ad2 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 20 Oct 2018 14:50:43 -0400 Subject: [PATCH 01/13] Nerfs Cash from Mining Vendor The current output of cash from the mining vendor is a bit too high considering that it is not hard for miners to pull 20K-40K points, and, probably will break the next trader ship event when it comes if a miner can just drop 15K-25K Thalers on the table. --- code/modules/mining/ore_redemption_machine/equipment_vendor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm index 1c79dae76e..ae9661a13a 100644 --- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm @@ -34,7 +34,7 @@ new /datum/data/mining_equipment("Fulton Pack", /obj/item/extraction_pack, 1200), new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/weapon/pickaxe/silver, 1200), //new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1000), - new /datum/data/mining_equipment("Space Cash", /obj/item/weapon/spacecash/c1000, 2000), + new /datum/data/mining_equipment("Space Cash", /obj/item/weapon/spacecash/c100, 1000), new /datum/data/mining_equipment("Industrial Hardsuit - Control Module", /obj/item/weapon/rig/industrial, 2000), new /datum/data/mining_equipment("Industrial Hardsuit - Plasma Cutter", /obj/item/rig_module/device/plasmacutter, 800), new /datum/data/mining_equipment("Industrial Hardsuit - Drill", /obj/item/rig_module/device/drill, 2000), From 7c522fc0c4c402ae2922bfbd62b4aab6d1053b60 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sat, 20 Oct 2018 17:43:06 -0400 Subject: [PATCH 02/13] Revert "Stethoscope vore shitpost" --- .../clothing/under/accessories/accessory.dm | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 9103730b2b..97c2d3aa90 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -155,21 +155,7 @@ return 1 /obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/M, mob/living/user) - if(isliving(user)) - //Vorestation edit start - var/message_holder //Holds pervy message - var/message_holder2 //Hods the nutrition related message. - var/beat_size = "" //Small prey = quiet - for(var/belly in M.vore_organs) //Pervy edit. - var/obj/belly/B = belly - for(var/mob/living/carbon/human/H in B) - if(H.size_multiplier < 0.5) - beat_size = pick("quiet ", "hushed " ,"low " ,"hushed ") - message_holder = pick("You can hear disparate heartbeats as well.", "You can hear a different [beat_size]heartbeat too.", "It sounds like there is more than one heartbeat." ,"You can pick up a [beat_size]heatbeat along with everything else.") - if(M.nutrition > 900) //dead - message_holder2 = pick("Your listening is troubled by the occasional deep groan of their body.", "There is some moderate bubbling in the background.", "They seem to have a healthy metabolism as well.") - //Vorestation edit end - + if(ishuman(M) && isliving(user)) if(user.a_intent == I_HELP) var/body_part = parse_zone(user.zone_sel.selecting) if(body_part) @@ -196,7 +182,7 @@ if(heart.is_bruised() || M.getOxyLoss() > 50) sound = "[pick("odd noises in","weak")] heartbeat" else - sound = "a healthy heartbeat" //Vorestation edit + sound = "healthy heartbeat" var/obj/item/organ/internal/heart/L = M.internal_organs_by_name[O_LUNGS] if(!L || M.losebreath) @@ -213,9 +199,8 @@ sound_strength = "hear a weak" sound = "pulse" - user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound]. [message_holder][message_holder2]") //Vorestation edit. ([message holder] & [message_holder2]) + user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound].") return - return ..(M,user) //Medals From dde664c1fb603f9a4b7af73d304b0285fcc77682 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Sun, 21 Oct 2018 07:49:49 +1000 Subject: [PATCH 03/13] Added intelligence levels to some virgo mobs --- code/modules/mob/living/simple_animal/vore/catgirl.dm | 1 + code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm | 1 + code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm | 1 + code/modules/mob/living/simple_animal/vore/wolfgirl.dm | 1 + 4 files changed, 4 insertions(+) diff --git a/code/modules/mob/living/simple_animal/vore/catgirl.dm b/code/modules/mob/living/simple_animal/vore/catgirl.dm index e66e74219a..445020c90b 100644 --- a/code/modules/mob/living/simple_animal/vore/catgirl.dm +++ b/code/modules/mob/living/simple_animal/vore/catgirl.dm @@ -4,6 +4,7 @@ tt_desc = "Homo felinus" icon = 'icons/mob/vore.dmi' icon_state = "catgirl" + intelligence_level = SA_HUMANOID speed = 5 diff --git a/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm b/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm index a7ee0bcd7d..b8801ea2c9 100644 --- a/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm +++ b/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm @@ -7,6 +7,7 @@ icon_dead = "badboi-dead" icon_rest = "badboi_rest" faction = "corrupt" + intelligence_level = SA_ROBOTIC maxHealth = 200 health = 200 diff --git a/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm index ca6f035f32..c9a3856a23 100644 --- a/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm +++ b/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm @@ -6,6 +6,7 @@ icon_living = "map_example" faction = "shadekin" ui_icons = 'icons/mob/shadekin_hud.dmi' + intelligence_level = SA_HUMANOID maxHealth = 200 health = 200 diff --git a/code/modules/mob/living/simple_animal/vore/wolfgirl.dm b/code/modules/mob/living/simple_animal/vore/wolfgirl.dm index b0a3d8a156..301b4e6dc5 100644 --- a/code/modules/mob/living/simple_animal/vore/wolfgirl.dm +++ b/code/modules/mob/living/simple_animal/vore/wolfgirl.dm @@ -6,6 +6,7 @@ icon_state = "wolfgirl" icon_living = "wolfgirl" icon_dead = "wolfgirl-dead" + intelligence_level = SA_HUMANOID faction = "wolfgirl" maxHealth = 30 From acdbd65e2268750ffa948a4b75ebad19d09ad091 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sun, 21 Oct 2018 21:23:25 +0300 Subject: [PATCH 04/13] Fixes PDA manifest excluding all non-syndie borgs (#5695) * Fixes PDA manifest excluding all non-syndie borgs I'm preetty sure the original PR had the opposite intention of what it actually did. * Update obj.dm * Update obj.dm --- code/defines/obj.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 272309f780..22dcf982fc 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -144,7 +144,7 @@ var/global/list/PDA_Manifest = list() for(var/mob/living/silicon/robot/robot in mob_list) // No combat/syndicate cyborgs, no drones. - if(!robot.scrambledcodes && !(robot.module && robot.module.hide_on_manifest)) + if(robot.scrambledcodes || (robot.module && robot.module.hide_on_manifest)) continue bot[++bot.len] = list("name" = robot.real_name, "rank" = "[robot.modtype] [robot.braintype]", "active" = "Active") From 7266f287579a53b0b4643441c8a3d463449dd4ad Mon Sep 17 00:00:00 2001 From: Shophaune <31856537+Shophaune@users.noreply.github.com> Date: Sun, 21 Oct 2018 19:23:02 +0100 Subject: [PATCH 06/13] Fix for duplicated loadout descriptions (#5694) * Add files via upload * Revert "Merge pull request #1 from Shophaune/plant-bag-ui-bug-fix" This reverts commit 62a60d4f87774508621506b347c679191e1a242f, reversing changes made to 6f909ce590f81a9c819b1ad2bcc2bcca1898859e. * Borrowing Ibnesquik's descriptions to fix this issue quickly. --- code/modules/client/preference_setup/loadout/loadout_uniform.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 14fd22711b..427993f5c4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -10,6 +10,7 @@ path = /obj/item/clothing/under/blazer/skirt /datum/gear/uniform/cheongsam + description = "Various color variations of an old earth dress style. They are pretty close fitting around the waist." display_name = "cheongsam selection" /datum/gear/uniform/cheongsam/New() @@ -21,6 +22,7 @@ gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cheongasms)) /datum/gear/uniform/croptop + description = "Light shirts which shows the midsection of the wearer." display_name = "croptop selection" /datum/gear/uniform/croptop/New() From fad2beb82e61b072868fd02cf286351f7df93c59 Mon Sep 17 00:00:00 2001 From: Shophaune <31856537+Shophaune@users.noreply.github.com> Date: Tue, 23 Oct 2018 01:53:20 +0100 Subject: [PATCH 08/13] Fixes duplication of corpses by holding and then cooking (#5693) * Add files via upload * Revert "Merge pull request #1 from Shophaune/plant-bag-ui-bug-fix" This reverts commit 62a60d4f87774508621506b347c679191e1a242f, reversing changes made to 6f909ce590f81a9c819b1ad2bcc2bcca1898859e. * Fix for cooking mob duplication * Actually this is a better method, thanks Baystation Yeah they kinda fixed it three days ago way better than I did it so --- code/modules/food/kitchen/cooking_machines/_cooker.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/food/kitchen/cooking_machines/_cooker.dm b/code/modules/food/kitchen/cooking_machines/_cooker.dm index 9f43092942..a361bf3007 100644 --- a/code/modules/food/kitchen/cooking_machines/_cooker.dm +++ b/code/modules/food/kitchen/cooking_machines/_cooker.dm @@ -130,6 +130,7 @@ if(istype(cooking_obj, /obj/item/weapon/holder)) for(var/mob/living/M in cooking_obj.contents) M.death() + qdel(M) // Cook the food. var/cook_path From b2e676d2162c30feff4f1bd933f015d86db966eb Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 22 Oct 2018 17:54:02 -0700 Subject: [PATCH 10/13] Merge pull request #5692 from lbnesquik/Kates-Surgery-Fix Correctly fix surgery caps selection this time. --- .../preference_setup/loadout/loadout_head.dm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index f3ce3eae43..e051daf585 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -353,17 +353,20 @@ sols[initial(sol.name)] = sol gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols))*/ // Vorestation removal. -/datum/gear/head/surgical +/datum/gear/head/surgery display_name = "surgical cap selection" + description = "Choose from a number of rings of different caps." path = /obj/item/clothing/head/surgery -/datum/gear/head/surgical/New() +/datum/gear/head/surgery/New() ..() - var/list/caps = list() - for(var/surgery in typesof(/obj/item/clothing/head/surgery)) - var/obj/item/clothing/head/surgery/cap_type = caps - caps[initial(cap_type.name)] = cap_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(caps)) + var/cap_type = list() + cap_type["Purple cap"] = /obj/item/clothing/head/surgery/purple + cap_type["Blue cap"] = /obj/item/clothing/head/surgery/blue + cap_type["Green cap"] = /obj/item/clothing/head/surgery/green + cap_type["Black cap"] = /obj/item/clothing/head/surgery/black + cap_type["Navy cap"] = /obj/item/clothing/head/surgery/navyblue + gear_tweaks += new/datum/gear_tweak/path(cap_type) /datum/gear/head/circuitry display_name = "headwear, circuitry (empty)" From cab7997b270ec2495f2028d1750e1ffef4e39498 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Tue, 23 Oct 2018 12:00:22 -0700 Subject: [PATCH 12/13] Merge pull request #5686 from lbnesquik/Kates-Waistcoast Fixes all waistcoast being black when worn in the suit slot --- code/modules/clothing/under/accessories/clothing.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index 02fab3e95a..065aedb6ac 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -257,31 +257,38 @@ /obj/item/clothing/accessory/wcoat/red name = "red waistcoat" icon_state = "red_waistcoat" + item_state = "red_waistcoat" /obj/item/clothing/accessory/wcoat/grey name = "grey waistcoat" icon_state = "grey_waistcoat" + item_state = "grey_waistcoat" /obj/item/clothing/accessory/wcoat/brown name = "brown waistcoat" icon_state = "brown_waistcoat" + item_state = "brown_waistcoat" /obj/item/clothing/accessory/wcoat/gentleman name = "elegant waistcoat" icon_state = "elegant_waistcoat" + item_state = "elegant_waistcoat" /obj/item/clothing/accessory/wcoat/swvest name = "black sweatervest" desc = "A sleeveless sweater. Wear this if you don't want your arms to be warm, or if you're a nerd." icon_state = "sweatervest" + item_state = "sweatervest" /obj/item/clothing/accessory/wcoat/swvest/blue name = "blue sweatervest" icon_state = "sweatervest_blue" + item_state = "sweatervest_blue" /obj/item/clothing/accessory/wcoat/swvest/red name = "red sweatervest" icon_state = "sweatervest_red" + item_state = "sweatervest_red" //Sweaters.