Glorious /vg/ Lighting Port (#66)

* fuck

* [CANT WAKE UP]

* AAAAAAAAAHHHHHHHHHHHH

* SAAAAVE MEEEEEEEEEEEEEEEE

* this is so bad how can i even call myself a coder

* thanks fam

* hello darkness my old friend

i've come to talk with you again

* ugh go away

* OH

* much less broken

* ayy

* aaaaa

* OH YEAAAAAAAAHHHHHHHHHHH

* aaaa

* k

* dfgjtxkytkjyd

* debug

* dangerously cheesy

* mm

* OH YEAAAAAAAAAAAAAAAAAAAAAAAAAA

* oH YEAH

* Some final touches and cleanup of the lighting port.

* One more

* More fixes.

* varedit hack for easy modification

* fixed

* C O L O R

* slym

* fffff

* oh great what the fuck is wrong now

* Revert "oh great what the fuck is wrong now"

This reverts commit e589ad51facb5464e107ca515317d41136dd1e5e.

* fu

* will it blend

* aaaaaaaaaaaaaaaaaaaa

* this is why im bad at porting

falalalala, lala la la

* k

* yeh

* can't forget majestic fire
This commit is contained in:
L.E.D
2016-11-06 09:51:16 -05:00
committed by TalkingCactus
parent 9b07cb4798
commit e1956df149
141 changed files with 1508 additions and 958 deletions
+2 -2
View File
@@ -109,7 +109,7 @@
on_fire = 1
src.visible_message("<span class='warning'>[src] catches fire!</span>", \
"<span class='userdanger'>You're set on fire!</span>")
src.AddLuminosity(3)
src.set_light(light_range + 3)
throw_alert("fire", /obj/screen/alert/fire)
update_fire()
return TRUE
@@ -119,7 +119,7 @@
if(on_fire)
on_fire = 0
fire_stacks = 0
src.AddLuminosity(-3)
src.set_light(light_range - 3)
clear_alert("fire")
update_fire()
+1 -1
View File
@@ -738,7 +738,7 @@ var/list/ai_list = list()
src << "Camera lights deactivated."
for (var/obj/machinery/camera/C in lit_cameras)
C.SetLuminosity(0)
C.set_light(0)
lit_cameras = list()
return
@@ -1148,7 +1148,7 @@
update_headlamp()
/mob/living/silicon/robot/proc/update_headlamp(var/turn_off = 0, var/cooldown = 100)
SetLuminosity(0)
set_light(0)
if(lamp_intensity && (turn_off || stat || low_power_mode))
src << "<span class='danger'>Your headlamp has been deactivated.</span>"
@@ -1157,7 +1157,7 @@
spawn(cooldown) //10 seconds by default, if the source of the deactivation does not keep stat that long.
lamp_recharging = 0
else
AddLuminosity(lamp_intensity)
set_light(lamp_intensity)
if(lamp_button)
lamp_button.icon_state = "lamp[lamp_intensity]"
@@ -101,14 +101,14 @@
if(stat)
return 0
on = 1
SetLuminosity(initial(luminosity))
set_light(initial(luminosity))
update_icon()
diag_hud_set_botstat()
return 1
/mob/living/simple_animal/bot/proc/turn_off()
on = 0
SetLuminosity(0)
set_light(0)
bot_reset() //Resets an AI's call, should it exist.
update_icon()
@@ -863,7 +863,7 @@ Pass a positive integer as an argument to override a bot's default speed.
else
user << "<span class='warning'>[card] is inactive.</span>"
else
user << "<span class='warning'>The personality slot is locked.</span>"
user << "<span class='warning'>The personality slot is locked.</span>"
else
user << "<span class='warning'>[src] is not compatible with [card]</span>"
@@ -255,7 +255,7 @@
emote_hear = list("barks!", "woofs!", "yaps.","pants.")
emote_see = list("shakes its head.", "chases its tail.","shivers.")
desc = initial(desc)
SetLuminosity(0)
set_light(0)
if(inventory_head && inventory_head.dog_fashion)
var/datum/dog_fashion/DF = new inventory_head.dog_fashion(src)
@@ -119,7 +119,7 @@
/mob/living/simple_animal/drone/cogscarab/New()
. = ..()
SetLuminosity(2,1)
set_light(2,1)
qdel(access_card) //we don't have free access
access_card = null
verbs -= /mob/living/simple_animal/drone/verb/check_laws
@@ -16,9 +16,9 @@
set category = "Drone"
set name = "Toggle drone light"
if(light_on)
AddLuminosity(-8)
set_light(0)
else
AddLuminosity(8)
set_light(8)
light_on = !light_on
@@ -51,4 +51,3 @@
staticChoice = selectedStatic
updateSeeStaticMobs()
@@ -248,10 +248,10 @@ var/global/list/parasites = list() //all currently existing/living guardians
/mob/living/simple_animal/hostile/guardian/proc/ToggleLight()
if(!luminosity)
src << "<span class='notice'>You activate your light.</span>"
SetLuminosity(3)
set_light(3)
else
src << "<span class='notice'>You deactivate your light.</span>"
SetLuminosity(0)
set_light(0)
/mob/living/simple_animal/hostile/guardian/verb/ShowType()
set name = "Check Guardian Type"
@@ -110,8 +110,8 @@
return null
// Check for darkness
var/turf/T = get_turf(loc)
if(T && destination && T.lighting_object)
if(T.lighting_lumcount<1 && destination.lighting_lumcount<1) // No one can see us in the darkness, right?
if(T && destination)
if((T.get_lumcount())<1 && (destination.get_lumcount())<1) // No one can see us in the darkness, right?
return null
if(T == destination)
destination = null
+2 -12
View File
@@ -102,12 +102,7 @@ var/next_mob_id = 0
msg = blind_message
else
continue
else if(T.lighting_object)
if(T.lighting_object.invisibility <= M.see_invisible && !T.lighting_object.luminosity)
if(blind_message) //if the light object is dark and not invisible to us, we see blind_message/nothing
msg = blind_message
else
continue
M.show_message(msg,1,blind_message,2)
/mob/proc/get_top_level_mob()
@@ -140,12 +135,7 @@ proc/get_top_level_mob(var/mob/S)
msg = blind_message
else
continue
else if(T.lighting_object)
if(T.lighting_object.invisibility <= M.see_invisible && !T.lighting_object.luminosity) //the light object is dark and not invisible to us
if(blind_message)
msg = blind_message
else
continue
M.show_message(msg,1,blind_message,2)
// Show a message to all mobs in earshot of this one