mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
VS: Language issues
These issues don't prevent compiling, but are strange issues nonetheless.
This commit is contained in:
@@ -18,7 +18,7 @@ datum/controller/transfer_controller/process()
|
|||||||
currenttick = currenttick + 1
|
currenttick = currenttick + 1
|
||||||
//VOREStation Edit START
|
//VOREStation Edit START
|
||||||
if (round_duration_in_ds >= shift_last_vote - 2 MINUTES)
|
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
|
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)
|
if (round_duration_in_ds >= shift_hard_end - 1 MINUTE)
|
||||||
init_shift_change(null, 1)
|
init_shift_change(null, 1)
|
||||||
|
|||||||
@@ -9,9 +9,9 @@
|
|||||||
var/ammostate
|
var/ammostate
|
||||||
var/list/effects = list()
|
var/list/effects = list()
|
||||||
|
|
||||||
var/static/image/radial_image_airlock = image(icon = 'icons/mob/radial.dmi', icon_state = "airlock"),
|
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_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_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")
|
var/static/image/radial_image_floorwall = image(icon = 'icons/mob/radial.dmi', icon_state = "wallfloor")
|
||||||
|
|
||||||
// Ammo for the (non-electric) RCDs.
|
// Ammo for the (non-electric) RCDs.
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
#ifdef DEBUG_MEDIAPLAYER
|
#ifdef DEBUG_MEDIAPLAYER
|
||||||
#define MP_DEBUG(x) to_chat(owner,x)
|
#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
|
#else
|
||||||
#define MP_DEBUG(x)
|
#define MP_DEBUG(x)
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
var/emagged = 0
|
var/emagged = 0
|
||||||
|
|
||||||
/obj/item/weapon/dogborg/jaws/small/attack_self(mob/user)
|
/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)
|
if(R.emagged || R.emag_items)
|
||||||
emagged = !emagged
|
emagged = !emagged
|
||||||
if(emagged)
|
if(emagged)
|
||||||
@@ -187,7 +187,7 @@
|
|||||||
. += "<span class='notice'>[src] is dry.</span>"
|
. += "<span class='notice'>[src] is dry.</span>"
|
||||||
|
|
||||||
/obj/item/device/dogborg/tongue/attack_self(mob/user)
|
/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)
|
if(R.emagged || R.emag_items)
|
||||||
emagged = !emagged
|
emagged = !emagged
|
||||||
if(emagged)
|
if(emagged)
|
||||||
@@ -222,7 +222,7 @@
|
|||||||
to_chat(user, "<span class='notice'>You finish licking off \the [target.name].</span>")
|
to_chat(user, "<span class='notice'>You finish licking off \the [target.name].</span>")
|
||||||
water.use_charge(5)
|
water.use_charge(5)
|
||||||
qdel(target)
|
qdel(target)
|
||||||
var/mob/living/silicon/robot.R = user
|
var/mob/living/silicon/robot/R = user
|
||||||
R.cell.charge += 50
|
R.cell.charge += 50
|
||||||
else if(istype(target,/obj/item))
|
else if(istype(target,/obj/item))
|
||||||
if(istype(target,/obj/item/trash))
|
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>")
|
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>")
|
to_chat(user, "<span class='notice'>You finish off \the [target.name].</span>")
|
||||||
qdel(target)
|
qdel(target)
|
||||||
var/mob/living/silicon/robot.R = user
|
var/mob/living/silicon/robot/R = user
|
||||||
R.cell.charge += 250
|
R.cell.charge += 250
|
||||||
water.use_charge(5)
|
water.use_charge(5)
|
||||||
return
|
return
|
||||||
@@ -240,8 +240,8 @@
|
|||||||
if(do_after (user, 50))
|
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>")
|
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>")
|
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/mob/living/silicon/robot/R = user
|
||||||
var/obj/item/weapon/cell.C = target
|
var/obj/item/weapon/cell/C = target
|
||||||
R.cell.charge += C.maxcharge / 3
|
R.cell.charge += C.maxcharge / 3
|
||||||
water.use_charge(5)
|
water.use_charge(5)
|
||||||
qdel(target)
|
qdel(target)
|
||||||
@@ -255,7 +255,7 @@
|
|||||||
target.clean_blood()
|
target.clean_blood()
|
||||||
else if(ishuman(target))
|
else if(ishuman(target))
|
||||||
if(src.emagged)
|
if(src.emagged)
|
||||||
var/mob/living/silicon/robot.R = user
|
var/mob/living/silicon/robot/R = user
|
||||||
var/mob/living/L = target
|
var/mob/living/L = target
|
||||||
if(R.cell.charge <= 666)
|
if(R.cell.charge <= 666)
|
||||||
return
|
return
|
||||||
@@ -298,7 +298,7 @@
|
|||||||
flags |= NOBLUDGEON
|
flags |= NOBLUDGEON
|
||||||
|
|
||||||
/obj/item/pupscrubber/attack_self(mob/user)
|
/obj/item/pupscrubber/attack_self(mob/user)
|
||||||
var/mob/living/silicon/robot.R = user
|
var/mob/living/silicon/robot/R = user
|
||||||
if(!enabled)
|
if(!enabled)
|
||||||
R.scrubbing = TRUE
|
R.scrubbing = TRUE
|
||||||
enabled = TRUE
|
enabled = TRUE
|
||||||
|
|||||||
@@ -157,7 +157,7 @@
|
|||||||
|
|
||||||
if("corrupted") // Load them up with ion laws.
|
if("corrupted") // Load them up with ion laws.
|
||||||
var/datum/ai_laws/laws = new() // Start with an empty lawset.
|
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))
|
laws.add_ion_law(generate_ion_law(exclude_crew_names = TRUE))
|
||||||
return laws
|
return laws
|
||||||
|
|
||||||
|
|||||||
@@ -935,7 +935,7 @@
|
|||||||
if("Prevent Digestion")
|
if("Prevent Digestion")
|
||||||
user.digestable = FALSE
|
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)
|
if(user.client.prefs_vr)
|
||||||
user.client.prefs_vr.digestable = user.digestable
|
user.client.prefs_vr.digestable = user.digestable
|
||||||
@@ -1002,7 +1002,7 @@
|
|||||||
if("Prevent Mob Predation")
|
if("Prevent Mob Predation")
|
||||||
user.allowmobvore = FALSE
|
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)
|
if(user.client.prefs_vr)
|
||||||
user.client.prefs_vr.allowmobvore = user.allowmobvore
|
user.client.prefs_vr.allowmobvore = user.allowmobvore
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
#define USING_MAP_DATUM /datum/map/virgo_minitest
|
#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)
|
#elif !defined(MAP_OVERRIDE)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user