cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'SkyMarshal-764432e'

Browse Source
This commit is contained in:
Albert Iordache
2011-12-10 12:35:15 +02:00
parent 5d2dfbcff7 764432e4e8
commit c68a22f497
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot.dm
+7
View File
@@ -71,6 +71,7 @@
hands.icon_state = "standard"
icon_state = "robot"
modtype = "Stand"
radio.borg(src, list())
if("Service")
module = new /obj/item/weapon/robot_module/butler(src)
@@ -87,12 +88,14 @@
else
icon_state = "Service2"
modtype = "Butler"
radio.borg(src, list())
if("Miner")
module = new /obj/item/weapon/robot_module/miner(src)
hands.icon_state = "miner"
icon_state = "Miner"
modtype = "Miner"
radio.borg(src, list("Mining" = 1))
if("Medical")
var/sprite = input(src,"Chassis Style", "Chassis Style", "Cancel") in list("Humanoid","Non-Humanoid")
@@ -103,6 +106,7 @@
if (sprite == "Non-Humanoid")
src.icon_state = "surgeon"
modtype = "Med"
radio.borg(src, list("Medical" = 1))
if("Security")
var/sprite = input(src,"Chassis Style", "Chassis Style", "Cancel") in list("Humanoid","Non-Humanoid")
@@ -113,6 +117,7 @@
if (sprite == "Non-Humanoid")
src.icon_state = "bloodhound"
modtype = "Sec"
radio.borg(src, list("Security" = 1))
if("Engineering")
var/sprite = input(src,"Chassis Style", "Chassis Style", "Cancel") in list("Humanoid","Non-Humanoid")
@@ -123,6 +128,7 @@
if (sprite == "Non-Humanoid")
src.icon_state = "landmate"
modtype = "Eng"
radio.borg(src, list("Engineering" = 1))
if("Janitor")
var/sprite = input(src,"Chassis Style", "Chassis Style", "Cancel") in list("Humanoid","Non-Humanoid")
@@ -133,6 +139,7 @@
if (sprite == "Non-Humanoid")
src.icon_state = "mopgearrex"
modtype = "Jan"
radio.borg(src, list())
overlays -= "eyes" //Takes off the eyes that it started with
updateicon()
code/modules/mob/living/silicon/say.dm
+7 -3
View File
@@ -26,9 +26,13 @@
message = copytext(message, 3)
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
holopad_talk(message)
else//Will not allow anyone by an active AI to use this function.
src << "This function is not available to you."
return
else if(istype(src,/mob/living/silicon/robot)) //Will not allow anyone by an active AI to use this function.
message = copytext(message, 3)
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
var/mob/living/silicon/robot/R = src
R.radio.talk_into(src, message, "department")
else
src << "You cannot use that channel."
else
return ..(message)
else