From ef45cdda37f18507fc7c8bd427a530e93915a5b2 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Thu, 11 Feb 2021 08:18:38 -0700 Subject: [PATCH 01/15] Update painter_vr.dm --- code/game/machinery/painter_vr.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/painter_vr.dm b/code/game/machinery/painter_vr.dm index 21782fce4fc..0033474e6e5 100644 --- a/code/game/machinery/painter_vr.dm +++ b/code/game/machinery/painter_vr.dm @@ -88,15 +88,15 @@ dat += " Date: Thu, 11 Feb 2021 22:08:13 +0200 Subject: [PATCH 02/15] Update protean_species.dm --- .../station/protean/protean_species.dm | 46 ++++++++++++------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm index aa5967501ff..91b875ba83e 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm @@ -10,6 +10,8 @@ death_message = "rapidly loses cohesion, dissolving into a cloud of gray dust..." knockout_message = "collapses inwards, forming a disordered puddle of gray goo." remains_type = /obj/effect/decal/cleanable/ash + + unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite) // Finally gives them unarmed attacks, along with claws, because what's stopping them from forming a set from their nanite gloop? blood_color = "#505050" //This is the same as the 80,80,80 below, but in hex flesh_color = "#505050" @@ -19,9 +21,12 @@ appearance_flags = HAS_SKIN_COLOR | HAS_EYE_COLOR | HAS_HAIR_COLOR | HAS_UNDERWEAR | HAS_LIPS spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_WHITELIST_SELECTABLE health_hud_intensity = 2 - num_alternate_languages = 3 + num_alternate_languages = 5 // They're hyper-advanced blobs, so they should be able to know more than 4 languages. I think 6 is enough for now. assisted_langs = list(LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) color_mult = TRUE + + item_slowdown_mod = 0.25 // The weight of various items shouldn't bother them too much. I'd make it 0, but the general bulk still slows them down. + darksight = 7 // I have no eyes, but I still see. Just makes them have the major darksight trait breath_type = null poison_type = null @@ -30,30 +35,39 @@ blood_volume = 0 min_age = 18 max_age = 200 + + total_Health = 125 // Makes them Unathi level tough. Nothing too much brute_mod = 0.30 // 70% brute reduction - burn_mod = 1.4 //60% burn weakness + burn_mod = 1.3 //30% burn weakness -- The previous value of 1.4 was 40% weakness, not 60% oxy_mod = 0 radiation_mod = 0 // Their blobforms have rad immunity, so it only makes sense that their humanoid forms do too + toxins_mod = 0 // This is necessary to make them not instantly die to ions/low yield EMPs, also it makes sense as the refactory would reset or repurpose corrupted nanites + + hunger_factor = -0.3 // Better power storage, perhaps? /* These values assume all limbs are hit by the damage. To get individual limb damages divide by 11. -A worst-case sev 4 emp will do 88 damage pre-mitigation, and 140.8 post-mitigation (as resist is negative) spread out over all the limbs. -A best case sev 4 emp will do 55 pre-mitigation damage. This is 88 damage. -A worst case sev 3 emp will do 66 pre-mitigation damage. This is 105.6 damage. -A best case sev 3 emp will do 44 pre-mitigation damage. This is 70.4 damage. -A worst case sev 2 emp will do 55 pre-mitigation damage. This is 88 damage. -A best case sev 2 emp will do 22 pre-mitigation damage. This is 35.2 damage. -A worst case sev 1 emp will do 33 pre-mitigation damage.This is 52.8 damage. -A best case sev 1 emp will do 11 pre-mitigation damage. This is 17.6 damage. +A worst-case sev 4 emp will do 88 damage pre-mitigation, and 114.4 post-mitigation (as resist is negative) spread out over all the limbs. +A best case sev 4 emp will do 55 pre-mitigation damage. This is 71.5 damage. +A worst case sev 3 emp will do 66 pre-mitigation damage. This is 85.8 damage. +A best case sev 3 emp will do 44 pre-mitigation damage. This is 57.2 damage. +A worst case sev 2 emp will do 55 pre-mitigation damage. This is 71.5 damage. +A best case sev 2 emp will do 22 pre-mitigation damage. This is 28.6 damage. +A worst case sev 1 emp will do 33 pre-mitigation damage.This is 42.9 damage. +A best case sev 1 emp will do 11 pre-mitigation damage. This is 14.3 damage. + +I redid the calculations, as the burn weakness has been changed. This should be good. Hopefully */ - cold_level_1 = 280 //Default 260 - Lower is better +/* cold_level_1 = 280 //Default 260 - Lower is better cold_level_2 = 220 //Default 200 cold_level_3 = 130 //Default 120 heat_level_1 = 320 //Default 360 heat_level_2 = 370 //Default 400 heat_level_3 = 600 //Default 1000 - + + As the heat/cold levels are listed below, these aren't really necessary +*/ //Space doesn't bother them hazard_low_pressure = -1 hazard_high_pressure = INFINITY //Totally pressure immune - in human form (blobform is also completely pressure/heat immune, bringing them both in line with each other.) @@ -196,7 +210,7 @@ A best case sev 1 emp will do 11 pre-mitigation damage. This is 17.6 damage. H.gib() /datum/species/protean/handle_environment_special(var/mob/living/carbon/human/H) - if((H.getActualBruteLoss() + H.getActualFireLoss()) > H.maxHealth*0.35 && isturf(H.loc)) //So, only if we're not a blob (we're in nullspace) or in someone (or a locker, really, but whatever). The decimal point (0.35 as of now) is the autoblob %hp threshold. + if((H.getActualBruteLoss() + H.getActualFireLoss()) > H.maxHealth*0.8 && isturf(H.loc)) //So, only if we're not a blob (we're in nullspace) or in someone (or a locker, really, but whatever). The decimal point (0.8 as of now) is the autoblob %hp threshold. Right, quick maths lesson: making the autoblob threshold 35% does not mean that proteans will blob at 35% health. It means that they'll blob at 65% health, because it's checking if the total damage is higher than the threshold. I've made it that they blob at 20% health now, so they don't instantly blob to everything. H.nano_intoblob() return ..() //Any instakill shot runtimes since there are no organs after this. No point to not skip these checks, going to nullspace anyway. @@ -329,9 +343,9 @@ A best case sev 1 emp will do 11 pre-mitigation damage. This is 17.6 damage. /datum/modifier/protean/steel/tick() ..() - holder.adjustBruteLoss(-9 ,include_robo = TRUE) //Looks high, but these are modified by species resistances to equal out at 3hp/sec. - holder.adjustFireLoss(-2.14,include_robo = TRUE) //Looks high, but these are modified by species resistances to equal out at 3hp/sec. - holder.adjustToxLoss(-3) + holder.adjustBruteLoss(-10 ,include_robo = TRUE) //Looks high, but these are modified by species resistances to equal out at 3hp/sec. Previous value was 9, which didn't equal out to 3 per second + holder.adjustFireLoss(-2.3 ,include_robo = TRUE) //Looks high, but these are modified by species resistances to equal out at 3hp/sec. Bit of an adjustment with the updated burn resist + holder.adjustToxLoss(-12) // With them now having tox immunity, this is redundant, along with the rad regen, but I'm keeping it in, in case they do somehow get some system instability holder.radiation = max(holder.radiation - 30, 0) // I'm keeping this in and increasing it, just in the off chance the protean gets some rads, so that there's way to get rid of them From 064e0e19637f585c2be32f4ea2750ed74aab12ee Mon Sep 17 00:00:00 2001 From: Ghostcoffeee <66063955+Ghostcoffeee@users.noreply.github.com> Date: Thu, 11 Feb 2021 22:08:22 +0200 Subject: [PATCH 03/15] Update protean_blob.dm --- .../carbon/human/species/station/protean/protean_blob.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm index 4ca4d1134e2..115b9d4a4fe 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm @@ -23,8 +23,8 @@ harm_intent_damage = 2 melee_damage_lower = 10 - melee_damage_upper = 10 - attacktext = list("slashed") + melee_damage_upper = 15 // Mild increase to blob damage + attacktext = list("smashed", "rammed") // Why would an amorphous blob be slicing stuff? aquatic_movement = 1 min_oxy = 0 @@ -94,7 +94,7 @@ /mob/living/simple_mob/protean_blob/updatehealth() if(humanform) //Set the max - maxHealth = humanform.getMaxHealth()*2 //HUMANS, and their 'double health', bleh. + maxHealth = humanform.getMaxHealth() * 1.6 //As the base humanoid health was increased, the number was changed to make the maxhealth stay at 200 //Set us to their health, but, human health ignores robolimbs so we do it 'the hard way' health = maxHealth - humanform.getOxyLoss() - humanform.getToxLoss() - humanform.getCloneLoss() - humanform.getActualFireLoss() - humanform.getActualBruteLoss() From 1da4371f6e91e725a3ad74b995b8ea596258a7d1 Mon Sep 17 00:00:00 2001 From: Ghostcoffeee <66063955+Ghostcoffeee@users.noreply.github.com> Date: Thu, 11 Feb 2021 22:08:26 +0200 Subject: [PATCH 04/15] Update protean_powers.dm --- .../human/species/station/protean/protean_powers.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm index bda7d2150aa..ef87a0e2f45 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm @@ -38,9 +38,10 @@ oldlimb.removed() qdel(oldlimb) - var/mob/living/simple_mob/protean_blob/blob = nano_intoblob() + // var/mob/living/simple_mob/protean_blob/blob = nano_intoblob() active_regen = TRUE - if(do_after(blob,5 SECONDS)) + src.visible_message("[src]'s flesh begins to bubble, growing oily tendrils from their limb stump...") // Gives a visualization for regenerating limbs. + if(do_after(src,5 SECONDS)) // Makes you not need to blob to regen a single limb. I'm keeping the full-body regen as blob-only, though var/list/limblist = species.has_limbs[choice] var/limbpath = limblist["path"] var/obj/item/organ/external/new_eo = new limbpath(src) @@ -48,7 +49,8 @@ new_eo.robotize(synthetic ? synthetic.company : null) //Use the base we started with regenerate_icons() active_regen = FALSE - nano_outofblob(blob) + visible_message("[src]'s tendrils solidify into a [choice].") + // nano_outofblob(blob) No longer needed as we're not going to blob return //Organ exists, let's reshape it From 435611e702f696e32ca7be9f7ad13743cc49a00f Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Thu, 11 Feb 2021 15:43:29 -0700 Subject: [PATCH 05/15] Update 13_soulcatcher.dm --- code/modules/nifsoft/software/13_soulcatcher.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm index d5e094f9ccb..e59aef19953 100644 --- a/code/modules/nifsoft/software/13_soulcatcher.dm +++ b/code/modules/nifsoft/software/13_soulcatcher.dm @@ -518,7 +518,7 @@ /////////////////// //Verbs for humans -/mob/living/carbon/human/proc/nsay(message as text|null) +/mob/living/carbon/human/proc/nsay(message as text) set name = "NSay" set desc = "Speak into your NIF's Soulcatcher." set category = "IC" @@ -534,12 +534,12 @@ to_chat(src,"You need a loaded mind to use NSay.") return if(!message) - message = input("Type a message to say.","Speak into Soulcatcher") as text|null + return if(message) var/sane_message = sanitize(message) SC.say_into(sane_message,src) -/mob/living/carbon/human/proc/nme(message as text|null) +/mob/living/carbon/human/proc/nme(message as text) set name = "NMe" set desc = "Emote into your NIF's Soulcatcher." set category = "IC" @@ -556,7 +556,7 @@ return if(!message) - message = input("Type an action to perform.","Emote into Soulcatcher") as text|null + return if(message) var/sane_message = sanitize(message) SC.emote_into(sane_message,src) From 177ffb74c92dc0c3b6bc50b98801dfcd67782ae4 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Fri, 12 Feb 2021 02:12:28 -0700 Subject: [PATCH 06/15] Update 13_soulcatcher.dm --- code/modules/nifsoft/software/13_soulcatcher.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm index e59aef19953..87d6af23a21 100644 --- a/code/modules/nifsoft/software/13_soulcatcher.dm +++ b/code/modules/nifsoft/software/13_soulcatcher.dm @@ -539,7 +539,7 @@ var/sane_message = sanitize(message) SC.say_into(sane_message,src) -/mob/living/carbon/human/proc/nme(message as text) +/mob/living/carbon/human/proc/nme(message as message) set name = "NMe" set desc = "Emote into your NIF's Soulcatcher." set category = "IC" From b7f26013fd12b3ac5f303e3f273161e4ced5c919 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Fri, 12 Feb 2021 02:15:40 -0700 Subject: [PATCH 07/15] Update nif.dm --- code/modules/nifsoft/nif.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm index 0b6124f46df..3ff585d7b51 100644 --- a/code/modules/nifsoft/nif.dm +++ b/code/modules/nifsoft/nif.dm @@ -98,9 +98,7 @@ GLOBAL_LIST_INIT(nif_id_lookup, init_nif_id_lookup()) qdel(src) return FALSE else - //Free commlink and soulcatcher for return customers - new /datum/nifsoft/commlink(src) - new /datum/nifsoft/soulcatcher(src) + addtimer(CALLBACK(src, .proc/install_free_return_software), 0) //Free civilian AR included new /datum/nifsoft/ar_civ(src) @@ -113,6 +111,12 @@ GLOBAL_LIST_INIT(nif_id_lookup, init_nif_id_lookup()) //Draw me yo. update_icon() +// Creates software after the mob is hopefully loaded in +/obj/item/nif/proc/install_free_return_software() + //Free commlink and soulcatcher for return customers + new /datum/nifsoft/commlink(src) + new /datum/nifsoft/soulcatcher(src) + //Destructor cleans up references /obj/item/nif/Destroy() human = null From 61845739d2b4dfc61e6b0b13073b2c00c4d3ffe1 Mon Sep 17 00:00:00 2001 From: Ghostcoffeee <66063955+Ghostcoffeee@users.noreply.github.com> Date: Fri, 12 Feb 2021 18:19:40 +0200 Subject: [PATCH 08/15] Update protean_blob.dm --- .../carbon/human/species/station/protean/protean_blob.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm index 115b9d4a4fe..4533814f260 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm @@ -13,6 +13,9 @@ maxHealth = 200 health = 200 say_list_type = /datum/say_list/protean_blob + + brute_mod = 0.30 + burn_mod = 1.3 // Gives protean blobs the same resistances and weaknesses as their humanoid forms // ai_inactive = TRUE //Always off //VORESTATION AI TEMPORARY REMOVAL show_stat_health = FALSE //We will do it ourselves From 247f162a5bbc3c124ebdc0780290b46266d8e5ac Mon Sep 17 00:00:00 2001 From: Ghostcoffeee <66063955+Ghostcoffeee@users.noreply.github.com> Date: Sat, 13 Feb 2021 12:43:59 +0200 Subject: [PATCH 09/15] Update protean_species.dm --- .../carbon/human/species/station/protean/protean_species.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm index 91b875ba83e..3f0038e47f7 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm @@ -36,10 +36,10 @@ min_age = 18 max_age = 200 - total_Health = 125 // Makes them Unathi level tough. Nothing too much + total_Health = 125 // Makes them Unathi level tough. Nothing too much, also mildly justified as proteans can't ever go into crit, as they blob instead brute_mod = 0.30 // 70% brute reduction - burn_mod = 1.3 //30% burn weakness -- The previous value of 1.4 was 40% weakness, not 60% + burn_mod = 1.3 //30% burn weakness. This, combined with the increased total health makes them able to survive more than 1 laser shot before being blobbed. The cap's still 2 shots, though -- The previous value of 1.4 was 40% weakness, not 60% oxy_mod = 0 radiation_mod = 0 // Their blobforms have rad immunity, so it only makes sense that their humanoid forms do too toxins_mod = 0 // This is necessary to make them not instantly die to ions/low yield EMPs, also it makes sense as the refactory would reset or repurpose corrupted nanites From 76f286ac285dda3cda251438c8635870577f49fa Mon Sep 17 00:00:00 2001 From: Ghostcoffeee <66063955+Ghostcoffeee@users.noreply.github.com> Date: Sat, 13 Feb 2021 13:03:54 +0200 Subject: [PATCH 10/15] Update protean_species.dm --- .../carbon/human/species/station/protean/protean_species.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm index 3f0038e47f7..ddccb64a62d 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm @@ -36,7 +36,7 @@ min_age = 18 max_age = 200 - total_Health = 125 // Makes them Unathi level tough. Nothing too much, also mildly justified as proteans can't ever go into crit, as they blob instead + total_health = 125 // Makes them Unathi level tough. Nothing too much, also mildly justified as proteans can't ever go into crit, as they blob instead brute_mod = 0.30 // 70% brute reduction burn_mod = 1.3 //30% burn weakness. This, combined with the increased total health makes them able to survive more than 1 laser shot before being blobbed. The cap's still 2 shots, though -- The previous value of 1.4 was 40% weakness, not 60% From ed5c9a31f86b5f3c854ffd729a327ca068e7dd0e Mon Sep 17 00:00:00 2001 From: Ghostcoffeee <66063955+Ghostcoffeee@users.noreply.github.com> Date: Sat, 13 Feb 2021 13:04:57 +0200 Subject: [PATCH 11/15] No resistances =( Apparently simplemobs don't have damage modifiers --- .../carbon/human/species/station/protean/protean_blob.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm index 4533814f260..115b9d4a4fe 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm @@ -13,9 +13,6 @@ maxHealth = 200 health = 200 say_list_type = /datum/say_list/protean_blob - - brute_mod = 0.30 - burn_mod = 1.3 // Gives protean blobs the same resistances and weaknesses as their humanoid forms // ai_inactive = TRUE //Always off //VORESTATION AI TEMPORARY REMOVAL show_stat_health = FALSE //We will do it ourselves From 8cb5d8eb48a7c4e5d158817c3af577459f5f4996 Mon Sep 17 00:00:00 2001 From: TheLordME <58342752+TheLordME@users.noreply.github.com> Date: Sat, 13 Feb 2021 12:46:26 +0100 Subject: [PATCH 12/15] Relocates storage items into their own folder, in the item folder, instead of them being in the weapons folder, because they dont inherit from weapon --- .../items/{weapons => }/storage/_storage.dm | 0 .../items/{weapons => }/storage/backpack.dm | 0 .../items/{weapons => }/storage/bags.dm | 0 .../items/{weapons => }/storage/belt.dm | 0 .../items/{weapons => }/storage/bible.dm | 0 .../items/{weapons => }/storage/boxes.dm | 0 .../items/{weapons => }/storage/briefcase.dm | 0 .../items/{weapons => }/storage/fancy.dm | 0 .../items/{weapons => }/storage/firstaid.dm | 0 .../items/{weapons => }/storage/internal.dm | 0 .../{weapons => }/storage/laundry_basket.dm | 0 .../items/{weapons => }/storage/lockbox.dm | 0 .../items/{weapons => }/storage/misc.dm | 0 .../items/{weapons => }/storage/mre.dm | 0 .../items/{weapons => }/storage/quickdraw.dm | 0 .../items/{weapons => }/storage/secure.dm | 0 .../items/{weapons => }/storage/toolbox.dm | 0 .../{weapons => }/storage/uplink_kits.dm | 0 .../items/{weapons => }/storage/wallets.dm | 0 vorestation.dme | 38 +++++++++---------- 20 files changed, 19 insertions(+), 19 deletions(-) rename code/game/objects/items/{weapons => }/storage/_storage.dm (100%) rename code/game/objects/items/{weapons => }/storage/backpack.dm (100%) rename code/game/objects/items/{weapons => }/storage/bags.dm (100%) rename code/game/objects/items/{weapons => }/storage/belt.dm (100%) rename code/game/objects/items/{weapons => }/storage/bible.dm (100%) rename code/game/objects/items/{weapons => }/storage/boxes.dm (100%) rename code/game/objects/items/{weapons => }/storage/briefcase.dm (100%) rename code/game/objects/items/{weapons => }/storage/fancy.dm (100%) rename code/game/objects/items/{weapons => }/storage/firstaid.dm (100%) rename code/game/objects/items/{weapons => }/storage/internal.dm (100%) rename code/game/objects/items/{weapons => }/storage/laundry_basket.dm (100%) rename code/game/objects/items/{weapons => }/storage/lockbox.dm (100%) rename code/game/objects/items/{weapons => }/storage/misc.dm (100%) rename code/game/objects/items/{weapons => }/storage/mre.dm (100%) rename code/game/objects/items/{weapons => }/storage/quickdraw.dm (100%) rename code/game/objects/items/{weapons => }/storage/secure.dm (100%) rename code/game/objects/items/{weapons => }/storage/toolbox.dm (100%) rename code/game/objects/items/{weapons => }/storage/uplink_kits.dm (100%) rename code/game/objects/items/{weapons => }/storage/wallets.dm (100%) diff --git a/code/game/objects/items/weapons/storage/_storage.dm b/code/game/objects/items/storage/_storage.dm similarity index 100% rename from code/game/objects/items/weapons/storage/_storage.dm rename to code/game/objects/items/storage/_storage.dm diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm similarity index 100% rename from code/game/objects/items/weapons/storage/backpack.dm rename to code/game/objects/items/storage/backpack.dm diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/storage/bags.dm similarity index 100% rename from code/game/objects/items/weapons/storage/bags.dm rename to code/game/objects/items/storage/bags.dm diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/storage/belt.dm similarity index 100% rename from code/game/objects/items/weapons/storage/belt.dm rename to code/game/objects/items/storage/belt.dm diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/storage/bible.dm similarity index 100% rename from code/game/objects/items/weapons/storage/bible.dm rename to code/game/objects/items/storage/bible.dm diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm similarity index 100% rename from code/game/objects/items/weapons/storage/boxes.dm rename to code/game/objects/items/storage/boxes.dm diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm similarity index 100% rename from code/game/objects/items/weapons/storage/briefcase.dm rename to code/game/objects/items/storage/briefcase.dm diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm similarity index 100% rename from code/game/objects/items/weapons/storage/fancy.dm rename to code/game/objects/items/storage/fancy.dm diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm similarity index 100% rename from code/game/objects/items/weapons/storage/firstaid.dm rename to code/game/objects/items/storage/firstaid.dm diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/storage/internal.dm similarity index 100% rename from code/game/objects/items/weapons/storage/internal.dm rename to code/game/objects/items/storage/internal.dm diff --git a/code/game/objects/items/weapons/storage/laundry_basket.dm b/code/game/objects/items/storage/laundry_basket.dm similarity index 100% rename from code/game/objects/items/weapons/storage/laundry_basket.dm rename to code/game/objects/items/storage/laundry_basket.dm diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm similarity index 100% rename from code/game/objects/items/weapons/storage/lockbox.dm rename to code/game/objects/items/storage/lockbox.dm diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/storage/misc.dm similarity index 100% rename from code/game/objects/items/weapons/storage/misc.dm rename to code/game/objects/items/storage/misc.dm diff --git a/code/game/objects/items/weapons/storage/mre.dm b/code/game/objects/items/storage/mre.dm similarity index 100% rename from code/game/objects/items/weapons/storage/mre.dm rename to code/game/objects/items/storage/mre.dm diff --git a/code/game/objects/items/weapons/storage/quickdraw.dm b/code/game/objects/items/storage/quickdraw.dm similarity index 100% rename from code/game/objects/items/weapons/storage/quickdraw.dm rename to code/game/objects/items/storage/quickdraw.dm diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/storage/secure.dm similarity index 100% rename from code/game/objects/items/weapons/storage/secure.dm rename to code/game/objects/items/storage/secure.dm diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm similarity index 100% rename from code/game/objects/items/weapons/storage/toolbox.dm rename to code/game/objects/items/storage/toolbox.dm diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm similarity index 100% rename from code/game/objects/items/weapons/storage/uplink_kits.dm rename to code/game/objects/items/storage/uplink_kits.dm diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm similarity index 100% rename from code/game/objects/items/weapons/storage/wallets.dm rename to code/game/objects/items/storage/wallets.dm diff --git a/vorestation.dme b/vorestation.dme index 8383c9dfb2f..85cc1eecd9b 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1066,6 +1066,25 @@ #include "code\game\objects\items\stacks\sheets\leather.dm" #include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles.dm" #include "code\game\objects\items\stacks\tiles\tile_types.dm" +#include "code\game\objects\items\storage\_storage.dm" +#include "code\game\objects\items\storage\backpack.dm" +#include "code\game\objects\items\storage\bags.dm" +#include "code\game\objects\items\storage\belt.dm" +#include "code\game\objects\items\storage\bible.dm" +#include "code\game\objects\items\storage\boxes.dm" +#include "code\game\objects\items\storage\briefcase.dm" +#include "code\game\objects\items\storage\fancy.dm" +#include "code\game\objects\items\storage\firstaid.dm" +#include "code\game\objects\items\storage\internal.dm" +#include "code\game\objects\items\storage\laundry_basket.dm" +#include "code\game\objects\items\storage\lockbox.dm" +#include "code\game\objects\items\storage\misc.dm" +#include "code\game\objects\items\storage\mre.dm" +#include "code\game\objects\items\storage\quickdraw.dm" +#include "code\game\objects\items\storage\secure.dm" +#include "code\game\objects\items\storage\toolbox.dm" +#include "code\game\objects\items\storage\uplink_kits.dm" +#include "code\game\objects\items\storage\wallets.dm" #include "code\game\objects\items\weapons\AI_modules.dm" #include "code\game\objects\items\weapons\autopsy.dm" #include "code\game\objects\items\weapons\barrier_tape.dm" @@ -1188,25 +1207,6 @@ #include "code\game\objects\items\weapons\melee\energy_vr.dm" #include "code\game\objects\items\weapons\melee\melee.dm" #include "code\game\objects\items\weapons\melee\misc.dm" -#include "code\game\objects\items\weapons\storage\_storage.dm" -#include "code\game\objects\items\weapons\storage\backpack.dm" -#include "code\game\objects\items\weapons\storage\bags.dm" -#include "code\game\objects\items\weapons\storage\belt.dm" -#include "code\game\objects\items\weapons\storage\bible.dm" -#include "code\game\objects\items\weapons\storage\boxes.dm" -#include "code\game\objects\items\weapons\storage\briefcase.dm" -#include "code\game\objects\items\weapons\storage\fancy.dm" -#include "code\game\objects\items\weapons\storage\firstaid.dm" -#include "code\game\objects\items\weapons\storage\internal.dm" -#include "code\game\objects\items\weapons\storage\laundry_basket.dm" -#include "code\game\objects\items\weapons\storage\lockbox.dm" -#include "code\game\objects\items\weapons\storage\misc.dm" -#include "code\game\objects\items\weapons\storage\mre.dm" -#include "code\game\objects\items\weapons\storage\quickdraw.dm" -#include "code\game\objects\items\weapons\storage\secure.dm" -#include "code\game\objects\items\weapons\storage\toolbox.dm" -#include "code\game\objects\items\weapons\storage\uplink_kits.dm" -#include "code\game\objects\items\weapons\storage\wallets.dm" #include "code\game\objects\items\weapons\tanks\jetpack.dm" #include "code\game\objects\items\weapons\tanks\tank_types.dm" #include "code\game\objects\items\weapons\tanks\tank_types_vr.dm" From 651f655bfe7320de985d54259258b2b181eac732 Mon Sep 17 00:00:00 2001 From: Ghostcoffeee <66063955+Ghostcoffeee@users.noreply.github.com> Date: Sun, 14 Feb 2021 13:47:35 +0200 Subject: [PATCH 13/15] Hunger regen removal Because whoops --- .../carbon/human/species/station/protean/protean_species.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm index ddccb64a62d..8d6783fb486 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm @@ -44,7 +44,7 @@ radiation_mod = 0 // Their blobforms have rad immunity, so it only makes sense that their humanoid forms do too toxins_mod = 0 // This is necessary to make them not instantly die to ions/low yield EMPs, also it makes sense as the refactory would reset or repurpose corrupted nanites - hunger_factor = -0.3 // Better power storage, perhaps? + hunger_factor = 0.3 // Better power storage, perhaps? This is not additive. Whoops /* These values assume all limbs are hit by the damage. To get individual limb damages divide by 11. A worst-case sev 4 emp will do 88 damage pre-mitigation, and 114.4 post-mitigation (as resist is negative) spread out over all the limbs. From 1dd09a46d85e9cd17b78b67dc3133462eefd328d Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 15 Feb 2021 00:18:31 +0000 Subject: [PATCH 14/15] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index 4a8b6e0ffdf..68abfd0cc71 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -240,12 +240,6 @@
  • now introducing nanotrasen SMART CHARGE - no longer will expedition ships be shut down by 50 powergamers rolling protean and erping in the rechargers.
  • cyborg chargers now waste less power while idle
    • - -

    14 December 2020

    -

    buffyuwu updated:

    -
    Baystation 12 Credit List From 7fbe16ebd5c23efccec7da3d9dd93a6e53e5c78f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 14 Feb 2021 20:54:34 -0600 Subject: [PATCH 15/15] Automatic changelog generation for PR #2700 [ci skip] --- html/changelogs/AutoChangeLog-pr-2700.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2700.yml diff --git a/html/changelogs/AutoChangeLog-pr-2700.yml b/html/changelogs/AutoChangeLog-pr-2700.yml new file mode 100644 index 00000000000..394006eadf3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2700.yml @@ -0,0 +1,8 @@ +author: "Ghostcoffeee" +delete-after: True +changes: + - rscadd: "Added Protean unarmed verbs" + - rscadd: "Added Protean blob resistances/weaknesses" + - tweak: "Made Proteans not need to blob to reform single limbs" + - balance: "Made Proteans not die instantly to ions, and not blob instantly to lasers" + - tweak: "Other tweaks, that in my mind make sense for the hyper-advanced nanoblobs"