Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 03fb988

Browse files
committed
More cleaning up
1 parent e80a8c3 commit 03fb988

File tree

2 files changed

+3
-30
lines changed

2 files changed

+3
-30
lines changed

code/controllers/subsystem/pai.dm

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,6 @@ SUBSYSTEM_DEF(pai)
99
var/list/paicard_list = list()
1010

1111
/datum/controller/subsystem/pai/Topic(href, href_list[])
12-
if(href_list["download"])
13-
var/datum/paiCandidate/candidate = locate(href_list["candidate"]) in candidates
14-
var/obj/item/computer_hardware/paicard/card = locate(href_list["device"]) in paicard_list
15-
if(card.pai)
16-
return
17-
if(istype(card, /obj/item/computer_hardware/paicard) && istype(candidate, /datum/paiCandidate))
18-
if(check_ready(candidate) != candidate)
19-
return FALSE
20-
var/mob/living/silicon/pai/pai = new(card)
21-
if(!candidate.name)
22-
pai.name = pick(GLOB.ninja_names)
23-
else
24-
pai.name = candidate.name
25-
pai.real_name = pai.name
26-
pai.key = candidate.key
27-
28-
card.setPersonality(pai)
29-
30-
candidates -= candidate
31-
usr << browse(null, "window=findPai")
32-
3312
if(href_list["new"])
3413
var/datum/paiCandidate/candidate = locate(href_list["candidate"]) in candidates
3514
var/option = href_list["option"]

code/modules/mob/living/silicon/pai/software.dm

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,9 @@
6262
data["master"] = master
6363
data["masterdna"] = master_dna
6464
data["ram"] = ram
65-
if(!isnull(environment))
66-
data["pressure"] = round(pressure,0.1)
67-
data["gases"] = gases
68-
data["temperature"] = round(environment.return_temperature()-T0C)
69-
else
70-
data["pressure"] = pressure
71-
data["gases"] = gases
72-
data["temperature"] = null
65+
data["pressure"] = !isnull(environment) ? round(pressure,0.1) : pressure
66+
data["gases"] = gases
67+
data["temperature"] = !isnull(environment) ? round(environment.return_temperature()-T0C) : null
7368
data["hacking"] = hacking
7469
data["hackprogress"] = hackprogress
7570
data["cable"] = cable_status
@@ -114,7 +109,6 @@
114109
CheckDNA(get(card, /mob/living/carbon/human), src) //you should only be able to check when directly in hand, muh immersions?
115110
else
116111
to_chat(src, "You are not being carried by anyone!")
117-
return 0 // FALSE ? If you return here you won't call paiinterface() below
118112
if("update_image")
119113
card.setEmotion(params["updated_image"])
120114
if("buy")

0 commit comments

Comments
 (0)