From d1e7821b15697b7afd93f55d5ce7dbd7dcb0f8aa Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sat, 9 May 2020 16:53:59 -0400 Subject: [PATCH] VS: Language issues These issues don't prevent compiling, but are strange issues nonetheless. --- code/controllers/autotransfer.dm | 2 +- code/game/objects/items/weapons/RCD_vr.dm | 6 +++--- code/modules/media/mediamanager.dm | 2 +- .../silicon/robot/dogborg/dog_modules_vr.dm | 16 ++++++++-------- .../silicon/robot/subtypes/lost_drone_vr.dm | 2 +- code/modules/vore/eating/vorepanel_vr.dm | 4 ++-- maps/virgo_minitest/virgo_minitest.dm | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/code/controllers/autotransfer.dm b/code/controllers/autotransfer.dm index 3d867473dc..a1cc369303 100644 --- a/code/controllers/autotransfer.dm +++ b/code/controllers/autotransfer.dm @@ -18,7 +18,7 @@ datum/controller/transfer_controller/process() currenttick = currenttick + 1 //VOREStation Edit START if (round_duration_in_ds >= shift_last_vote - 2 MINUTES) - shift_last_vote = 999999999999 //Setting to a stupidly high number since it'll be not used again. + shift_last_vote = 99999999 //Setting to a stupidly high number since it'll be not used again. to_world("Warning: You have one hour left in the shift. Wrap up your scenes in the next 60 minutes before the transfer is called.") //VOREStation Edit if (round_duration_in_ds >= shift_hard_end - 1 MINUTE) init_shift_change(null, 1) diff --git a/code/game/objects/items/weapons/RCD_vr.dm b/code/game/objects/items/weapons/RCD_vr.dm index 5cfc822efa..f4089e9b9c 100644 --- a/code/game/objects/items/weapons/RCD_vr.dm +++ b/code/game/objects/items/weapons/RCD_vr.dm @@ -9,9 +9,9 @@ var/ammostate var/list/effects = list() - var/static/image/radial_image_airlock = image(icon = 'icons/mob/radial.dmi', icon_state = "airlock"), - var/static/image/radial_image_decon = image(icon= 'icons/mob/radial.dmi', icon_state = "delete"), - var/static/image/radial_image_grillewind = image(icon = 'icons/mob/radial.dmi', icon_state = "grillewindow"), + var/static/image/radial_image_airlock = image(icon = 'icons/mob/radial.dmi', icon_state = "airlock") + var/static/image/radial_image_decon = image(icon= 'icons/mob/radial.dmi', icon_state = "delete") + var/static/image/radial_image_grillewind = image(icon = 'icons/mob/radial.dmi', icon_state = "grillewindow") var/static/image/radial_image_floorwall = image(icon = 'icons/mob/radial.dmi', icon_state = "wallfloor") // Ammo for the (non-electric) RCDs. diff --git a/code/modules/media/mediamanager.dm b/code/modules/media/mediamanager.dm index 96b9ab36cb..5ff00d5eee 100644 --- a/code/modules/media/mediamanager.dm +++ b/code/modules/media/mediamanager.dm @@ -11,7 +11,7 @@ #ifdef DEBUG_MEDIAPLAYER #define MP_DEBUG(x) to_chat(owner,x) -#warning Please comment out #define DEBUG_MEDIAPLAYER before committing. +#warn Please comment out #define DEBUG_MEDIAPLAYER before committing. #else #define MP_DEBUG(x) #endif diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm index 1a67275635..07b04dd9aa 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm @@ -22,7 +22,7 @@ var/emagged = 0 /obj/item/weapon/dogborg/jaws/small/attack_self(mob/user) - var/mob/living/silicon/robot.R = user + var/mob/living/silicon/robot/R = user if(R.emagged || R.emag_items) emagged = !emagged if(emagged) @@ -187,7 +187,7 @@ . += "[src] is dry." /obj/item/device/dogborg/tongue/attack_self(mob/user) - var/mob/living/silicon/robot.R = user + var/mob/living/silicon/robot/R = user if(R.emagged || R.emag_items) emagged = !emagged if(emagged) @@ -222,7 +222,7 @@ to_chat(user, "You finish licking off \the [target.name].") water.use_charge(5) qdel(target) - var/mob/living/silicon/robot.R = user + var/mob/living/silicon/robot/R = user R.cell.charge += 50 else if(istype(target,/obj/item)) if(istype(target,/obj/item/trash)) @@ -231,7 +231,7 @@ user.visible_message("[user] finishes eating \the [target.name].", "You finish eating \the [target.name].") to_chat(user, "You finish off \the [target.name].") qdel(target) - var/mob/living/silicon/robot.R = user + var/mob/living/silicon/robot/R = user R.cell.charge += 250 water.use_charge(5) return @@ -240,8 +240,8 @@ if(do_after (user, 50)) user.visible_message("[user] finishes gulping down \the [target.name].", "You finish swallowing \the [target.name].") to_chat(user, "You finish off \the [target.name], and gain some charge!") - var/mob/living/silicon/robot.R = user - var/obj/item/weapon/cell.C = target + var/mob/living/silicon/robot/R = user + var/obj/item/weapon/cell/C = target R.cell.charge += C.maxcharge / 3 water.use_charge(5) qdel(target) @@ -255,7 +255,7 @@ target.clean_blood() else if(ishuman(target)) if(src.emagged) - var/mob/living/silicon/robot.R = user + var/mob/living/silicon/robot/R = user var/mob/living/L = target if(R.cell.charge <= 666) return @@ -298,7 +298,7 @@ flags |= NOBLUDGEON /obj/item/pupscrubber/attack_self(mob/user) - var/mob/living/silicon/robot.R = user + var/mob/living/silicon/robot/R = user if(!enabled) R.scrubbing = TRUE enabled = TRUE diff --git a/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm b/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm index 1af34a5ef6..1506fca4e3 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm @@ -157,7 +157,7 @@ if("corrupted") // Load them up with ion laws. var/datum/ai_laws/laws = new() // Start with an empty lawset. - for(1 to rand(1, 3)) + for(var/i=1 to rand(1, 3)) laws.add_ion_law(generate_ion_law(exclude_crew_names = TRUE)) return laws diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 72575492ed..1c4079de15 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -935,7 +935,7 @@ if("Prevent Digestion") user.digestable = FALSE - message_admins("[key_name(user)] toggled their digestability to [user.digestable] ([user ? "JMP" : "null"])") + message_admins("[key_name(user)] toggled their digestability to [user.digestable] [ADMIN_COORDJMP(user)]") if(user.client.prefs_vr) user.client.prefs_vr.digestable = user.digestable @@ -1002,7 +1002,7 @@ if("Prevent Mob Predation") user.allowmobvore = FALSE - message_admins("[key_name(user)] toggled their mob vore preference to [user.allowmobvore] ([user ? "JMP" : "null"])") + message_admins("[key_name(user)] toggled their mob vore preference to [user.allowmobvore] [ADMIN_COORDJMP(user)]") if(user.client.prefs_vr) user.client.prefs_vr.allowmobvore = user.allowmobvore diff --git a/maps/virgo_minitest/virgo_minitest.dm b/maps/virgo_minitest/virgo_minitest.dm index 5906fae2f6..4a7f68fbaf 100644 --- a/maps/virgo_minitest/virgo_minitest.dm +++ b/maps/virgo_minitest/virgo_minitest.dm @@ -10,7 +10,7 @@ #define USING_MAP_DATUM /datum/map/virgo_minitest - #warning Please uncheck virgo_minitest.dm before committing. + #warn Please uncheck virgo_minitest before committing #elif !defined(MAP_OVERRIDE)