cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 02:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactors most spans

Browse Source
This commit is contained in:
Kashargul
2024-10-02 21:10:31 +02:00
parent 5417c7772c
commit a2c673ab7a
1517 changed files with 12436 additions and 12347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/helper_datums/getrev.dm
+4 -4
View File
@@ -15,7 +15,7 @@ GLOBAL_DATUM(revdata, /datum/getrev)
revision = REV.origin_commit || REV.commit
branch = "-Using TGS-" // TGS doesn't provide branch info yet
date = "-Using TGS-" // Or date
if(!revision) // File parse method
var/list/head_branch = file2list(".git/HEAD", "\n")
if(head_branch.len)
@@ -58,11 +58,11 @@ GLOBAL_DATUM(revdata, /datum/getrev)
set desc = "Check the current server code revision"
if(!GLOB.revdata)
to_chat(src, "<span class='warning'>Please wait until server initializations are complete.</span>")
to_chat(src, span_warning("Please wait until server initializations are complete."))
return
var/list/msg = list()
if(GLOB.revdata.revision)
msg += "<b>Server revision:</b> B:[GLOB.revdata.branch] D:[GLOB.revdata.date]"
if(config.githuburl)
code/datums/helper_datums/teleport.dm
+9 -9
View File
@@ -179,29 +179,29 @@ var/bluespace_item_types = newlist(/obj/item/storage/backpack/holding,
precision = max(rand(1,100)*bluespace_things.len,100)
if(istype(teleatom, /mob/living))
var/mob/living/MM = teleatom
to_chat(MM, "<span class='danger'>The Bluespace interface on your [teleatom] interferes with the teleport!</span>")
to_chat(MM, span_danger("The Bluespace interface on your [teleatom] interferes with the teleport!"))
return 1
/datum/teleport/instant/science/teleportChecks()
if(istype(teleatom, /obj/item/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
teleatom.visible_message(span_danger("\The [teleatom] bounces off of the portal!"))
return 0
if(!isemptylist(teleatom.search_contents_for(/obj/item/disk/nuclear)))
if(istype(teleatom, /mob/living))
var/mob/living/MM = teleatom
MM.visible_message("<span class='danger'>\The [MM] bounces off of the portal!</span>","<span class='warning'>Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through.</span>")
MM.visible_message(span_danger("\The [MM] bounces off of the portal!"),span_warning("Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through."))
else
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
teleatom.visible_message(span_danger("\The [teleatom] bounces off of the portal!"))
return 0
/* VOREStation Removal
if(destination.z in using_map.admin_levels) //CentCom z-level
if(istype(teleatom, /obj/mecha))
var/obj/mecha/MM = teleatom
to_chat(MM.occupant, "<span class='danger'>\The [MM] would not survive the jump to a location so far away!</span>")
to_chat(MM.occupant, span_danger("\The [MM] would not survive the jump to a location so far away!"))
return 0
if(!isemptylist(teleatom.search_contents_for(/obj/item/storage/backpack/holding)))
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
teleatom.visible_message(span_danger("\The [teleatom] bounces off of the portal!"))
return 0
*/ //VOREStation Removal End
//VOREStation Edit Start
@@ -209,7 +209,7 @@ var/bluespace_item_types = newlist(/obj/item/storage/backpack/holding,
var/turf/dest_turf = get_turf(destination)
if(local && !(dest_turf.z in using_map.player_levels))
if(istype(teleatom, /mob/living))
to_chat(teleatom, "<span class='warning'>The portal refuses to carry you that far away!</span>")
to_chat(teleatom, span_warning("The portal refuses to carry you that far away!"))
return 0
else if(istype(destination.loc, /obj/belly))
var/obj/belly/destination_belly = destination.loc
@@ -226,9 +226,9 @@ var/bluespace_item_types = newlist(/obj/item/storage/backpack/holding,
obstructed = 1
else if(!((isturf(destination) && !destination.density) || (isturf(destination.loc) && !destination.loc.density)) || !destination.x || !destination.y || !destination.z) //If we're inside something or outside universe
obstructed = 1
to_chat(teleatom, "<span class='warning'>Something is blocking way on the other side!</span>")
to_chat(teleatom, span_warning("Something is blocking way on the other side!"))
if(obstructed)
return 0
else
return 1
//VOREStation Edit End
//VOREStation Edit End