cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

MEDBAY AND RESEARCH DIVISION HAVE BEEN COMPLETELY REMAPPED.

Browse Source 
Added a CMO biosuit (Sprites thanks to Petethegoat)
Scientists and the RD no longer have medbay access, as research now connects to the hallway.
Added a wall-mounted medical vendor.
Committing some stuff for Petethegoat: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=5744&p=49236#p49236 For more info regarding the patch.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2060 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Superxpdude@gmail.com
2011-08-29 03:04:52 +00:00
parent 0d5948fdea
commit edd3fa0f9f
11 changed files with 6059 additions and 6141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/clothing/suit.dm
+3
View File
@@ -58,6 +58,9 @@
/obj/item/clothing/suit/bio_suit/scientist
icon_state = "bio_scientist"
/obj/item/clothing/suit/bio_suit/cmo
icon_state = "bio_cmo"
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit
name = "Plague doctor suit"
desc = "It protected doctors from the Black Death, back then. You bet your arse it's gonna help you against viruses."
code/defines/obj/vending.dm
+22
View File
@@ -102,6 +102,28 @@
product_hidden = "/obj/item/weapon/reagent_containers/pill/tox;/obj/item/weapon/reagent_containers/pill/stox;/obj/item/weapon/reagent_containers/pill/antitox"
product_hideamt = "3;4;6"
/obj/machinery/vending/wallmed1
name = "NanoMed"
desc = "Wall-mounted Medical Equipment dispenser."
icon_state = "wallmed"
icon_deny = "wallmed-deny"
req_access_txt = "5"
product_paths = "/obj/item/stack/medical/bruise_pack;/obj/item/stack/medical/ointment;/obj/item/weapon/reagent_containers/syringe/inaprovaline;/obj/item/device/healthanalyzer"
product_amounts = "2;2;4;1"
product_hidden = "/obj/item/weapon/reagent_containers/syringe/antitoxin;/obj/item/weapon/reagent_containers/syringe/antiviral;/obj/item/weapon/reagent_containers/pill/tox"
product_hideamt = "4;4;1"
/obj/machinery/vending/wallmed2
name = "NanoMed"
desc = "Wall-mounted Medical Equipment dispenser."
icon_state = "wallmed"
icon_deny = "wallmed-deny"
req_access_txt = "5"
product_paths = "/obj/item/weapon/reagent_containers/syringe/inaprovaline;/obj/item/weapon/reagent_containers/syringe/antitoxin;/obj/item/stack/medical/bruise_pack;/obj/item/stack/medical/ointment;/obj/item/device/healthanalyzer"
product_amounts = "5;3;3;3;3"
product_hidden = "/obj/item/weapon/reagent_containers/pill/tox"
product_hideamt = "3"
/obj/machinery/vending/security
name = "SecTech"
desc = "A security equipment vendor"
code/game/jobs/access.dm
+2 -2
View File
@@ -173,7 +173,7 @@
if("Warden")
return list(access_security, access_brig, access_armory, access_court)
if("Scientist")
return list(access_tox, access_tox_storage, access_research, access_medical, access_xenobiology)
return list(access_tox, access_tox_storage, access_research, access_xenobiology)
if("Head of Security")
return list(access_medical, access_morgue, access_tox, access_tox_storage, access_chemistry, access_medlab, access_court,
access_teleporter, access_heads, access_tech_storage, access_security, access_brig, access_atmospherics,
@@ -215,7 +215,7 @@
access_heads, access_ai_upload, access_construction, access_robotics,
access_mint, access_ce, access_RC_announce)
if("Research Director") // removed hydroponics access, they are a supply field, not science
return list(access_medical, access_morgue, access_medlab, access_rd,
return list(access_medlab, access_rd,
access_tech_storage, access_maint_tunnels, access_heads, access_tox,
access_tox_storage, access_chemistry, access_teleporter, access_virology,
access_research, access_robotics, access_xenobiology, access_RC_announce)
code/game/machinery/bots/medbot.dm
+7 -1
View File
@@ -38,6 +38,7 @@
var/treatment_fire = "kelotane"
var/treatment_tox = "anti_toxin"
var/treatment_virus = "spaceacillin"
var/shut_up = 0 //self explanatory :)
/obj/machinery/bot/medbot/mysterious
name = "Mysterious Medibot"
@@ -129,6 +130,8 @@
dat += "Reagent Source: "
dat += "<a href='?src=\ref[src];use_beaker=1'>[src.use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]</a><br>"
dat += "The speaker switch is [src.shut_up ? "off" : "on"]. <a href='?src=\ref[src];togglevoice=[1]'>Toggle</a>"
user << browse("<HEAD><TITLE>Medibot v1.0 controls</TITLE></HEAD>[dat]", "window=automed")
onclose(user, "automed")
return
@@ -170,6 +173,9 @@
else
usr << "You cannot eject the beaker because the panel is locked!"
else if ((href_list["togglevoice"]) && (!src.locked))
src.shut_up = !src.shut_up
src.updateUsrDialog()
return
@@ -246,7 +252,7 @@
src.path = new()
if(!src.patient)
if(prob(1))
if(prob(1) && (!src.shut_up))
var/message = pick("Radar, put a mask on!","There's always a catch, and it's the best there is.","I knew it, I should've been a plastic surgeon.","What kind of medbay is this? Everyone's dropping like dead flies.","Delicious!")
src.speak(message)
code/game/machinery/vending.dm
+2 -1
View File
@@ -147,7 +147,8 @@
pdat += "The green light is [src.extended_inventory ? "on" : "off"].<BR>"
pdat += "The [(src.wires & WIRE_SCANID) ? "purple" : "yellow"] light is on.<BR>"
pdat += "The speaker switch is [src.shut_up ? "off" : "on"]. <a href='?src=\ref[src];togglevoice=[1]'>Toggle</a>"
if (product_slogans != "")
pdat += "The speaker switch is [src.shut_up ? "off" : "on"]. <a href='?src=\ref[src];togglevoice=[1]'>Toggle</a>"
user << browse(pdat, "window=vendwires")
onclose(user, "vendwires")
code/game/objects/closets/secure/medical.dm
+1 -1
View File
@@ -49,7 +49,7 @@
sleep(2)
new /obj/item/clothing/suit/labcoat/cmo( src )
new /obj/item/clothing/under/rank/chief_medical_officer( src )
new /obj/item/clothing/suit/bio_suit/general( src )
new /obj/item/clothing/suit/bio_suit/cmo( src )
new /obj/item/clothing/shoes/brown ( src )
new /obj/item/clothing/gloves/latex( src )
new /obj/item/clothing/head/bio_hood/general( src )
code/modules/mob/living/silicon/pai/software.dm
+7 -7
View File
@@ -9,15 +9,15 @@
/mob/living/silicon/pai/var/list/available_software = list(
"crew manifest" = 5,
"digital messenger" = 5,
"medical records" = 5,
"security records" = 5,
"medical records" = 15,
"security records" = 15,
//"camera jack" = 10,
"door jack" = 10,
"atmosphere sensor" = 10,
"door jack" = 30,
"atmosphere sensor" = 5,
//"heartbeat sensor" = 10,
"security HUD" = 10,
"medical HUD" = 10,
"universal translator" = 10,
"security HUD" = 20,
"medical HUD" = 20,
"universal translator" = 35,
//"projection array" = 15
)