cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

VS: Language issues

Browse Source 
These issues don't prevent compiling, but are strange issues nonetheless.
This commit is contained in:
Aronai Sieyes
2020-05-09 16:53:59 -04:00
parent 5a42a3a76e
commit d1e7821b15
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/autotransfer.dm
View File

@@ -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("<b>Warning: You have one hour left in the shift. Wrap up your scenes in the next 60 minutes before the transfer is called.</b>") //VOREStation Edit
if (round_duration_in_ds >= shift_hard_end - 1 MINUTE)
init_shift_change(null, 1)

6
code/game/objects/items/weapons/RCD_vr.dm
View File

@@ -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.

2
code/modules/media/mediamanager.dm
View File

@@ -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

16
code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
View File

@@ -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 @@
. += "<span class='notice'>[src] is dry.</span>"
/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, "<span class='notice'>You finish licking off \the [target.name].</span>")
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].", "<span class='notice'>You finish eating \the [target.name].</span>")
to_chat(user, "<span class='notice'>You finish off \the [target.name].</span>")
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].", "<span class='notice'>You finish swallowing \the [target.name].</span>")
to_chat(user, "<span class='notice'>You finish off \the [target.name], and gain some charge!</span>")
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

2
code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm
View File

@@ -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

4
code/modules/vore/eating/vorepanel_vr.dm
View File

@@ -935,7 +935,7 @@
if("Prevent Digestion")
user.digestable = FALSE
message_admins("[key_name(user)] toggled their digestability to [user.digestable] ([user ? "<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[user.loc.];Y=[user.loc.y];Z=[user.loc.z]'>JMP</a>" : "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 ? "<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[user.loc.];Y=[user.loc.y];Z=[user.loc.z]'>JMP</a>" : "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

2
maps/virgo_minitest/virgo_minitest.dm
View File

@@ -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)