mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 19:47:22 +01:00
Reduce lines by removing blank lines added by PJ's script
This commit is contained in:
@@ -15,7 +15,6 @@
|
||||
/obj/machinery/media/receiver/boombox/attack_hand(var/mob/user)
|
||||
if(stat & (NOPOWER|BROKEN))
|
||||
to_chat(usr, "\red You don't see anything to mess with.")
|
||||
|
||||
return
|
||||
user.set_machine(src)
|
||||
interact(user)
|
||||
@@ -61,7 +60,6 @@
|
||||
connect_frequency()
|
||||
else
|
||||
to_chat(usr, "\red Invalid FM frequency. (90.0, 200.0)")
|
||||
|
||||
updateDialog()
|
||||
|
||||
|
||||
|
||||
@@ -137,7 +137,6 @@
|
||||
else
|
||||
to_chat(usr, "\red Invalid FM frequency. (90.0, 200.0)")
|
||||
|
||||
|
||||
/obj/machinery/media/transmitter/broadcast/process()
|
||||
if(stat & (NOPOWER|BROKEN))
|
||||
return
|
||||
@@ -163,12 +162,10 @@
|
||||
|
||||
// to_chat(world, "got [transfer_moles] moles at [removed.temperature]")
|
||||
|
||||
|
||||
if(removed)
|
||||
|
||||
var/heat_capacity = removed.heat_capacity()
|
||||
// to_chat(world, "heating ([heat_capacity])")
|
||||
|
||||
if(heat_capacity) // Added check to avoid divide by zero (oshi-) runtime errors -- TLE
|
||||
if(removed.temperature < MAX_TEMP + T0C)
|
||||
removed.temperature = min(removed.temperature + heating_power/heat_capacity, 1000) // Added min() check to try and avoid wacky superheating issues in low gas scenarios -- TLE
|
||||
@@ -177,11 +174,9 @@
|
||||
|
||||
// to_chat(world, "now at [removed.temperature]")
|
||||
|
||||
|
||||
env.merge(removed)
|
||||
|
||||
// to_chat(world, "turf now at [env.temperature]")
|
||||
|
||||
/*
|
||||
// Checks heat from the environment and applies any integrity damage
|
||||
var/datum/gas_mixture/environment = loc.return_air()
|
||||
|
||||
@@ -116,7 +116,6 @@ var/global/loopModeNames=list(
|
||||
/obj/machinery/media/jukebox/attack_hand(var/mob/user)
|
||||
if(stat & NOPOWER)
|
||||
to_chat(usr, "\red You don't see anything to mess with.")
|
||||
|
||||
return
|
||||
if(stat & BROKEN && playlist!=null)
|
||||
user.visible_message("\red <b>[user.name] smacks the side of \the [src.name].</b>","\red You hammer the side of \the [src.name].")
|
||||
@@ -182,7 +181,6 @@ var/global/loopModeNames=list(
|
||||
..()
|
||||
if(emagged)
|
||||
to_chat(usr, "\red You touch the bluescreened menu. Nothing happens. You feel dumber.")
|
||||
|
||||
return
|
||||
|
||||
if (href_list["power"])
|
||||
@@ -193,7 +191,6 @@ var/global/loopModeNames=list(
|
||||
if (href_list["playlist"])
|
||||
if(!check_reload())
|
||||
to_chat(usr, "\red You must wait 60 seconds between playlist reloads.")
|
||||
|
||||
return
|
||||
playlist_id=href_list["playlist"]
|
||||
last_reload=world.time
|
||||
|
||||
@@ -82,7 +82,6 @@ if(vlc.attachEvent) {
|
||||
|
||||
#ifdef DEBUG_MEDIAPLAYER
|
||||
to_chat(#define MP_DEBUG(x) owner, x)
|
||||
|
||||
#warning Please comment out #define DEBUG_MEDIAPLAYER before committing.
|
||||
#else
|
||||
#define MP_DEBUG(x)
|
||||
@@ -139,7 +138,6 @@ to_chat(#define MP_DEBUG(x) owner, x)
|
||||
targetURL = M.media_url
|
||||
targetStartTime = M.media_start_time
|
||||
// to_chat(owner, "Found audio source: [M.media_url] @ [(world.time - start_time) / 10]s.")
|
||||
|
||||
//else
|
||||
// testing("M is not playing or null.")
|
||||
|
||||
@@ -158,7 +156,6 @@ to_chat(#define MP_DEBUG(x) owner, x)
|
||||
|
||||
if(!media || !istype(media))
|
||||
to_chat(usr, "You have no media datum to change, if you're not in the lobby tell an admin.")
|
||||
|
||||
return
|
||||
var/value = input("Choose your Jukebox volume.", "Jukebox volume", media.get_volume())
|
||||
value = round(max(0, min(100, value)))
|
||||
|
||||
Reference in New Issue
Block a user