From 4b6398cfa9e49fc28776ee4ab2c2e893b7819725 Mon Sep 17 00:00:00 2001 From: nik707 <38332985+nik707@users.noreply.github.com> Date: Mon, 3 Sep 2018 22:58:08 -0500 Subject: [PATCH 01/13] nerfs smuggler satchels --- code/game/objects/items/storage/backpack.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 921ce5299a..730efe4032 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -247,7 +247,7 @@ name = "smuggler's satchel" desc = "A very slim satchel that can easily fit into tight spaces." icon_state = "satchel-flat" - w_class = WEIGHT_CLASS_NORMAL //Can fit in backpacks itself. + w_class = WEIGHT_CLASS_BULKY //Can fit in backpacks itself. level = 1 component_type = /datum/component/storage/concrete/secret_satchel From 2aa0eb2d1bc9f824edffd939d94c02020200a5af Mon Sep 17 00:00:00 2001 From: nik707 <38332985+nik707@users.noreply.github.com> Date: Tue, 4 Sep 2018 16:31:35 -0500 Subject: [PATCH 02/13] different nerf --- code/game/objects/items/storage/backpack.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 730efe4032..996ee8cd02 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -258,7 +258,7 @@ /obj/item/storage/backpack/satchel/flat/ComponentInitialize() . = ..() GET_COMPONENT(STR, /datum/component/storage) - STR.max_combined_w_class = 15 + STR.max_combined_w_class = 6 STR.cant_hold = typecacheof(list(/obj/item/storage/backpack/satchel/flat)) //muh recursive backpacks /obj/item/storage/backpack/satchel/flat/hide(intact) From 9a97c3ebd766ce4f23637db80eb7e47d58fc9482 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 4 Sep 2018 22:27:54 -0400 Subject: [PATCH 03/13] Makes a new blue space node! --- code/modules/research/techweb/all_nodes.dm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index e5c29b366b..3dd1c96bf7 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -150,7 +150,7 @@ description = "Deeper understanding of how the Bluespace dimension works" prereq_ids = list("practical_bluespace", "high_efficiency") design_ids = list("bluespace_matter_bin", "femto_mani", "triphasic_scanning", "tele_station", "tele_hub", "quantumpad", "launchpad", "launchpad_console", - "teleconsole", "bag_holding", "bluespace_crystal", "wormholeprojector", "bluespace_pod") + "teleconsole", "bluespace_crystal", "wormholeprojector") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 15000) export_price = 5000 @@ -159,7 +159,7 @@ display_name = "Applied Bluespace Research" description = "Using bluespace to make things faster and better." prereq_ids = list("bluespace_basic", "engineering") - design_ids = list("bs_rped","minerbag_holding", "bluespacebeaker", "bluespacesyringe", "bluespacebodybag", "phasic_scanning", "roastingstick") + design_ids = list("bs_rped","minerbag_holding", "bluespacebeaker", "bluespacesyringe", "phasic_scanning", "roastingstick") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) export_price = 5000 @@ -172,7 +172,14 @@ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 - +/datum/techweb_node/bluespace_holding //Bluespace-memery + id = "bluespace_holding" + display_name = "Bluespace Pockets" + description = "Studies into the mysterious alternate dimension known as bluespace and how to place items in the threads of reality." + prereq_ids = list("adv_power", "adv_bluespace", "anomaly_research", "adv_biotech") + design_ids = list( "bluespacebodybag","bag_holding", "bluespace_pod", "borg_upgrade_trashofholding", "blutrash") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500) + export_price = 5000 /////////////////////////plasma tech///////////////////////// /datum/techweb_node/basic_plasma id = "basic_plasma" @@ -207,7 +214,7 @@ display_name = "Advanced Robotics Research" description = "It can even do the dishes!" prereq_ids = list("robotics") - design_ids = list("borg_upgrade_diamonddrill", "borg_upgrade_trashofholding", "borg_upgrade_advancedmop") + design_ids = list("borg_upgrade_diamonddrill", "borg_upgrade_advancedmop") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -479,7 +486,7 @@ display_name = "Advanced Sanitation Technology" description = "Clean things better, faster, stronger, and harder!" prereq_ids = list("adv_engi") - design_ids = list("advmop", "buffer", "blutrash", "light_replacer") + design_ids = list("advmop", "buffer", "light_replacer") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 From f694924573af769486e8b0927dc8b3ae1d38fc9a Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 5 Sep 2018 06:47:23 -0700 Subject: [PATCH 04/13] Update _glasses.dm --- code/modules/clothing/glasses/_glasses.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index bbb8d687d9..a5465354ac 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -112,6 +112,11 @@ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE glass_colour_type = /datum/client_colour/glass_colour/green +/obj/item/clothing/glasses/night/prescription + name = "prescription night vision goggles" + desc = "NVGs but for those with nearsightedness." + vision_correction = 1 + /obj/item/clothing/glasses/science/suicide_act(mob/living/carbon/user) user.visible_message("[user] is tightening \the [src]'s straps around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!") return OXYLOSS From dca6ea461b2221188b3e09c1d80b6c24a35865c7 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 5 Sep 2018 06:49:20 -0700 Subject: [PATCH 05/13] Update misc_designs.dm --- code/modules/research/designs/misc_designs.dm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index d8f25968db..0b2249c877 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -147,6 +147,16 @@ category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY +/datum/design/night_vision_goggles_glasses + name = "Prescription Night Vision Goggles" + desc = "Goggles that let you see through darkness unhindered. Corrects vision." + id = "night_visision_goggles_glasses" + build_type = PROTOLATHE + materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_PLASMA = 350, MAT_URANIUM = 1000) + build_path = /obj/item/clothing/glasses/night/prescription + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_ENGINEERING + /datum/design/magboots name = "Magnetic Boots" desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle." @@ -377,4 +387,4 @@ materials = list(MAT_METAL = 10000, MAT_DIAMOND = 5000, MAT_URANIUM = 8000, MAT_SILVER = 4500, MAT_GOLD = 5000) build_path = /obj/item/reactive_armour_shell category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING \ No newline at end of file + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING From 50c3a127f208cfe0df7e194d0851ffa15d471f1d Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 5 Sep 2018 06:49:50 -0700 Subject: [PATCH 06/13] Update all_nodes.dm --- code/modules/research/techweb/all_nodes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index e5c29b366b..a56ef9a8da 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -387,7 +387,7 @@ display_name = "Night Vision Technology" description = "Allows seeing in the dark without actual light!" prereq_ids = list("integrated_HUDs", "adv_engi", "emp_adv") - design_ids = list("health_hud_night", "security_hud_night", "diagnostic_hud_night", "night_visision_goggles", "nvgmesons") + design_ids = list("health_hud_night", "security_hud_night", "diagnostic_hud_night", "night_visision_goggles", "night_visision_goggles_glasses", "nvgmesons") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) export_price = 5000 From cfc38004698226939d185a3222bd121802777a69 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 5 Sep 2018 20:03:26 -0700 Subject: [PATCH 07/13] Update helpers.dm --- .../procedural_mapping/mapGeneratorModules/helpers.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm index 00dba2d000..d48fbecef4 100644 --- a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm +++ b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm @@ -14,8 +14,12 @@ SSair.remove_from_active(T) for(var/turf/open/T in map) if(T.air) - T.air.copy_from_turf(T) - SSair.add_to_active(T) + if(T.initial_gas_mix) + T.air.parse_gas_string(T.initial_gas_mix) + T.temperature = T.air.temperature + else + T.air.copy_from_turf(T) + SSair.add_to_active(T) /datum/mapGeneratorModule/bottomLayer/massdelete spawnableAtoms = list() From 4f1e6603cc74a0afbc4b9e8994d82d4a9e93bd2c Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 6 Sep 2018 05:35:43 -0700 Subject: [PATCH 08/13] Update helpers.dm --- code/modules/procedural_mapping/mapGeneratorModules/helpers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm index d48fbecef4..3083e7a096 100644 --- a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm +++ b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm @@ -19,7 +19,7 @@ T.temperature = T.air.temperature else T.air.copy_from_turf(T) - SSair.add_to_active(T) + SSair.add_to_active(T) /datum/mapGeneratorModule/bottomLayer/massdelete spawnableAtoms = list() From 3838a4bd95753a29c89082d1102613efd71be3c9 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 7 Sep 2018 13:40:06 -0500 Subject: [PATCH 09/13] Adds intercoms to fetch module blacklist smh, should probably be an anchored check as well, but who the fuck knows how to make that work with component memes --- .../code/modules/mob/living/silicon/robot/dogborg_equipment.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm index 496a723d08..5fc3dc30d7 100644 --- a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm +++ b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm @@ -166,7 +166,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm ! STR.max_w_class = WEIGHT_CLASS_BULKY STR.max_combined_w_class = 5 STR.max_items = 1 - STR.cant_hold = typecacheof(list(/obj/item/disk/nuclear)) + STR.cant_hold = typecacheof(list(/obj/item/disk/nuclear || /obj/item/radio/intercom)) //Tongue stuff /obj/item/soap/tongue From 988d5fd5582ff6a90044739e723e756c13b28420 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 7 Sep 2018 16:05:51 -0400 Subject: [PATCH 10/13] NPC Space Pirate Heath Buff 100 -> 115 For the away mission --- code/modules/mob/living/simple_animal/hostile/pirate.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm index f76357de1b..4791a74527 100644 --- a/code/modules/mob/living/simple_animal/hostile/pirate.dm +++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm @@ -12,8 +12,8 @@ response_disarm = "shoves" response_harm = "hits" speed = 0 - maxHealth = 100 - health = 100 + maxHealth = 115 + health = 115 spacewalk = TRUE harm_intent_damage = 5 From 9c820743d53202b8e8a9baac648354f7d5e250b8 Mon Sep 17 00:00:00 2001 From: guppylaxx Date: Fri, 7 Sep 2018 16:18:40 -0400 Subject: [PATCH 11/13] fuck --- .../code/datums/mood_events/generic_positive_events.dm | 5 +++++ modular_citadel/code/modules/arousal/arousal.dm | 3 +++ 2 files changed, 8 insertions(+) diff --git a/modular_citadel/code/datums/mood_events/generic_positive_events.dm b/modular_citadel/code/datums/mood_events/generic_positive_events.dm index 40df233fbf..798d77db99 100644 --- a/modular_citadel/code/datums/mood_events/generic_positive_events.dm +++ b/modular_citadel/code/datums/mood_events/generic_positive_events.dm @@ -19,3 +19,8 @@ description = "I've played with plushes recently.\n" mood_change = 3 timeout = 3000 + +/datum/mood_event/orgasm + description = "I came!" //funny meme haha + mood_change = 3 + timeout = 1000 \ No newline at end of file diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm index bcebbde032..0f04397f6d 100644 --- a/modular_citadel/code/modules/arousal/arousal.dm +++ b/modular_citadel/code/modules/arousal/arousal.dm @@ -173,6 +173,7 @@ if(do_after(src, 30, target = src)) src.visible_message("[src] relieves [p_them()]self!", \ "You have relieved yourself.") + SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm) setArousalLoss(min_arousal) /* switch(gender) @@ -211,6 +212,7 @@ src.visible_message("[src] orgasms, cumming[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""]!", \ "You cum[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""].", \ "You have relieved yourself.") + SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm) if(G.can_climax) setArousalLoss(min_arousal) @@ -247,6 +249,7 @@ src.visible_message("[src] orgasms[istype(src.loc, /turf/open/floor) ? ", spilling onto [src.loc]" : ""], using [p_their()] [G.name]!", \ "You climax[istype(src.loc, /turf/open/floor) ? ", spilling onto [src.loc]" : ""] with your [G.name].", \ "You climax using your [G.name].") + SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm) if(G.can_climax) setArousalLoss(min_arousal) From dedb703d0a8dc1bf45e14411740cdd729f478524 Mon Sep 17 00:00:00 2001 From: guppylaxx Date: Fri, 7 Sep 2018 16:21:12 -0400 Subject: [PATCH 12/13] fuck2 --- modular_citadel/code/modules/arousal/arousal.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm index 0f04397f6d..7ef696ee91 100644 --- a/modular_citadel/code/modules/arousal/arousal.dm +++ b/modular_citadel/code/modules/arousal/arousal.dm @@ -280,6 +280,8 @@ src.visible_message("[src] climaxes with [L][spillage ? ", overflowing and spilling":""], using [p_their()] [G.name]!", \ "You orgasm with [L][spillage ? ", spilling out of them":""], using your [G.name].", \ "You have climaxed with someone[spillage ? ", spilling out of them":""], using your [G.name].") + SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm) + SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm) if(G.can_climax) setArousalLoss(min_arousal) else //knots and other non-spilling orgasms @@ -289,6 +291,8 @@ src.visible_message("[src] climaxes with [L], [p_their()] [G.name] spilling nothing!", \ "You ejaculate with [L], your [G.name] spilling nothing.", \ "You have climaxed inside someone, your [G.name] spilling nothing.") + SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm) + SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm) if(G.can_climax) setArousalLoss(min_arousal) @@ -318,6 +322,7 @@ src.visible_message("[src] uses [p_their()] [G.name] to fill [container]!", \ "You used your [G.name] to fill [container].", \ "You have relieved some pressure.") + SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm) if(G.can_climax) setArousalLoss(min_arousal) From 7a8c76d9cbb357f1266bb5e924f2c1d6e1b91a86 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sat, 8 Sep 2018 20:07:44 -0500 Subject: [PATCH 13/13] Update dogborg_equipment.dm --- .../code/modules/mob/living/silicon/robot/dogborg_equipment.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm index 5fc3dc30d7..ce9786d226 100644 --- a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm +++ b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm @@ -166,7 +166,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm ! STR.max_w_class = WEIGHT_CLASS_BULKY STR.max_combined_w_class = 5 STR.max_items = 1 - STR.cant_hold = typecacheof(list(/obj/item/disk/nuclear || /obj/item/radio/intercom)) + STR.cant_hold = typecacheof(list(/obj/item/disk/nuclear, /obj/item/radio/intercom)) //Tongue stuff /obj/item/soap/tongue