cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds the research module, condensed into one commit so far.

Browse Source
This commit is contained in:
Neerti
2015-04-04 20:17:59 -04:00
parent 298240cf09
commit 326fde4c5f
24 changed files with 448 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -265,7 +265,8 @@
module_sprites["Bro"] = "Brobot"
module_sprites["Rich"] = "maximillion"
module_sprites["Default"] = "Service2"
module_sprites["Drone"] = "drone-service" // How does this even work...? Oh well.
module_sprites["Drone - Service"] = "drone-service"
module_sprites["Drone - Hydro"] = "drone-hydro"
if("Clerical")
module = new /obj/item/weapon/robot_module/clerical(src)
@@ -277,6 +278,12 @@
module_sprites["Default"] = "Service2"
module_sprites["Drone"] = "drone-service"
if("Research")
module = new /obj/item/weapon/robot_module/research(src)
module.channels = list("Science" = 1)
module_sprites["Droid"] = "droid-science"
module_sprites["Drone"] = "drone-science"
if("Miner")
module = new /obj/item/weapon/robot_module/miner(src)
module.channels = list("Supply" = 1)
@@ -296,7 +303,8 @@
module_sprites["Standard"] = "surgeon"
module_sprites["Advanced Droid"] = "droid-medical"
module_sprites["Needles"] = "medicalrobot"
module_sprites["Drone" ] = "drone-medical"
module_sprites["Drone - Medical" ] = "drone-medical"
module_sprites["Drone - Chemistry" ] = "drone-chemistry"
if("Surgeon")
module = new /obj/item/weapon/robot_module/surgeon(src)
@@ -731,7 +739,7 @@
else
user << "Unable to locate a radio."
else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) // trying to unlock the interface with an ID card
else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)||istype(W, /obj/item/weapon/card/robot)) // trying to unlock the interface with an ID card
if(emagged)//still allow them to open the cover
user << "The interface seems slightly damaged"
if(opened)
@@ -868,6 +876,10 @@
//if they are holding or wearing a card that has access, that works
if(check_access(H.get_active_hand()) || check_access(H.wear_id))
return 1
else if(istype(M, /mob/living/silicon/robot))
var/mob/living/silicon/robot/R = M
if(check_access(R.get_active_hand()) || istype(R.get_active_hand(), /obj/item/weapon/card/robot))
return 1
return 0
/mob/living/silicon/robot/proc/check_access(obj/item/weapon/card/id/I)