mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 11:07:12 +01:00
Various bugfixes (#15873)
* pAI Record Fix * AI Respawnability * Wine Reagents * Ghost Repulsing * Agent ID Card Numbers * Maint Drone Lights * Fix fixes Co-authored-by: Farie82 <farie82@users.noreply.github.com> * Headpocket runtimes Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
@@ -58,7 +58,7 @@
|
||||
icon_state = "orange" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
|
||||
tastes = list("orange" = 1)
|
||||
filling_color = "#FFA500"
|
||||
distill_reagent = "triple_sec"
|
||||
distill_reagent = "tequilasunrise"
|
||||
|
||||
// Lemon
|
||||
/obj/item/seeds/lemon
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
filling_color = "#FFD700"
|
||||
bitesize_mod = 2
|
||||
tastes = list("cocoa" = 1)
|
||||
distill_reagent = "creme_de_cacao"
|
||||
|
||||
// Vanilla Pod
|
||||
/obj/item/seeds/cocoapod/vanillapod
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
icon_state = "tobacco_leaves"
|
||||
tastes = list("tobacco" = 1)
|
||||
filling_color = "#008000"
|
||||
distill_reagent = "creme_de_menthe" //Menthol, I guess.
|
||||
distill_reagent = "menthol"
|
||||
|
||||
// Space Tobacco
|
||||
/obj/item/seeds/tobacco/space
|
||||
|
||||
@@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(empty_playable_ai_cores)
|
||||
current_mode.possible_traitors.Remove(src)
|
||||
|
||||
// Ghost the current player and disallow them to return to the body
|
||||
ghostize(FALSE)
|
||||
ghostize()
|
||||
// Delete the old AI shell
|
||||
qdel(src)
|
||||
|
||||
|
||||
@@ -362,6 +362,10 @@
|
||||
. = ..()
|
||||
density = emagged //this is reset every canmove update otherwise
|
||||
|
||||
/mob/living/silicon/robot/drone/add_ventcrawl(obj/machinery/atmospherics/starting_machine)
|
||||
..()
|
||||
update_headlamp(TRUE, 0, FALSE)
|
||||
|
||||
/mob/living/silicon/robot/drone/flash_eyes(intensity = 1, override_blindness_check = FALSE, affect_silicon = FALSE, visual = FALSE)
|
||||
if(affect_silicon)
|
||||
return ..()
|
||||
|
||||
@@ -1146,17 +1146,20 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
|
||||
if(stat || lamp_recharging || low_power_mode)
|
||||
to_chat(src, "<span class='danger'>This function is currently offline.</span>")
|
||||
return
|
||||
if(is_ventcrawling(src))
|
||||
return
|
||||
|
||||
//Some sort of magical "modulo" thing which somehow increments lamp power by 2, until it hits the max and resets to 0.
|
||||
lamp_intensity = (lamp_intensity+2) % (lamp_max+2)
|
||||
to_chat(src, "[lamp_intensity ? "Headlamp power set to Level [lamp_intensity/2]" : "Headlamp disabled."]")
|
||||
update_headlamp()
|
||||
|
||||
/mob/living/silicon/robot/proc/update_headlamp(turn_off = 0, cooldown = 100)
|
||||
/mob/living/silicon/robot/proc/update_headlamp(turn_off = 0, cooldown = 100, show_warning = TRUE)
|
||||
set_light(0)
|
||||
|
||||
if(lamp_intensity && (turn_off || stat || low_power_mode))
|
||||
to_chat(src, "<span class='danger'>Your headlamp has been deactivated.</span>")
|
||||
if(show_warning)
|
||||
to_chat(src, "<span class='danger'>Your headlamp has been deactivated.</span>")
|
||||
lamp_intensity = 0
|
||||
lamp_recharging = 1
|
||||
spawn(cooldown) //10 seconds by default, if the source of the deactivation does not keep stat that long.
|
||||
|
||||
@@ -148,7 +148,7 @@
|
||||
|
||||
. = TRUE
|
||||
|
||||
if(!pda.silent)
|
||||
if(pda && !pda.silent)
|
||||
playsound(pda, 'sound/machines/terminal_select.ogg', 15, TRUE)
|
||||
|
||||
switch(action)
|
||||
|
||||
@@ -51,15 +51,18 @@
|
||||
held_item = null
|
||||
|
||||
/obj/item/organ/internal/headpocket/emp_act(severity)
|
||||
held_item.emp_act(severity)
|
||||
if(held_item)
|
||||
held_item.emp_act(severity)
|
||||
..()
|
||||
|
||||
/obj/item/organ/internal/headpocket/hear_talk(mob/living/M, list/message_pieces)
|
||||
held_item.hear_talk(M, message_pieces)
|
||||
if(held_item)
|
||||
held_item.hear_talk(M, message_pieces)
|
||||
..()
|
||||
|
||||
/obj/item/organ/internal/headpocket/hear_message(mob/living/M, msg)
|
||||
held_item.hear_message(M, msg)
|
||||
if(held_item)
|
||||
held_item.hear_message(M, msg)
|
||||
..()
|
||||
|
||||
/obj/item/organ/internal/heart/skrell
|
||||
|
||||
Reference in New Issue
Block a user