mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-10 14:44:05 +01:00
Final Push
This commit is contained in:
@@ -26,7 +26,8 @@
|
||||
"Mouse" = "mouse",
|
||||
"Monkey" = "monkey",
|
||||
"Corgi" = "borgi",
|
||||
"Fox" = "fox"
|
||||
"Fox" = "fox",
|
||||
"Parrot" = "parrot"
|
||||
)
|
||||
|
||||
var/global/list/possible_say_verbs = list(
|
||||
@@ -440,7 +441,7 @@
|
||||
|
||||
/mob/living/silicon/pai/attack_hand(mob/user as mob)
|
||||
if(stat == 2) return
|
||||
if(user.a_intent == "help" && src.loc != card)
|
||||
if(user.a_intent == "help")
|
||||
get_scooped(user)
|
||||
return
|
||||
else
|
||||
|
||||
@@ -569,7 +569,6 @@
|
||||
return 0
|
||||
held = held.loc
|
||||
count++
|
||||
user << "[held]"
|
||||
if(istype(held, /mob/living))
|
||||
data["holder"] = held
|
||||
data["health"] = "[held.stat > 1 ? "dead" : "[held.health]% healthy"]"
|
||||
@@ -595,12 +594,11 @@
|
||||
|
||||
else
|
||||
data["holder"] = 0
|
||||
src << "You are not being carried by anyone!"
|
||||
|
||||
ui = nanomanager.try_update_ui(user, user, id, ui,data , force_open)
|
||||
if(!ui)
|
||||
// Don't copy-paste this unless you're making a pAI software module!
|
||||
ui = new(user, user, id, "pai_bioscan.tmpl", "Host Bioscan", 450, 450)
|
||||
ui = new(user, user, id, "pai_bioscan.tmpl", "Host Bioscan", 400, 450)
|
||||
ui.set_initial_data(data)
|
||||
ui.open()
|
||||
//.set_auto_update(1)
|
||||
Reference in New Issue
Block a user