mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 23:58:07 +01:00
Joshua KidderandGitHub
7a3ad79506
## About The Pull Request It's just a partial cleanup of anti-[STYLE](https://github.com/tgstation/tgstation/blob/master/.github/guides/STYLE.md) code from /tg/'s ancient history. I compiled & tested with my helpful assistant and damage is still working. <img width="1920" height="1040" alt="image" src="https://github.com/user-attachments/assets/26dabc17-088f-4008-b299-3ff4c27142c3" /> I'll upload the .cs script I used to do it shortly. ## Why It's Good For The Game Just minor code cleanup. Script used is located at https://metek.tech/camelTo-Snake.7z EDIT 11/23/25: Updated the script to use multithreading and sequential scan so it works a hell of a lot faster ``` /* // Copyright 2025 Joshua 'Joan Metekillot' Kidder This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. // */ using System.Text.RegularExpressions; class Program { static async Task Main(string[] args) { var readFile = new FileStreamOptions { Access = FileAccess.Read, Share = FileShare.ReadWrite, Options = FileOptions.Asynchronous | FileOptions.SequentialScan }; FileStreamOptions writeFile = new FileStreamOptions { Share = FileShare.ReadWrite, Access = FileAccess.ReadWrite, Mode = FileMode.Truncate, Options = FileOptions.Asynchronous }; RegexOptions regexOptions = RegexOptions.Multiline | RegexOptions.Compiled; Dictionary<string, int> changedProcs = new(); string regexPattern = @"(?<=\P{L})([a-z]+)([A-Z]{1,2}[a-z]+)*(Brute|Burn|Fire|Tox|Oxy|Organ|Stamina)(Loss)([A-Z]{1,2}[a-z]+)*"; Regex camelCaseProcRegex = new(regexPattern, regexOptions); string snakeify(Match matchingRegex) { var vals = matchingRegex.Groups.Cast<Group>().SelectMany(_ => _.Captures).Select(_ => _.Value).ToArray(); var newVal = string.Join("_", vals.Skip(1).ToArray()).ToLower(); string logString = $"{vals[0]} => {newVal}"; if (changedProcs.TryGetValue(logString, out int value)) { changedProcs[logString] = value + 1; } else { changedProcs.Add(logString, 1); } return newVal; } var dmFiles = Directory.EnumerateFiles(".", "*.dm", SearchOption.AllDirectories).ToAsyncEnumerable<string>(); // uses default ParallelOptions // https://learn.microsoft.com/en-us/dotnet/api/system.threading.tasks.paralleloptions?view=net-10.0#main await Parallel.ForEachAsync(dmFiles, async (filePath, UnusedCancellationToken) => { var reader = new StreamReader(filePath, readFile); string oldContent = await reader.ReadToEndAsync(); string newContent = camelCaseProcRegex.Replace(oldContent, new MatchEvaluator((Func<Match, string>)snakeify)); if (oldContent != newContent) { var writer = new StreamWriter(filePath, writeFile); await writer.WriteAsync(newContent); await writer.DisposeAsync(); } reader.Dispose(); }); var logToList = changedProcs.Cast<KeyValuePair<string, int>>().ToList(); foreach (var pair in logToList) { Console.WriteLine($"{pair.Key}: {pair.Value} locations"); } } } ``` ## Changelog 🆑 Bisar code: All (Brute|Burn|Fire|Tox|Oxy|Organ|Stamina)(Loss) procs now use snake_case, in-line with the STYLE guide. Underscores rule! /🆑
192 lines
5.1 KiB
Plaintext
192 lines
5.1 KiB
Plaintext
// 7.62x38mmR (Nagant Revolver)
|
|
|
|
/obj/projectile/bullet/n762
|
|
name = "7.62x38mmR bullet"
|
|
damage = 60
|
|
|
|
// .50AE (Desert Eagle)
|
|
|
|
/obj/projectile/bullet/a50ae
|
|
name = ".50AE bullet"
|
|
damage = 60
|
|
|
|
// .38 (Detective's Gun)
|
|
|
|
/obj/projectile/bullet/c38
|
|
name = ".38 bullet"
|
|
damage = 25
|
|
ricochets_max = 2
|
|
ricochet_chance = 50
|
|
ricochet_auto_aim_angle = 10
|
|
ricochet_auto_aim_range = 3
|
|
wound_bonus = -20
|
|
exposed_wound_bonus = 10
|
|
embed_type = /datum/embedding/bullet/c38
|
|
embed_falloff_tile = -4
|
|
|
|
/datum/embedding/bullet/c38
|
|
embed_chance = 25
|
|
fall_chance = 2
|
|
jostle_chance = 2
|
|
ignore_throwspeed_threshold = TRUE
|
|
pain_stam_pct = 0.4
|
|
pain_mult = 3
|
|
jostle_pain_mult = 5
|
|
rip_time = 1 SECONDS
|
|
|
|
/obj/projectile/bullet/c38/match
|
|
name = ".38 Match bullet"
|
|
ricochets_max = 4
|
|
ricochet_chance = 100
|
|
ricochet_auto_aim_angle = 40
|
|
ricochet_auto_aim_range = 5
|
|
ricochet_incidence_leeway = 50
|
|
ricochet_decay_chance = 1
|
|
ricochet_decay_damage = 1
|
|
|
|
/obj/projectile/bullet/c38/match/bouncy
|
|
name = ".38 Rubber bullet"
|
|
damage = 10
|
|
stamina = 30
|
|
ricochets_max = 6
|
|
ricochet_incidence_leeway = 0
|
|
ricochet_chance = 130
|
|
ricochet_decay_damage = 0.8
|
|
shrapnel_type = null
|
|
sharpness = NONE
|
|
embed_type = null
|
|
|
|
/obj/projectile/bullet/c38/match/true
|
|
name = ".38 True Strike bullet"
|
|
damage = 15
|
|
ricochet_auto_aim_range = 3
|
|
ricochet_auto_aim_angle = 100
|
|
ricochet_incidence_leeway = 0
|
|
ricochet_shoots_firer = FALSE
|
|
shrapnel_type = null
|
|
embed_type = null
|
|
armour_penetration = 30
|
|
|
|
// premium .38 ammo from cargo, weak against armor, lower base damage, but excellent at embedding and causing slice wounds at close range
|
|
/obj/projectile/bullet/c38/dumdum
|
|
name = ".38 DumDum bullet"
|
|
damage = 15
|
|
weak_against_armour = TRUE
|
|
ricochets_max = 0
|
|
sharpness = SHARP_EDGED
|
|
wound_bonus = 20
|
|
exposed_wound_bonus = 20
|
|
embed_type = /datum/embedding/bullet/c38/dumdum
|
|
wound_falloff_tile = -5
|
|
embed_falloff_tile = -15
|
|
|
|
/datum/embedding/bullet/c38/dumdum
|
|
embed_chance = 75
|
|
fall_chance = 3
|
|
jostle_chance = 4
|
|
ignore_throwspeed_threshold = TRUE
|
|
pain_stam_pct = 0.4
|
|
pain_mult = 5
|
|
jostle_pain_mult = 6
|
|
rip_time = 1 SECONDS
|
|
|
|
/obj/projectile/bullet/c38/trac
|
|
name = ".38 TRAC bullet"
|
|
damage = 10
|
|
ricochets_max = 0
|
|
|
|
/obj/projectile/bullet/c38/trac/on_hit(atom/target, blocked = 0, pierce_hit)
|
|
. = ..()
|
|
var/mob/living/carbon/M = target
|
|
if(!istype(M))
|
|
return
|
|
var/obj/item/implant/tracking/c38/imp
|
|
for(var/obj/item/implant/tracking/c38/TI in M.implants) //checks if the target already contains a tracking implant
|
|
imp = TI
|
|
return
|
|
if(!imp)
|
|
imp = new /obj/item/implant/tracking/c38(M)
|
|
imp.implant(M)
|
|
|
|
/obj/projectile/bullet/c38/hotshot //similar to incendiary bullets, but do not leave a flaming trail
|
|
name = ".38 Hot Shot bullet"
|
|
damage = 20
|
|
ricochets_max = 0
|
|
|
|
/obj/projectile/bullet/c38/hotshot/on_hit(atom/target, blocked = 0, pierce_hit)
|
|
. = ..()
|
|
if(iscarbon(target))
|
|
var/mob/living/carbon/criminal_scum = target
|
|
criminal_scum.adjust_fire_stacks(6)
|
|
criminal_scum.ignite_mob()
|
|
|
|
/obj/projectile/bullet/c38/iceblox //see /obj/projectile/temp for the original code
|
|
name = ".38 Iceblox bullet"
|
|
damage = 20
|
|
var/temperature = 100
|
|
ricochets_max = 0
|
|
|
|
/obj/projectile/bullet/c38/iceblox/on_hit(atom/target, blocked = 0, pierce_hit)
|
|
. = ..()
|
|
if(isliving(target))
|
|
var/mob/living/criminal_scum = target
|
|
criminal_scum.adjust_bodytemperature(((100-blocked)/100)*(temperature - criminal_scum.bodytemperature))
|
|
|
|
// .357 (Syndie Revolver)
|
|
|
|
/obj/projectile/bullet/c357
|
|
name = ".357 bullet"
|
|
damage = 60
|
|
wound_bonus = -30
|
|
|
|
/obj/projectile/bullet/c357/phasic
|
|
name = ".357 phasic bullet"
|
|
icon_state = "gaussphase"
|
|
damage = 35
|
|
armour_penetration = 100
|
|
projectile_phasing = PASSTABLE | PASSGLASS | PASSGRILLE | PASSCLOSEDTURF | PASSMACHINE | PASSSTRUCTURE | PASSDOORS
|
|
|
|
/obj/projectile/bullet/c357/heartseeker
|
|
name = ".357 heartseeker bullet"
|
|
icon_state = "gauss"
|
|
damage = 50
|
|
homing_turn_speed = 120
|
|
|
|
// admin only really, for ocelot memes
|
|
/obj/projectile/bullet/c357/match
|
|
name = ".357 match bullet"
|
|
ricochets_max = 5
|
|
ricochet_chance = 140
|
|
ricochet_auto_aim_angle = 50
|
|
ricochet_auto_aim_range = 6
|
|
ricochet_incidence_leeway = 80
|
|
ricochet_decay_chance = 1
|
|
|
|
//gatfruit
|
|
/obj/projectile/bullet/pea
|
|
name = "pea bullet"
|
|
damage = 15
|
|
weak_against_armour = TRUE
|
|
ricochets_max = 3
|
|
ricochet_chance = 100
|
|
icon_state = "pea"
|
|
|
|
/obj/projectile/bullet/pea/Initialize(mapload)
|
|
. = ..()
|
|
create_reagents(100, NO_REACT) //same as the fruit itself, wont ever hit that much though i believe
|
|
|
|
/obj/projectile/bullet/pea/on_hit(mob/living/carbon/target, blocked = 0, pierce_hit)
|
|
if(istype(target) && blocked != 100)
|
|
if(iszombie(target)) // https://www.youtube.com/watch?v=ssZoq1eUK-s
|
|
target.adjust_brute_loss(15)
|
|
if(target.can_inject(target_zone = def_zone)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
|
|
..()
|
|
reagents.trans_to(target, reagents.total_volume, methods = INJECT)
|
|
return BULLET_ACT_HIT
|
|
blocked = 100
|
|
target.visible_message(span_danger("\The [src] is deflected!"), span_userdanger("You are protected against \the [src]!"))
|
|
. = ..()
|
|
if(reagents.flags & NO_REACT) //first impact on a noncarbon
|
|
reagents.flags &= ~(NO_REACT)
|
|
reagents.handle_reactions()
|