cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-10 23:47:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #270 from ReoDaProtovali/Fixes-n-stuff

Browse Source 
Minor Fixes
This commit is contained in:
evilew
2024-09-14 11:41:35 +02:00
committed by GitHub
parent 60618e4d20 a36133623c
commit 0b4e6eaf64
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/game/sound.dm
+6 -8
View File
@@ -23,15 +23,13 @@
var/mob/M = P
if(!M.client)
continue
if((!M.client?.prefs.cit_toggles & pref))
continue
if(get_dist(M, turf_source) <= maxdistance)
M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, channel, pressure_affected, S, soundenvwet, soundenvdry)
if((M.client?.prefs.cit_toggles & pref))
if(get_dist(M, turf_source) <= maxdistance)
M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, channel, pressure_affected, S, soundenvwet, soundenvdry)
for(var/P in SSmobs.dead_players_by_zlevel[z])
var/mob/M = P
if(!M.client)
continue
if((!M.client?.prefs.cit_toggles & pref))
continue
if(get_dist(M, turf_source) <= maxdistance)
M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, channel, pressure_affected, S, soundenvwet, soundenvdry)
if((M.client?.prefs.cit_toggles & pref))
if(get_dist(M, turf_source) <= maxdistance)
M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, channel, pressure_affected, S, soundenvwet, soundenvdry)
code/game/objects/items/RCD.dm
+1 -1
View File
@@ -22,7 +22,7 @@ RLD
throw_speed = 3
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
slot_flags = SLOT_BELT
slot_flags = ITEM_SLOT_BELT
materials = list(MAT_METAL=100000)
req_access_txt = "11"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
code/game/objects/items/RPD.dm
+1 -1
View File
@@ -188,7 +188,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
throw_speed = 1
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
slot_flags = SLOT_BELT
slot_flags = ITEM_SLOT_BELT
materials = list(MAT_METAL=75000, MAT_GLASS=37500)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
code/game/objects/items/storage/belt.dm
+4 -1
View File
@@ -72,6 +72,7 @@
/obj/item/forcefield_projector,
/obj/item/assembly/signaler,
/obj/item/lightreplacer,
/obj/item/construction/rcd,
/obj/item/pipe_dispenser,
/obj/item/inducer,
/obj/item/grenade/chem_grenade/smart_metal_foam,
@@ -585,7 +586,9 @@ obj/item/storage/belt/slut/ComponentInitialize()
/obj/item/weldingtool,
/obj/item/wirecutters,
/obj/item/wrench,
/obj/item/wrench/medical
/obj/item/wrench/medical,
/obj/item/handdrill,
/obj/item/jawsoflife
))
/obj/item/storage/belt/grenade
yogstation/code/game/objects/items/tools.dm
+2 -2
View File
@@ -13,7 +13,7 @@
w_class = WEIGHT_CLASS_SMALL
usesound = 'sound/items/jaws_pry.ogg'
force = 15
toolspeed = 0.7
toolspeed = 0.35 // GS edit: Yogs speed is 0.7, but that's ass.
tool_behaviour = TOOL_CROWBAR
var/pryforce = 1 // the speed at which airlocks are pried open. Default is 1 .
@@ -114,7 +114,7 @@
attack_verb = list("drilled", "screwed", "jabbed","whacked")
hitsound = 'sound/items/drill_hit.ogg'
usesound = 'sound/items/drill_use.ogg'
toolspeed = 0.7
toolspeed = 0.35 //GS edit. Yog's value is 0.7, but that's ass.
tool_behaviour = TOOL_SCREWDRIVER
sharpness = IS_SHARP_ACCURATE
/obj/item/handdrill/attack(mob/living/carbon/M, mob/living/carbon/user)