[worth] [currency]" - dat += "
New pile:" - - dat += "-" - dat += "-" - if(round<=0.1) - dat += "-" - if(round<=0.01) - dat += "-" - dat += "[split]" - if(round<=0.01) - dat += "+" - if(round<=0.1) - dat += "+" - dat += "+" - dat += "+" - dat += "
split" - - - user << browse(dat, "window=computer;size=400x500") - - onclose(user, "computer") - return - -/obj/item/weapon/spacecash/Topic(href, href_list) - if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) - usr.machine = src - - if (href_list["su"]) - var/samt = text2num(href_list["su"]) - if(split+samt
\n
\n" - -/obj/item/weapon/paper/Toxin - name = "paper- 'Chemical Information'" - info = "Known Onboard Toxins:
\n\tGrade A Semi-Liquid Plasma:
\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
\n\t\tA gas mask fails to filter plasma after 50 units.
\n\t\tWill attempt to diffuse like a gas.
\n\t\tFiltered by scrubbers.
\n\t\tThere is a bottled version which is very different
\n\t\t\tfrom the version found in canisters!
\n
\n\t\tWARNING: Highly Flammable. Keep away from heat sources
\n\t\texcept in a enclosed fire area!
\n\t\tWARNING: It is a crime to use this without authorization.
\nKnown Onboard Anti-Toxin:
\n\tAnti-Toxin Type 01P: Works against Grade A Plasma.
\n\t\tBest if injected directly into bloodstream.
\n\t\tA full injection is in every regular Med-Kit.
\n\t\tSpecial toxin Kits hold around 7.
\n
\nKnown Onboard Chemicals (other):
\n\tRejuvenation T#001:
\n\t\tEven 1 unit injected directly into the bloodstream
\n\t\t\twill cure paralysis and sleep toxins.
\n\t\tIf administered to a dying patient it will prevent
\n\t\t\tfurther damage for about units*3 seconds.
\n\t\t\tit will not cure them or allow them to be cured.
\n\t\tIt can be administeredd to a non-dying patient
\n\t\t\tbut the chemicals disappear just as fast.
\n\tSleep Toxin T#054:
\n\t\t5 units wilkl induce precisely 1 minute of sleep.
\n\t\t\tThe effect are cumulative.
\n\t\tWARNING: It is a crime to use this without authorization" - -/obj/item/weapon/paper/courtroom - name = "paper- 'A Crash Course in Legal SOP on SS13'" - info = "Roles:
\nThe Detective is basically the investigator and prosecutor.
\nThe Staff Assistant can perform these functions with written authority from the Detective.
\nThe Captain/HoP/Warden is ct as the judicial authority.
\nThe Security Officers are responsible for executing warrants, security during trial, and prisoner transport.
\n
\nInvestigative Phase:
\nAfter the crime has been committed the Detective's job is to gather evidence and try to ascertain not only who did it but what happened. He must take special care to catalogue everything and don't leave anything out. Write out all the evidence on paper. Make sure you take an appropriate number of fingerprints. IF he must ask someone questions he has permission to confront them. If the person refuses he can ask a judicial authority to write a subpoena for questioning. If again he fails to respond then that person is to be jailed as insubordinate and obstructing justice. Said person will be released after he cooperates.
\n
\nONCE the FT has a clear idea as to who the criminal is he is to write an arrest warrant on the piece of paper. IT MUST LIST THE CHARGES. The FT is to then go to the judicial authority and explain a small version of his case. If the case is moderately acceptable the authority should sign it. Security must then execute said warrant.
\n
\nPre-Pre-Trial Phase:
\nNow a legal representative must be presented to the defendant if said defendant requests one. That person and the defendant are then to be given time to meet (in the jail IS ACCEPTABLE). The defendant and his lawyer are then to be given a copy of all the evidence that will be presented at trial (rewriting it all on paper is fine). THIS IS CALLED THE DISCOVERY PACK. With a few exceptions, THIS IS THE ONLY EVIDENCE BOTH SIDES MAY USE AT TRIAL. IF the prosecution will be seeking the death penalty it MUST be stated at this time. ALSO if the defense will be seeking not guilty by mental defect it must state this at this time to allow ample time for examination.
\nNow at this time each side is to compile a list of witnesses. By default, the defendant is on both lists regardless of anything else. Also the defense and prosecution can compile more evidence beforehand BUT in order for it to be used the evidence MUST also be given to the other side.\nThe defense has time to compile motions against some evidence here.
\nPossible Motions:
\n1. Invalidate Evidence- Something with the evidence is wrong and the evidence is to be thrown out. This includes irrelevance or corrupt security.
\n2. Free Movement- Basically the defendant is to be kept uncuffed before and during the trial.
\n3. Subpoena Witness- If the defense presents god reasons for needing a witness but said person fails to cooperate then a subpoena is issued.
\n4. Drop the Charges- Not enough evidence is there for a trial so the charges are to be dropped. The FT CAN RETRY but the judicial authority must carefully reexamine the new evidence.
\n5. Declare Incompetent- Basically the defendant is insane. Once this is granted a medical official is to examine the patient. If he is indeed insane he is to be placed under care of the medical staff until he is deemed competent to stand trial.
\n
\nALL SIDES MOVE TO A COURTROOM
\nPre-Trial Hearings:
\nA judicial authority and the 2 sides are to meet in the trial room. NO ONE ELSE BESIDES A SECURITY DETAIL IS TO BE PRESENT. The defense submits a plea. If the plea is guilty then proceed directly to sentencing phase. Now the sides each present their motions to the judicial authority. He rules on them. Each side can debate each motion. Then the judicial authority gets a list of crew members. He first gets a chance to look at them all and pick out acceptable and available jurors. Those jurors are then called over. Each side can ask a few questions and dismiss jurors they find too biased. HOWEVER before dismissal the judicial authority MUST agree to the reasoning.
\n
\nThe Trial:
\nThe trial has three phases.
\n1. Opening Arguments- Each side can give a short speech. They may not present ANY evidence.
\n2. Witness Calling/Evidence Presentation- The prosecution goes first and is able to call the witnesses on his approved list in any order. He can recall them if necessary. During the questioning the lawyer may use the evidence in the questions to help prove a point. After every witness the other side has a chance to cross-examine. After both sides are done questioning a witness the prosecution can present another or recall one (even the EXACT same one again!). After prosecution is done the defense can call witnesses. After the initial cases are presented both sides are free to call witnesses on either list.
\nFINALLY once both sides are done calling witnesses we move onto the next phase.
\n3. Closing Arguments- Same as opening.
\nThe jury then deliberates IN PRIVATE. THEY MUST ALL AGREE on a verdict. REMEMBER: They mix between some charges being guilty and others not guilty (IE if you supposedly killed someone with a gun and you unfortunately picked up a gun without authorization then you CAN be found not guilty of murder BUT guilty of possession of illegal weaponry.). Once they have agreed they present their verdict. If unable to reach a verdict and feel they will never they call a deadlocked jury and we restart at Pre-Trial phase with an entirely new set of jurors.
\n
\nSentencing Phase:
\nIf the death penalty was sought (you MUST have gone through a trial for death penalty) then skip to the second part.
\nI. Each side can present more evidence/witnesses in any order. There is NO ban on emotional aspects or anything. The prosecution is to submit a suggested penalty. After all the sides are done then the judicial authority is to give a sentence.
\nII. The jury stays and does the same thing as I. Their sole job is to determine if the death penalty is applicable. If NOT then the judge selects a sentence.
\n
\nTADA you're done. Security then executes the sentence and adds the applicable convictions to the person's record.
\n" - -/obj/item/weapon/paper/hydroponics - name = "paper- 'Greetings from Billy Bob'" - info = "Hey fellow botanist!
\n
\nI didn't trust the station folk so I left
\na couple of weeks ago. But here's some
\ninstructions on how to operate things here.
\nYou can grow plants and each iteration they become
\nstronger, more potent and have better yield, if you
\nknow which ones to pick. Use your botanist's analyzer
\nfor that. You can turn harvested plants into seeds
\nat the seed extractor, and replant them for better stuff!
\nSometimes if the weed level gets high in the tray
\nmutations into different mushroom or weed species have
\nbeen witnessed. On the rare occassion even weeds mutate!
\n
\nEither way, have fun!
\n
\nBest regards,
\nBilly Bob Johnson.
\n
\nPS.
\nHere's a few tips:
\nIn nettles, potency = damage
\nIn amanitas, potency = deadliness + side effect
\nIn Liberty caps, potency = drug power + effect
\nIn chilis, potency = heat
\nNutrients keep mushrooms alive!
\nWater keeps weeds such as nettles alive!
\nAll other plants need both." - -/obj/item/weapon/paper/djstation - name = "paper - 'DJ Listening Outpost'" - info = "Welcome new owner!
You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:
- Equip yourself with a multi-tool
- Use the multitool on each machine, that is the broadcaster, receiver and the relay.
- Turn all the machines on, it has already been configured for you to listen on.
- 145.7 - Common Channel
- 144.7 - Private AI Channel
- 135.9 - Security Channel
- 135.7 - Engineering Channel
- 135.5 - Medical Channel
- 135.3 - Command Channel
- 135.1 - Science Channel
- 134.9 - Mining Channel
- 134.7 - Cargo Channel " - -/obj/item/weapon/paper/flag - icon_state = "flag_neutral" - item_state = "paper" - anchored = 1.0 - -/obj/item/weapon/paper/jobs - name = "paper- 'Job Information'" - info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
Equipment Locator "
+ dat += "- Custodial Locator "
if (istype(cartridge.radio, /obj/item/radio/integrated/signal))
dat += "
Signaler System "
if (cartridge.access_reagent_scanner)
dat += "
[scanmode == 3 ? "Disable" : "Enable"] Reagent Scanner "
if (cartridge.access_engine)
dat += "- [scanmode == 4 ? "Disable" : "Enable"] Halogen Counter "
+ if (cartridge.access_atmos)
+ dat += "
- [scanmode == 5 ? "Disable" : "Enable"] Gas Scanner "
if (cartridge.access_remote_door)
dat += "
Toggle Remote Door "
dat += "
Atmospheric Scan "
@@ -367,7 +379,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if (!toff)
for (var/obj/item/device/pda/P in sortAtom(PDAs))
- if (!P.owner||P.toff||P == src) continue
+ if (!P.owner||P.toff||P == src||P.hidden) continue
dat += "- [P]"
if (istype(cartridge, /obj/item/weapon/cartridge/syndicate) && P.detonate)
dat += " (
*Detonate*)"
@@ -537,6 +549,11 @@ var/global/list/obj/item/device/pda/PDAs = list()
if ( !(last_honk && world.time < last_honk + 20) )
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1)
last_honk = world.time
+ if("Gas Scan")
+ if(scanmode == 5)
+ scanmode = 0
+ else if((!isnull(cartridge)) && (cartridge.access_atmos))
+ scanmode = 5
//MESSENGER/NOTE FUNCTIONS===================================
@@ -676,7 +693,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
//EXTRA FUNCTIONS===================================
if (mode == 2||mode == 21)//To clear message overlays.
- overlays = null
+ overlays.Cut()
if ((honkamt > 0) && (prob(60)))//For clown virus.
honkamt--
@@ -770,21 +787,14 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(P.loc && isliving(P.loc))
L = P.loc
//Maybe they are a pAI!
- else if(istype(P, /obj/item/device/pda/pai) && P.loc)
- //Search through the location's contents
- for(var/obj/item/device/paicard/Pcard in P.loc)
- //If there's a Pcard there then get the mind inside
- if(Pcard.pai)
- var/mob/living/silicon/pai/pai = Pcard.pai
- //Is it the pAI that is receiving the message?
- if(pai.pda && pai.pda == P)
- L = pai
- break
+ else
+ L = get(P, /mob/living/silicon)
+
if(L)
L << "\icon[P] Message from [src.owner] ([ownjob]), \"[t]\" (Reply)"
log_pda("[usr] (PDA: [src.name]) sent \"[t]\" to [P.name]")
- P.overlays = null
+ P.overlays.Cut()
P.overlays += image('icons/obj/pda.dmi', "pda-r")
else
U << "ERROR: Server isn't responding."
@@ -967,6 +977,63 @@ var/global/list/obj/item/device/pda/PDAs = list()
else
user << "\blue No significant chemical agents found in [A]."
+ if(5)
+ if((istype(A, /obj/item/weapon/tank)) || (istype(A, /obj/machinery/portable_atmospherics)))
+ var/obj/icon = A
+ for (var/mob/O in viewers(user, null))
+ O << "\red [user] has used [src] on \icon[icon] [A]"
+ var/pressure = A:air_contents.return_pressure()
+
+ var/total_moles = A:air_contents.total_moles()
+
+ user << "\blue Results of analysis of \icon[icon]"
+ if (total_moles>0)
+ var/o2_concentration = A:air_contents.oxygen/total_moles
+ var/n2_concentration = A:air_contents.nitrogen/total_moles
+ var/co2_concentration = A:air_contents.carbon_dioxide/total_moles
+ var/plasma_concentration = A:air_contents.toxins/total_moles
+
+ var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
+
+ user << "\blue Pressure: [round(pressure,0.1)] kPa"
+ user << "\blue Nitrogen: [round(n2_concentration*100)]%"
+ user << "\blue Oxygen: [round(o2_concentration*100)]%"
+ user << "\blue CO2: [round(co2_concentration*100)]%"
+ user << "\blue Plasma: [round(plasma_concentration*100)]%"
+ if(unknown_concentration>0.01)
+ user << "\red Unknown: [round(unknown_concentration*100)]%"
+ user << "\blue Temperature: [round(A:air_contents.temperature-T0C)]°C"
+ else
+ user << "\blue Tank is empty!"
+
+ if (istype(A, /obj/machinery/atmospherics/pipe/tank))
+ var/obj/icon = A
+ for (var/mob/O in viewers(user, null))
+ O << "\red [user] has used [src] on \icon[icon] [A]"
+
+ var/pressure = A:parent.air.return_pressure()
+ var/total_moles = A:parent.air.total_moles()
+
+ user << "\blue Results of analysis of \icon[icon]"
+ if (total_moles>0)
+ var/o2_concentration = A:parent.air.oxygen/total_moles
+ var/n2_concentration = A:parent.air.nitrogen/total_moles
+ var/co2_concentration = A:parent.air.carbon_dioxide/total_moles
+ var/plasma_concentration = A:parent.air.toxins/total_moles
+
+ var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
+
+ user << "\blue Pressure: [round(pressure,0.1)] kPa"
+ user << "\blue Nitrogen: [round(n2_concentration*100)]%"
+ user << "\blue Oxygen: [round(o2_concentration*100)]%"
+ user << "\blue CO2: [round(co2_concentration*100)]%"
+ user << "\blue Plasma: [round(plasma_concentration*100)]%"
+ if(unknown_concentration>0.01)
+ user << "\red Unknown: [round(unknown_concentration*100)]%"
+ user << "\blue Temperature: [round(A:parent.air.temperature-T0C)]°C"
+ else
+ user << "\blue Tank is empty!"
+
if (!scanmode && istype(A, /obj/item/weapon/paper) && owner)
note = A:info
user << "\blue Paper scanned." //concept of scanning paper copyright brainoblivion 2009
@@ -1031,6 +1098,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
for (var/obj/item/device/pda/P in PDAs)
if (!P.owner)
continue
+ else if(P.hidden)
+ continue
else if (P == src)
continue
else if (P.toff)
@@ -1094,39 +1163,27 @@ var/global/list/obj/item/device/pda/PDAs = list()
else
usr << "You do not have a PDA. You should make an issue report about this."
-
-
-
//Some spare PDAs in a box
-
-/obj/item/weapon/storage/PDAbox
+/obj/item/weapon/storage/box/PDAs
name = "spare PDAs"
desc = "A box of spare PDA microcomputers."
icon = 'icons/obj/pda.dmi'
icon_state = "pdabox"
- item_state = "syringe_kit"
- foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
-/obj/item/weapon/storage/PDAbox/New()
- ..()
- new /obj/item/device/pda(src)
- new /obj/item/device/pda(src)
- new /obj/item/device/pda(src)
- new /obj/item/device/pda(src)
-
- var/newcart = pick(1,2,3,4)
- switch(newcart)
- if(1)
- new /obj/item/weapon/cartridge/engineering(src)
- if(2)
- new /obj/item/weapon/cartridge/security(src)
- if(3)
- new /obj/item/weapon/cartridge/medical(src)
- if(4)
- new /obj/item/weapon/cartridge/signal/toxins(src)
-
- new /obj/item/weapon/cartridge/head(src)
+ New()
+ ..()
+ new /obj/item/device/pda(src)
+ new /obj/item/device/pda(src)
+ new /obj/item/device/pda(src)
+ new /obj/item/device/pda(src)
+ new /obj/item/weapon/cartridge/head(src)
+ var/newcart = pick( /obj/item/weapon/cartridge/engineering,
+ /obj/item/weapon/cartridge/security,
+ /obj/item/weapon/cartridge/medical,
+ /obj/item/weapon/cartridge/signal/toxins,
+ /obj/item/weapon/cartridge/quartermaster)
+ new newcart(src)
// Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP
/obj/item/device/pda/emp_act(severity)
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index f6bc2f3365..546b70f28e 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -9,6 +9,7 @@
var/obj/item/radio/integrated/radio = null
var/access_security = 0
var/access_engine = 0
+ var/access_atmos = 0
var/access_medical = 0
var/access_manifest = 1 // Make all jobs able to access the manifest
var/access_clown = 0
@@ -37,6 +38,11 @@
icon_state = "cart-e"
access_engine = 1
+ atmos
+ name = "BreatheDeep Cartridge"
+ icon_state = "cart-a"
+ access_atmos = 1
+
medical
name = "Med-U Cartridge"
icon_state = "cart-m"
@@ -102,7 +108,8 @@
name = "Signal Ace 2"
desc = "Complete with integrated radio signaler!"
icon_state = "cart-tox"
-// access_reagent_scanner = 1
+ access_reagent_scanner = 1
+ access_atmos = 1
New()
..()
@@ -134,6 +141,8 @@
access_manifest = 1
access_status_display = 1
access_quartermaster = 1
+ access_janitor = 1
+ access_security = 1
New()
..()
@@ -158,6 +167,7 @@
access_manifest = 1
access_status_display = 1
access_engine = 1
+ access_atmos = 1
cmo
name = "Med-U DELUXE"
@@ -172,7 +182,8 @@
icon_state = "cart-rd"
access_manifest = 1
access_status_display = 1
-// access_reagent_scanner = 1
+ access_reagent_scanner = 1
+ access_atmos = 1
New()
..()
@@ -189,6 +200,7 @@
access_medical = 1
access_reagent_scanner = 1
access_status_display = 1
+ access_atmos = 1
syndicate
name = "Detomatix Cartridge"
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index d580480cb9..c1ccb4aa6c 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -10,13 +10,12 @@
m_amt = 50
g_amt = 20
icon_action_button = "action_flashlight"
- light_on = 0
- brightness_on = 4 //luminosity when on
- var brightness = 0
+ var/on = 0
+ var/brightness_on = 4 //luminosity when on
/obj/item/device/flashlight/initialize()
..()
- if(light_on)
+ if(on)
icon_state = "[initial(icon_state)]-on"
SetLuminosity(brightness_on)
else
@@ -24,31 +23,31 @@
SetLuminosity(0)
/obj/item/device/flashlight/proc/update_brightness(var/mob/user = null)
- if(light_on)
+ if(on)
icon_state = "[initial(icon_state)]-on"
- if((loc == user) && (user.luminosity < brightness_on))
- user.SetLuminosity(brightness_on)
+ if(loc == user)
+ user.SetLuminosity(user.luminosity + brightness_on)
else if(isturf(loc))
SetLuminosity(brightness_on)
else
icon_state = initial(icon_state)
if(loc == user)
- user.SetLuminosity(search_light(user, src))
+ user.SetLuminosity(user.luminosity - brightness_on)
else if(isturf(loc))
SetLuminosity(0)
/obj/item/device/flashlight/attack_self(mob/user)
if(!isturf(user.loc))
user << "You cannot turn the light on while in this [user.loc]." //To prevent some lighting anomalities.
- return
- light_on = !light_on
+ return 0
+ on = !on
update_brightness(user)
- return
+ return 1
/obj/item/device/flashlight/attack(mob/living/M as mob, mob/living/user as mob)
add_fingerprint(user)
- if(light_on && user.zone_sel.selecting == "eyes")
+ if(on && user.zone_sel.selecting == "eyes")
if(((CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) //too dumb to use flashlight properly
return ..() //just hit them in the head
@@ -89,24 +88,15 @@
/obj/item/device/flashlight/pickup(mob/user)
- if(light_on)
- if (user.luminosity < brightness_on)
- user.SetLuminosity(brightness_on)
+ if(on)
+ user.SetLuminosity(user.luminosity + brightness_on)
SetLuminosity(0)
/obj/item/device/flashlight/dropped(mob/user)
- if(light_on)
- if ((layer <= 3) || (loc != user.loc))
- user.SetLuminosity(search_light(user, src))
- SetLuminosity(brightness_on)
-
-
-/obj/item/device/flashlight/equipped(mob/user, slot)
- if(light_on)
- if (user.luminosity < brightness_on)
- user.SetLuminosity(brightness_on)
- SetLuminosity(0)
+ if(on)
+ user.SetLuminosity(user.luminosity - brightness_on)
+ SetLuminosity(brightness_on)
/obj/item/device/flashlight/pen
@@ -129,7 +119,7 @@
flags = FPRINT | TABLEPASS | CONDUCT
m_amt = 0
g_amt = 0
- light_on = 1
+ on = 1
// green-shaded desk lamp
@@ -163,21 +153,22 @@
var/produce_heat = 1500
/obj/item/device/flashlight/flare/New()
- fuel = rand(1500, 2000) // Last 10 to 15 minutes.
+ fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
..()
/obj/item/device/flashlight/flare/process()
var/turf/pos = get_turf(src)
- pos.hotspot_expose(produce_heat, 5)
+ if(pos)
+ pos.hotspot_expose(produce_heat, 5)
fuel = max(fuel - 1, 0)
- if(!fuel || !light_on)
+ if(!fuel || !on)
turn_off()
if(!fuel)
src.icon_state = "[initial(icon_state)]-empty"
processing_objects -= src
/obj/item/device/flashlight/flare/proc/turn_off()
- light_on = 0
+ on = 0
src.force = initial(src.force)
src.damtype = initial(src.damtype)
if(ismob(loc))
@@ -187,19 +178,18 @@
update_brightness(null)
/obj/item/device/flashlight/flare/attack_self(mob/user)
+
// Usual checks
- if(loc != usr)
- return
if(!fuel)
user << "It's out of fuel."
return
- if(!light_on)
- user.visible_message("[user] activates the flare.", "You pull the cord on the flare, activating it!")
- else
+ if(on)
return
+
+ . = ..()
// All good, turn it on.
- light_on = 1
- update_brightness(user)
- src.force = on_damage
- src.damtype = "fire"
- processing_objects += src
\ No newline at end of file
+ if(.)
+ user.visible_message("[user] activates the flare.", "You pull the cord on the flare, activating it!")
+ src.force = on_damage
+ src.damtype = "fire"
+ processing_objects += src
\ No newline at end of file
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index 9685993c70..d0bc6a4533 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -110,12 +110,12 @@
/obj/item/device/paicard/proc/removePersonality()
src.pai = null
- src.overlays = null
+ src.overlays.Cut()
src.overlays += "pai-off"
/obj/item/device/paicard/proc/setEmotion(var/emotion)
if(pai)
- src.overlays = null
+ src.overlays.Cut()
switch(emotion)
if(1) src.overlays += "pai-happy"
if(2) src.overlays += "pai-cat"
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 3b026d0be7..165f6748ec 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -72,7 +72,7 @@
name = "Captain's Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
icon_state = "cap_cypherkey"
- channels = list("Command" = 1, "Science" = 0, "Medical" = 0, "Security" = 1, "Engineering" = 0, "Mining" = 0, "Cargo" = 0)
+ channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0)
/obj/item/device/encryptionkey/heads/rd
name = "Research Director's Encryption Key"
@@ -102,8 +102,8 @@
name = "Head of Personnel's Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
icon_state = "hop_cypherkey"
- channels = list("Command" = 1, "Security" = 0, "Cargo" = 1, "Mining" = 0)
-
+ channels = list("Supply" = 1, "Command" = 1, "Security" = 0)
+/*
/obj/item/device/encryptionkey/headset_mine
name = "Mining Radio Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
@@ -115,13 +115,12 @@
desc = "An encyption key for a radio headset. Contains cypherkeys."
icon_state = "qm_cypherkey"
channels = list("Cargo" = 1, "Mining" = 1)
-
+*/
/obj/item/device/encryptionkey/headset_cargo
- name = "Cargo Radio Encryption Key"
+ name = "Supply Radio Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
icon_state = "cargo_cypherkey"
- channels = list("Cargo" = 1)
-
+ channels = list("Supply" = 1)
/obj/item/device/encryptionkey/ert
name = "NanoTrasen ERT Radio Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 216120d4db..05285807d7 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -95,7 +95,7 @@
/obj/item/device/radio/headset/heads/captain
name = "captain's headset"
- desc = "The headset of the boss. Channels are as follows: :c - command, :s - security, :e - engineering, :d - mining, :q - cargo, :m - medical, :n - science."
+ desc = "The headset of the boss. Channels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :m - medical, :n - science."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/heads/captain
@@ -130,11 +130,11 @@
/obj/item/device/radio/headset/heads/hop
name = "head of personnel's headset"
- desc = "The headset of the guy who will one day be captain. Channels are as follows: :c - command, :s - security, :q - cargo, :d - mining."
+ desc = "The headset of the guy who will one day be captain. Channels are as follows: :u - supply, :c - command, :s - security"
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/heads/hop
-
+/*
/obj/item/device/radio/headset/headset_mine
name = "mining radio headset"
desc = "Headset used by miners. How useless. To access the mining channel, use :d."
@@ -148,10 +148,10 @@
icon_state = "cargo_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/heads/qm
-
+*/
/obj/item/device/radio/headset/headset_cargo
- name = "cargo radio headset"
- desc = "Headset used by the QM's slaves. To access the cargo channel, use :q."
+ name = "supply radio headset"
+ desc = "A headset used by the QM and his slaves. To access the supply channel, use :u."
icon_state = "cargo_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/headset_cargo
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 74cf0c4089..895d18bd9d 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -497,10 +497,10 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
freq_text = "Engineering"
if(1359)
freq_text = "Security"
- if(1349)
- freq_text = "Mining"
+// if(1349)
+// freq_text = "Mining"
if(1347)
- freq_text = "Cargo"
+ freq_text = "Supply"
//There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO
if(!freq_text)
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 55b2be019e..a0f4f202d9 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -257,6 +257,23 @@ MASS SPECTROMETER
src.add_fingerprint(user)
return
+/obj/item/device/mass_spectrometer
+ desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample."
+ name = "mass-spectrometer"
+ icon_state = "spectrometer"
+ item_state = "analyzer"
+ w_class = 2.0
+ flags = FPRINT | TABLEPASS| CONDUCT | OPENCONTAINER
+ slot_flags = SLOT_BELT
+ throwforce = 5
+ throw_speed = 4
+ throw_range = 20
+ m_amt = 30
+ g_amt = 20
+ origin_tech = "magnets=2;biotech=2"
+ var/details = 0
+ var/recent_fail = 0
+
/obj/item/device/mass_spectrometer/New()
..()
var/datum/reagents/R = new/datum/reagents(5)
@@ -307,3 +324,8 @@ MASS SPECTROMETER
reagents.clear_reagents()
return
+/obj/item/device/mass_spectrometer/adv
+ name = "advanced mass-spectrometer"
+ icon_state = "adv_spectrometer"
+ details = 1
+ origin_tech = "magnets=4;biotech=2"
diff --git a/code/game/objects/items/devices/shields.dm b/code/game/objects/items/devices/shields.dm
deleted file mode 100644
index 665c79e0d9..0000000000
--- a/code/game/objects/items/devices/shields.dm
+++ /dev/null
@@ -1,32 +0,0 @@
-/obj/item/weapon/cloaking_device
- name = "cloaking device"
- desc = "Use this to become invisible to the human eyesocket."
- icon = 'icons/obj/device.dmi'
- icon_state = "shield0"
- var/active = 0.0
- flags = FPRINT | TABLEPASS| CONDUCT
- item_state = "electronic"
- throwforce = 10.0
- throw_speed = 2
- throw_range = 10
- w_class = 2.0
- origin_tech = "magnets=3;syndicate=4"
-
-
-/obj/item/weapon/cloaking_device/attack_self(mob/user as mob)
- src.active = !( src.active )
- if (src.active)
- user << "\blue The cloaking device is now active."
- src.icon_state = "shield1"
- else
- user << "\blue The cloaking device is now inactive."
- src.icon_state = "shield0"
- src.add_fingerprint(user)
- return
-
-/obj/item/weapon/cloaking_device/emp_act(severity)
- active = 0
- icon_state = "shield0"
- if(ismob(loc))
- loc:update_icons()
- ..()
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index c77a388d1e..9a57b4ff57 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -115,7 +115,7 @@
toggle = 1
/obj/item/device/transfer_valve/update_icon()
- overlays = null
+ overlays.Cut()
underlays = null
if(!tank_one && !tank_two && !attached_device)
@@ -164,16 +164,16 @@
else
attacher_name = "[attacher.name]([attacher.ckey])"
- var/log_str = "Bomb valve opened in [A.name] "
+ var/log_str = "Bomb valve opened in [A.name] "
log_str += "with [attached_device ? attached_device : "no device"] attacher: [attacher_name]"
if(attacher)
- log_str += "(?)"
+ log_str += "(?)"
var/mob/mob = get_mob_by_key(src.fingerprintslast)
var/last_touch_info = ""
if(mob)
- last_touch_info = "(?)"
+ last_touch_info = "(?)"
log_str += " Last touched by: [src.fingerprintslast][last_touch_info]"
bombers += log_str
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index 957da36c89..ebe7b751de 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -59,12 +59,18 @@ A list of items and costs is stored under the datum of every game mode, alongsid
continue
path_obj = text2path(path_text)
- item = new path_obj()
- name = O[3]
- del item
- dat += "[name] ([cost])
" - category_items++ + // Because we're using strings, this comes up if item paths change. + // Failure to handle this error borks uplinks entirely. -Sayu + if(!path_obj) + error("Syndicate item is not a valid path: [path_text]") + else + item = new path_obj() + name = O[3] + del item + + dat += "[name] ([cost])
" + category_items++ dat += "Random Item (??)
" dat += "
" @@ -81,7 +87,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid if(uses > 9) randomItems.Add("/obj/item/toy/syndicateballoon")//Syndicate Balloon - randomItems.Add("/obj/item/weapon/storage/syndie_kit/imp_uplink") //Uplink Implanter + randomItems.Add("/obj/item/weapon/storage/box/syndie_kit/imp_uplink") //Uplink Implanter randomItems.Add("/obj/item/weapon/storage/box/syndicate") //Syndicate bundle //if(uses > 8) //Nothing... yet. @@ -104,15 +110,15 @@ A list of items and costs is stored under the datum of every game mode, alongsid randomItems.Add("/obj/item/device/chameleon") //Chameleon Projector if(uses > 2) - randomItems.Add("/obj/item/weapon/storage/emp_kit") //EMP Grenades + randomItems.Add("/obj/item/weapon/storage/box/emps") //EMP Grenades randomItems.Add("/obj/item/weapon/pen/paralysis") //Paralysis Pen randomItems.Add("/obj/item/weapon/cartridge/syndicate") //Detomatix Cartridge randomItems.Add("/obj/item/clothing/under/chameleon") //Chameleon Jumpsuit randomItems.Add("/obj/item/weapon/card/id/syndicate") //Agent ID Card randomItems.Add("/obj/item/weapon/card/emag") //Cryptographic Sequencer - randomItems.Add("/obj/item/weapon/storage/syndie_kit/space") //Syndicate Space Suit + randomItems.Add("/obj/item/weapon/storage/box/syndie_kit/space") //Syndicate Space Suit randomItems.Add("/obj/item/device/encryptionkey/binary") //Binary Translator Key - randomItems.Add("/obj/item/weapon/storage/syndie_kit/imp_freedom") //Freedom Implant + randomItems.Add("/obj/item/weapon/storage/box/syndie_kit/imp_freedom") //Freedom Implant randomItems.Add("/obj/item/clothing/glasses/thermal/syndi") //Thermal Imaging Goggles if(uses > 1) @@ -142,7 +148,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid switch(buyItem) //Ok, this gets a little messy, sorry. if("/obj/item/weapon/circuitboard/teleporter") uses -= 20 - if("/obj/item/toy/syndicateballoon" , "/obj/item/weapon/storage/syndie_kit/imp_uplink" , "/obj/item/weapon/storage/box/syndicate") + if("/obj/item/toy/syndicateballoon" , "/obj/item/weapon/storage/box/syndie_kit/imp_uplink" , "/obj/item/weapon/storage/box/syndicate") uses -= 10 if("/obj/item/weapon/aiModule/syndicate" , "/obj/item/device/radio/beacon/syndicate") uses -= 7 @@ -152,9 +158,9 @@ A list of items and costs is stored under the datum of every game mode, alongsid uses -= 5 if("/obj/item/weapon/melee/energy/sword" , "/obj/item/clothing/mask/gas/voice" , "/obj/item/device/chameleon") uses -= 4 - if("/obj/item/weapon/storage/emp_kit" , "/obj/item/weapon/pen/paralysis" , "/obj/item/weapon/cartridge/syndicate" , "/obj/item/clothing/under/chameleon" , \ - "/obj/item/weapon/card/emag" , "/obj/item/weapon/storage/syndie_kit/space" , "/obj/item/device/encryptionkey/binary" , \ - "/obj/item/weapon/storage/syndie_kit/imp_freedom" , "/obj/item/clothing/glasses/thermal/syndi") + if("/obj/item/weapon/storage/box/emps" , "/obj/item/weapon/pen/paralysis" , "/obj/item/weapon/cartridge/syndicate" , "/obj/item/clothing/under/chameleon" , \ + "/obj/item/weapon/card/emag" , "/obj/item/weapon/storage/box/syndie_kit/space" , "/obj/item/device/encryptionkey/binary" , \ + "/obj/item/weapon/storage/box/syndie_kit/imp_freedom" , "/obj/item/clothing/glasses/thermal/syndi") uses -= 3 if("/obj/item/ammo_magazine/a357" , "/obj/item/clothing/shoes/syndigaloshes" , "/obj/item/weapon/plastique", "/obj/item/weapon/card/id/syndicate") uses -= 2 @@ -172,7 +178,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid feedback_add_details("traitor_uplink_items_bought","TP") if("/obj/item/toy/syndicateballoon") feedback_add_details("traitor_uplink_items_bought","BS") - if("/obj/item/weapon/storage/syndie_kit/imp_uplink") + if("/obj/item/weapon/storage/box/syndie_kit/imp_uplink") feedback_add_details("traitor_uplink_items_bought","UI") if("/obj/item/weapon/storage/box/syndicate") feedback_add_details("traitor_uplink_items_bought","BU") @@ -192,7 +198,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid feedback_add_details("traitor_uplink_items_bought","VC") if("/obj/item/device/chameleon") feedback_add_details("traitor_uplink_items_bought","CP") - if("/obj/item/weapon/storage/emp_kit") + if("/obj/item/weapon/storage/box/emps") feedback_add_details("traitor_uplink_items_bought","EM") if("/obj/item/weapon/pen/paralysis") feedback_add_details("traitor_uplink_items_bought","PP") @@ -204,11 +210,11 @@ A list of items and costs is stored under the datum of every game mode, alongsid feedback_add_details("traitor_uplink_items_bought","AC") if("/obj/item/weapon/card/emag") feedback_add_details("traitor_uplink_items_bought","EC") - if("/obj/item/weapon/storage/syndie_kit/space") + if("/obj/item/weapon/storage/box/syndie_kit/space") feedback_add_details("traitor_uplink_items_bought","SS") if("/obj/item/device/encryptionkey/binary") feedback_add_details("traitor_uplink_items_bought","BT") - if("/obj/item/weapon/storage/syndie_kit/imp_freedom") + if("/obj/item/weapon/storage/box/syndie_kit/imp_freedom") feedback_add_details("traitor_uplink_items_bought","FI") if("/obj/item/clothing/glasses/thermal/syndi") feedback_add_details("traitor_uplink_items_bought","TM") diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index b9dc317043..3daa307839 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -78,7 +78,7 @@ src.updateicon() /obj/item/robot_parts/robot_suit/proc/updateicon() - src.overlays = null + src.overlays.Cut() if(src.l_arm) src.overlays += "l_arm+o" if(src.r_arm) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index dce87fda31..6e3a893c9b 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -36,7 +36,7 @@ if (istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) - overlays = null + overlays.Cut() usr << "You slice off [src]'s uneven chunks of aluminum and scorch marks." return diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 63992bde10..659900aefc 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -1,5 +1,14 @@ - -//What is this even used for? +/obj/item/stack/medical + name = "medical pack" + singular_name = "medical pack" + icon = 'icons/obj/items.dmi' + amount = 5 + max_amount = 5 + w_class = 1 + throw_speed = 4 + throw_range = 20 + var/heal_brute = 0 + var/heal_burn = 0 /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob) if (M.stat == 2) @@ -53,4 +62,63 @@ ) use(1) + M.updatehealth() +/obj/item/stack/medical/bruise_pack + name = "bruise pack" + singular_name = "bruise pack" + desc = "A pack designed to treat blunt-force trauma." + icon_state = "brutepack" + heal_brute = 60 + origin_tech = "biotech=1" + +/obj/item/stack/medical/ointment + name = "ointment" + desc = "Used to treat those nasty burns." + gender = PLURAL + singular_name = "ointment" + icon_state = "ointment" + heal_burn = 40 + origin_tech = "biotech=1" + +/obj/item/stack/medical/bruise_pack/tajaran + name = "\improper S'rendarr's Hand leaf" + singular_name = "S'rendarr's Hand leaf" + desc = "A soft leaf that is rubbed on bruises." + icon = 'harvest.dmi' + icon_state = "cabbage" + heal_brute = 7 + +/obj/item/stack/medical/ointment/tajaran + name = "\improper Messa's Tear leaf" + singular_name = "Messa's Tear leaf" + desc = "A cold leaf that is rubbed on burns." + icon = 'harvest.dmi' + icon_state = "ambrosiavulgaris" + heal_burn = 7 + +/obj/item/stack/medical/advanced/bruise_pack + name = "advanced trauma kit" + singular_name = "advanced trauma kit" + desc = "An advanced trauma kit for severe injuries." + icon_state = "traumakit" + heal_brute = 12 + origin_tech = "biotech=1" + +/obj/item/stack/medical/advanced/ointment + name = "advanced burn kit" + singular_name = "advanced burn kit" + desc = "An advanced treatment kit for severe burns." + icon_state = "burnkit" + heal_burn = 12 + origin_tech = "biotech=1" + +/obj/item/stack/medical/splint + name = "medical splint" + singular_name = "medical splint" + icon_state = "splint" + amount = 5 + max_amount = 5 + +/obj/item/stack/medical/splint/single + amount = 1 diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index ed72df614d..835666b7fe 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -10,7 +10,7 @@ */ /obj/item/stack/sheet/glass name = "glass" - desc = "HOLY HELL! That is a lot of glass." + desc = "HOLY SHEET! That is a lot of glass." singular_name = "glass sheet" icon_state = "sheet-glass" g_amt = 3750 diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 3045159a62..8ba8879636 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -33,6 +33,36 @@ icon_state = "sheet-lizard" origin_tech = "" +/obj/item/stack/sheet/animalhide/xeno + name = "alien hide" + desc = "The skin of a terrible creature." + singular_name = "alien hide piece" + icon_state = "sheet-xeno" + origin_tech = "" + +//don't see anywhere else to put these, maybe together they could be used to make the xenos suit? +/obj/item/stack/sheet/xenochitin + name = "alien chitin" + desc = "A piece of the hide of a terrible creature." + singular_name = "alien hide piece" + icon = 'icons/mob/alien.dmi' + icon_state = "chitin" + origin_tech = "" + +/obj/item/xenos_claw + name = "alien claw" + desc = "The claw of a terrible creature." + icon = 'icons/mob/alien.dmi' + icon_state = "claw" + origin_tech = "" + +/obj/item/weed_extract + name = "weed extract" + desc = "A piece of slimy, purplish weed." + icon = 'icons/mob/alien.dmi' + icon_state = "weed_extract" + origin_tech = "" + /obj/item/stack/sheet/hairlesshide name = "hairless hide" desc = "This hide was stripped of it's hair, but still needs tanning." diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 111a9dfe73..ba755b336f 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -128,12 +128,13 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ */ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \ new/datum/stack_recipe("box", /obj/item/weapon/storage/box), \ - new/datum/stack_recipe("light tubes", /obj/item/weapon/storage/lightbox/tubes), \ - new/datum/stack_recipe("light bulbs", /obj/item/weapon/storage/lightbox/bulbs), \ - new/datum/stack_recipe("mouse traps", /obj/item/weapon/storage/mousetraps), \ + new/datum/stack_recipe("light tubes", /obj/item/weapon/storage/box/lights/tubes), \ + new/datum/stack_recipe("light bulbs", /obj/item/weapon/storage/box/lights/bulbs), \ + new/datum/stack_recipe("mouse traps", /obj/item/weapon/storage/box/mousetraps), \ new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \ new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \ new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \ + new/datum/stack_recipe("folder", /obj/item/weapon/folder), \ ) /obj/item/stack/sheet/cardboard //BubbleWrap diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm index b94acb367e..fdcc6747b6 100644 --- a/code/game/objects/items/stacks/sheets/sheets.dm +++ b/code/game/objects/items/stacks/sheets/sheets.dm @@ -11,12 +11,16 @@ var/perunit = 3750 var/sheettype = null //this is used for girders in the creation of walls/false walls -/obj/item/stack/sheet/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/sheetsnatcher)) - var/obj/item/weapon/sheetsnatcher/S = W + +// Since the sheetsnatcher was consolidated into weapon/storage/bag we now use +// item/attackby() properly, making this unnecessary + +/*/obj/item/stack/sheet/attackby(obj/item/weapon/W as obj, mob/user as mob) + if (istype(W, /obj/item/weapon/storage/bag/sheetsnatcher)) + var/obj/item/weapon/storage/bag/sheetsnatcher/S = W if(!S.mode) S.add(src,user) else for (var/obj/item/stack/sheet/stack in locate(src.x,src.y,src.z)) S.add(stack,user) - ..() \ No newline at end of file + ..()*/ \ No newline at end of file diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm index 460db9b766..8fdcd7a561 100644 --- a/code/game/objects/items/stacks/tiles/light.dm +++ b/code/game/objects/items/stacks/tiles/light.dm @@ -14,7 +14,7 @@ var/on = 1 var/state //0 = fine, 1 = flickering, 2 = breaking, 3 = broken -/obj/item/stack/tile/light/New() +/obj/item/stack/tile/light/New(var/loc, var/amount=null) ..() if(prob(5)) state = 3 //broken diff --git a/code/game/objects/items/tk_grab.dm b/code/game/objects/items/tk_grab.dm index 654c6e7e06..11863e9ae2 100644 --- a/code/game/objects/items/tk_grab.dm +++ b/code/game/objects/items/tk_grab.dm @@ -97,7 +97,7 @@ update_icon() - overlays = null + overlays.Cut() if(focus && focus.icon && focus.icon_state) overlays += icon(focus.icon,focus.icon_state) return diff --git a/code/defines/obj/toy.dm b/code/game/objects/items/toys.dm similarity index 83% rename from code/defines/obj/toy.dm rename to code/game/objects/items/toys.dm index afddd617a4..60d6b1bf22 100644 --- a/code/defines/obj/toy.dm +++ b/code/game/objects/items/toys.dm @@ -1,3 +1,17 @@ +/* Toys! + * ContainsL + * Balloons + * Fake telebeacon + * Fake singularity + * Toy gun + * Toy crossbow + * Toy swords + * Crayons + * Snap pops + * Water flower + */ + + /obj/item/toy throwforce = 0 throw_speed = 4 @@ -5,83 +19,68 @@ force = 0 -/////////Toy Mechs///////// - -/obj/item/toy/prize +/* + * Balloons + */ +/obj/item/toy/balloon + name = "water balloon" + desc = "A translucent balloon. There's nothing in it." icon = 'icons/obj/toy.dmi' - icon_state = "ripleytoy" - var/cooldown = 0 + icon_state = "waterballoon-e" + item_state = "balloon-empty" -//all credit to skasi for toy mech fun ideas -/obj/item/toy/prize/attack_self(mob/user as mob) - if(cooldown < world.time - 8) - user << "You play with [src]." - playsound(user, 'sound/mecha/mechstep.ogg', 20, 1) - cooldown = world.time +/obj/item/toy/balloon/New() + var/datum/reagents/R = new/datum/reagents(10) + reagents = R + R.my_atom = src -/obj/item/toy/prize/attack_hand(mob/user as mob) - if(loc == user) - if(cooldown < world.time - 8) - user << "You play with [src]." - playsound(user, 'sound/mecha/mechturn.ogg', 20, 1) - cooldown = world.time - return - ..() +/obj/item/toy/balloon/attack(mob/living/carbon/human/M as mob, mob/user as mob) + return -/obj/item/toy/prize/ripley - name = "toy ripley" - desc = "Mini-Mecha action figure! Collect them all! 1/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" +/obj/item/toy/balloon/afterattack(atom/A as mob|obj, mob/user as mob) + if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1) + A.reagents.trans_to(src, 10) + user << "\blue You fill the balloon with the contents of [A]." + src.desc = "A translucent balloon with some form of liquid sloshing around in it." + src.update_icon() + return -/obj/item/toy/prize/fireripley - name = "toy firefighting ripley" - desc = "Mini-Mecha action figure! Collect them all! 2/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "fireripleytoy" +/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob) + if(istype(O, /obj/item/weapon/reagent_containers/glass)) + if(O.reagents) + if(O.reagents.total_volume < 1) + user << "The [O] is empty." + else if(O.reagents.total_volume >= 1) + if(O.reagents.has_reagent("pacid", 1)) + user << "The acid chews through the balloon!" + O.reagents.reaction(user) + del(src) + else + src.desc = "A translucent balloon with some form of liquid sloshing around in it." + user << "\blue You fill the balloon with the contents of [O]." + O.reagents.trans_to(src, 10) + src.update_icon() + return -/obj/item/toy/prize/deathripley - name = "toy deathsquad ripley" - desc = "Mini-Mecha action figure! Collect them all! 3/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "deathripleytoy" - -/obj/item/toy/prize/gygax - name = "toy gygax" - desc = "Mini-Mecha action figure! Collect them all! 4/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "gygaxtoy" - -/obj/item/toy/prize/durand - name = "toy durand" - desc = "Mini-Mecha action figure! Collect them all! 5/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "durandprize" - -/obj/item/toy/prize/honk - name = "toy H.O.N.K." - desc = "Mini-Mecha action figure! Collect them all! 6/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "honkprize" - -/obj/item/toy/prize/marauder - name = "toy marauder" - desc = "Mini-Mecha action figure! Collect them all! 7/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "marauderprize" - -/obj/item/toy/prize/seraph - name = "toy seraph" - desc = "Mini-Mecha action figure! Collect them all! 8/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "seraphprize" - -/obj/item/toy/prize/mauler - name = "toy mauler" - desc = "Mini-Mecha action figure! Collect them all! 9/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "maulerprize" - -/obj/item/toy/prize/odysseus - name = "toy odysseus" - desc = "Mini-Mecha action figure! Collect them all! 10/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "odysseusprize" - -/obj/item/toy/prize/phazon - name = "toy phazon" - desc = "Mini-Mecha action figure! Collect them all! 11/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "phazonprize" +/obj/item/toy/balloon/throw_impact(atom/hit_atom) + if(src.reagents.total_volume >= 1) + src.visible_message("\red The [src] bursts!","You hear a pop and a splash.") + src.reagents.reaction(get_turf(hit_atom)) + for(var/atom/A in get_turf(hit_atom)) + src.reagents.reaction(A) + src.icon_state = "burst" + spawn(5) + if(src) + del(src) + return +/obj/item/toy/balloon/update_icon() + if(src.reagents.total_volume >= 1) + icon_state = "waterballoon" + item_state = "balloon" + else + icon_state = "waterballoon-e" + item_state = "balloon-empty" /obj/item/toy/syndicateballoon name = "syndicate balloon" @@ -95,6 +94,9 @@ item_state = "syndballoon" w_class = 4.0 +/* + * Fake telebeacon + */ /obj/item/toy/blink name = "electronic blink toy game" desc = "Blink. Blink. Blink. Ages 8 and up." @@ -102,44 +104,18 @@ icon_state = "beacon" item_state = "signaler" +/* + * Fake singularity + */ /obj/item/toy/spinningtoy name = "Gravitational Singularity" desc = "\"Singulo\" brand spinning toy." icon = 'icons/obj/singularity.dmi' icon_state = "singularity_s1" -/obj/item/toy/ammo/gun - name = "ammo-caps" - desc = "There are 7 caps left! Make sure to recyle the box in an autolathe when it gets empty." - icon = 'icons/obj/ammo.dmi' - icon_state = "357-7" - flags = FPRINT | TABLEPASS| CONDUCT - w_class = 1.0 - g_amt = 10 - m_amt = 10 - var/amount_left = 7.0 - - update_icon() - src.icon_state = text("357-[]", src.amount_left) - src.desc = text("There are [] caps\s left! Make sure to recycle the box in an autolathe when it gets empty.", src.amount_left) - return - -/obj/item/toy/ammo/crossbow - name = "foam dart" - desc = "Its nerf or nothing! Ages 8 and up." - icon = 'icons/obj/toy.dmi' - icon_state = "foamdart" - flags = FPRINT | TABLEPASS - w_class = 1.0 - -/obj/effect/foam_dart_dummy - name = "" - desc = "" - icon = 'icons/obj/toy.dmi' - icon_state = "null" - anchored = 1 - density = 0 - +/* + * Toy gun: Why isnt this an /obj/item/weapon/gun? + */ /obj/item/toy/gun name = "cap gun" desc = "There are 0 caps left. Looks almost like the real thing! Ages 8 and up. Please recycle in an autolathe when you're out of caps!" @@ -197,34 +173,26 @@ for(var/mob/O in viewers(user, null)) O.show_message(text("\red [] fires a cap gun at []!", user, target), 1, "\red You hear a gunshot", 2) -/obj/item/toy/sword - name = "toy sword" - desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up." - icon = 'icons/obj/weapons.dmi' - icon_state = "sword0" - item_state = "sword0" - var/active = 0.0 - w_class = 2.0 - flags = FPRINT | TABLEPASS | NOSHIELD - attack_verb = list("attacked", "struck", "hit") +/obj/item/toy/ammo/gun + name = "ammo-caps" + desc = "There are 7 caps left! Make sure to recyle the box in an autolathe when it gets empty." + icon = 'icons/obj/ammo.dmi' + icon_state = "357-7" + flags = FPRINT | TABLEPASS| CONDUCT + w_class = 1.0 + g_amt = 10 + m_amt = 10 + var/amount_left = 7.0 - attack_self(mob/user as mob) - src.active = !( src.active ) - if (src.active) - user << "\blue You extend the plastic blade with a quick flick of your wrist." - playsound(user, 'sound/weapons/saberon.ogg', 50, 1) - src.icon_state = "swordblue" - src.item_state = "swordblue" - src.w_class = 4 - else - user << "\blue You push the plastic blade back down into the handle." - playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) - src.icon_state = "sword0" - src.item_state = "sword0" - src.w_class = 2 - src.add_fingerprint(user) + update_icon() + src.icon_state = text("357-[]", src.amount_left) + src.desc = text("There are [] caps\s left! Make sure to recycle the box in an autolathe when it gets empty.", src.amount_left) return +/* + * Toy crossbow + */ + /obj/item/toy/crossbow name = "foam dart crossbow" desc = "A weapon favored by many overactive children. Ages 8 and up." @@ -322,16 +290,70 @@ user.Weaken(5) return -/obj/item/weapon/storage/crayonbox - name = "box of crayons" - desc = "A box of crayons for all your rune drawing needs." - icon = 'icons/obj/crayons.dmi' - icon_state = "crayonbox" +/obj/item/toy/ammo/crossbow + name = "foam dart" + desc = "Its nerf or nothing! Ages 8 and up." + icon = 'icons/obj/toy.dmi' + icon_state = "foamdart" + flags = FPRINT | TABLEPASS + w_class = 1.0 + +/obj/effect/foam_dart_dummy + name = "" + desc = "" + icon = 'icons/obj/toy.dmi' + icon_state = "null" + anchored = 1 + density = 0 + + +/* + * Toy swords + */ +/obj/item/toy/sword + name = "toy sword" + desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up." + icon = 'icons/obj/weapons.dmi' + icon_state = "sword0" + item_state = "sword0" + var/active = 0.0 w_class = 2.0 - storage_slots = 6 - can_hold = list( - "/obj/item/toy/crayon" - ) + flags = FPRINT | TABLEPASS | NOSHIELD + attack_verb = list("attacked", "struck", "hit") + + attack_self(mob/user as mob) + src.active = !( src.active ) + if (src.active) + user << "\blue You extend the plastic blade with a quick flick of your wrist." + playsound(user, 'sound/weapons/saberon.ogg', 50, 1) + src.icon_state = "swordblue" + src.item_state = "swordblue" + src.w_class = 4 + else + user << "\blue You push the plastic blade back down into the handle." + playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) + src.icon_state = "sword0" + src.item_state = "sword0" + src.w_class = 2 + src.add_fingerprint(user) + return + +/obj/item/toy/katana + name = "replica katana" + desc = "Woefully underpowered in D20." + icon = 'icons/obj/weapons.dmi' + icon_state = "katana" + item_state = "katana" + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT | SLOT_BACK + force = 5 + throwforce = 5 + w_class = 3 + attack_verb = list("attacked", "slashed", "stabbed", "sliced") + +/* + * Crayons + */ /obj/item/toy/crayon name = "crayon" @@ -346,6 +368,13 @@ var/instant = 0 var/colourName = "red" //for updateIcon purposes + suicide_act(mob/user) + viewers(user) << "\red [user] is jaming the [src] up \his nose and into \his brain. It looks like \he's trying to commit suicide." + return (BRUTELOSS|OXYLOSS) + +/* + * Snap pops + */ /obj/item/toy/snappop name = "snap pop" desc = "Wow!" @@ -377,6 +406,9 @@ playsound(src, 'sound/effects/snap.ogg', 50, 1) del(src) +/* + * Water flower + */ /obj/item/toy/waterflower name = "Water Flower" desc = "A seemingly innocent sunflower...with a twist." @@ -444,75 +476,81 @@ ..() return -/obj/item/toy/balloon - name = "water balloon" - desc = "A translucent balloon. There's nothing in it." + +/* + * Mech prizes + */ +/obj/item/toy/prize icon = 'icons/obj/toy.dmi' - icon_state = "waterballoon-e" - item_state = "balloon-empty" + icon_state = "ripleytoy" + var/cooldown = 0 -/obj/item/toy/balloon/New() - var/datum/reagents/R = new/datum/reagents(10) - reagents = R - R.my_atom = src +//all credit to skasi for toy mech fun ideas +/obj/item/toy/prize/attack_self(mob/user as mob) + if(cooldown < world.time - 8) + user << "You play with [src]." + playsound(user, 'sound/mecha/mechstep.ogg', 20, 1) + cooldown = world.time -/obj/item/toy/balloon/attack(mob/living/carbon/human/M as mob, mob/user as mob) - return +/obj/item/toy/prize/attack_hand(mob/user as mob) + if(loc == user) + if(cooldown < world.time - 8) + user << "You play with [src]." + playsound(user, 'sound/mecha/mechturn.ogg', 20, 1) + cooldown = world.time + return + ..() -/obj/item/toy/balloon/afterattack(atom/A as mob|obj, mob/user as mob) - if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1) - A.reagents.trans_to(src, 10) - user << "\blue You fill the balloon with the contents of [A]." - src.desc = "A translucent balloon with some form of liquid sloshing around in it." - src.update_icon() - return +/obj/item/toy/prize/ripley + name = "toy ripley" + desc = "Mini-Mecha action figure! Collect them all! 1/11." -/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob) - if(istype(O, /obj/item/weapon/reagent_containers/glass)) - if(O.reagents) - if(O.reagents.total_volume < 1) - user << "The [O] is empty." - else if(O.reagents.total_volume >= 1) - if(O.reagents.has_reagent("pacid", 1)) - user << "The acid chews through the balloon!" - O.reagents.reaction(user) - del(src) - else - src.desc = "A translucent balloon with some form of liquid sloshing around in it." - user << "\blue You fill the balloon with the contents of [O]." - O.reagents.trans_to(src, 10) - src.update_icon() - return +/obj/item/toy/prize/fireripley + name = "toy firefighting ripley" + desc = "Mini-Mecha action figure! Collect them all! 2/11." + icon_state = "fireripleytoy" -/obj/item/toy/balloon/throw_impact(atom/hit_atom) - if(src.reagents.total_volume >= 1) - src.visible_message("\red The [src] bursts!","You hear a pop and a splash.") - src.reagents.reaction(get_turf(hit_atom)) - for(var/atom/A in get_turf(hit_atom)) - src.reagents.reaction(A) - src.icon_state = "burst" - spawn(5) - if(src) - del(src) - return +/obj/item/toy/prize/deathripley + name = "toy deathsquad ripley" + desc = "Mini-Mecha action figure! Collect them all! 3/11." + icon_state = "deathripleytoy" -/obj/item/toy/balloon/update_icon() - if(src.reagents.total_volume >= 1) - icon_state = "waterballoon" - item_state = "balloon" - else - icon_state = "waterballoon-e" - item_state = "balloon-empty" +/obj/item/toy/prize/gygax + name = "toy gygax" + desc = "Mini-Mecha action figure! Collect them all! 4/11." + icon_state = "gygaxtoy" -/obj/item/toy/katana - name = "replica katana" - desc = "Woefully underpowered in D20." - icon = 'icons/obj/weapons.dmi' - icon_state = "katana" - item_state = "katana" - flags = FPRINT | TABLEPASS | CONDUCT - slot_flags = SLOT_BELT | SLOT_BACK - force = 5 - throwforce = 5 - w_class = 3 - attack_verb = list("attacked", "slashed", "stabbed", "sliced") \ No newline at end of file +/obj/item/toy/prize/durand + name = "toy durand" + desc = "Mini-Mecha action figure! Collect them all! 5/11." + icon_state = "durandprize" + +/obj/item/toy/prize/honk + name = "toy H.O.N.K." + desc = "Mini-Mecha action figure! Collect them all! 6/11." + icon_state = "honkprize" + +/obj/item/toy/prize/marauder + name = "toy marauder" + desc = "Mini-Mecha action figure! Collect them all! 7/11." + icon_state = "marauderprize" + +/obj/item/toy/prize/seraph + name = "toy seraph" + desc = "Mini-Mecha action figure! Collect them all! 8/11." + icon_state = "seraphprize" + +/obj/item/toy/prize/mauler + name = "toy mauler" + desc = "Mini-Mecha action figure! Collect them all! 9/11." + icon_state = "maulerprize" + +/obj/item/toy/prize/odysseus + name = "toy odysseus" + desc = "Mini-Mecha action figure! Collect them all! 10/11." + icon_state = "odysseusprize" + +/obj/item/toy/prize/phazon + name = "toy phazon" + desc = "Mini-Mecha action figure! Collect them all! 11/11." + icon_state = "phazonprize" \ No newline at end of file diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 298cfb1a48..a80a892af6 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -184,3 +184,16 @@ RCD ..() desc = "A device used to rapidly build walls/floor." canRwall = 1 + +/obj/item/weapon/rcd_ammo + name = "compressed matter cartridge" + desc = "Highly compressed matter for the RCD." + icon = 'icons/obj/ammo.dmi' + icon_state = "rcd" + item_state = "rcdammo" + opacity = 0 + density = 0 + anchored = 0.0 + origin_tech = "materials=2" + m_amt = 30000 + g_amt = 15000 \ No newline at end of file diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index b122382e5f..5ffed7b6d1 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -3,6 +3,19 @@ CONTAINS: RSF */ +/obj/item/weapon/rsf + name = "\improper Rapid-Service-Fabricator" + desc = "A device used to rapidly deploy service items." + icon = 'icons/obj/items.dmi' + icon_state = "rcd" + opacity = 0 + density = 0 + anchored = 0.0 + var/matter = 0 + var/mode = 1 + flags = TABLEPASS + w_class = 3.0 + /obj/item/weapon/rsf/New() desc = "A RSF. It currently holds [matter]/30 fabrication-units." return @@ -168,7 +181,7 @@ RSF if (istype(A, /obj/structure/table) && matter >= 1) user << "Dispensing Dice Pack..." playsound(src.loc, 'sound/machines/click.ogg', 10, 1) - new /obj/item/weapon/storage/dice( A.loc ) + new /obj/item/weapon/storage/pill_bottle/dice( A.loc ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user engy.cell.charge -= 200 @@ -182,7 +195,7 @@ RSF if (istype(A, /turf/simulated/floor) && matter >= 1) user << "Dispensing Dice Pack..." playsound(src.loc, 'sound/machines/click.ogg', 10, 1) - new /obj/item/weapon/storage/dice( A ) + new /obj/item/weapon/storage/pill_bottle/dice( A ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user engy.cell.charge -= 200 diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 65c442aac8..9c93d5dab9 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -11,6 +11,23 @@ /* * DATA CARDS - Used for the teleporter */ +/obj/item/weapon/card + name = "card" + desc = "Does card things." + icon = 'icons/obj/card.dmi' + w_class = 1.0 + + var/list/files = list( ) + +/obj/item/weapon/card/data + name = "data disk" + desc = "A disk of data." + icon_state = "data" + var/function = "storage" + var/data = "null" + var/special = null + item_state = "card-id" + /obj/item/weapon/card/data/verb/label(t as text) set name = "Label Disk" set category = "Object" @@ -23,22 +40,37 @@ src.add_fingerprint(usr) return +/obj/item/weapon/card/data/clown + name = "coordinates to clown planet" + icon_state = "data" + item_state = "card-id" + layer = 3 + level = 2 + desc = "This card contains coordinates to the fabled Clown Planet. Handle with care." + function = "teleporter" + data = "Clown Land" /* * ID CARDS */ -/obj/item/weapon/card/id/examine() - ..() - read() +/obj/item/weapon/card/emag + desc = "It's a card with a magnetic strip attached to some circuitry." + name = "cryptographic sequencer" + icon_state = "emag" + item_state = "card-id" + origin_tech = "magnets=2;syndicate=2" -/obj/item/weapon/card/id/New() - ..() - spawn(30) - if(istype(loc, /mob/living/carbon/human)) - blood_type = loc:dna:b_type - dna_hash = loc:dna:unique_enzymes - fingerprint_hash = md5(loc:dna:uni_identity) +/obj/item/weapon/card/id + name = "identification card" + desc = "A card used to provide ID and determine access across the station." + icon_state = "id" + item_state = "card-id" + var/access = list() + var/registered_name = null // The name registered_name on the card + slot_flags = SLOT_ID + var/assignment = null + var/dorm = 0 // determines if this ID has claimed a dorm already /obj/item/weapon/card/id/attack_self(mob/user as mob) for(var/mob/O in viewers(user, null)) O.show_message(text("[] shows you: \icon[] []: assignment: []", user, src, src.name, src.assignment), 1) @@ -46,13 +78,11 @@ src.add_fingerprint(user) return -/obj/item/weapon/card/id/attack_hand(mob/user as mob) - var/obj/item/weapon/storage/wallet/WL - if( istype(loc, /obj/item/weapon/storage/wallet) ) - WL = loc - ..() - if(WL) - WL.update_icon() +/obj/item/weapon/card/id/GetAccess() + return access + +/obj/item/weapon/card/id/GetID() + return src /obj/item/weapon/card/id/verb/read() set name = "Read ID Card" @@ -65,6 +95,33 @@ usr << "The fingerprint hash on the card is [fingerprint_hash]." return + +/obj/item/weapon/card/id/silver + name = "identification card" + desc = "A silver card which shows honour and dedication." + icon_state = "silver" + item_state = "silver_id" + +/obj/item/weapon/card/id/gold + name = "identification card" + desc = "A golden card which shows power and might." + icon_state = "gold" + item_state = "gold_id" + +/obj/item/weapon/card/id/syndicate + name = "agent card" + access = list(access_maint_tunnels, access_syndicate) + origin_tech = "syndicate=3" + +/obj/item/weapon/card/id/syndicate/afterattack(var/obj/item/weapon/O as obj, mob/user as mob) + if(istype(O, /obj/item/weapon/card/id)) + var/obj/item/weapon/card/id/I = O + src.access |= I.access + if(istype(user, /mob/living) && user.mind) + if(user.mind.special_role) + usr << "\blue The card's microscanners activate as you pass it over the ID, copying its access." + + /obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob) if(!src.registered_name) //Stop giving the players unsanitized unputs! You are giving ways for players to intentionally crash clients! -Nodrak @@ -84,3 +141,32 @@ user << "\blue You successfully forge the ID card." else ..() + +/obj/item/weapon/card/id/syndicate_command + name = "syndicate ID card" + desc = "An ID straight from the Syndicate." + registered_name = "Syndicate" + assignment = "Syndicate Overlord" + access = list(access_syndicate) + +/obj/item/weapon/card/id/captains_spare + name = "captain's spare ID" + desc = "The spare ID of the High Lord himself." + icon_state = "gold" + item_state = "gold_id" + registered_name = "Captain" + assignment = "Captain" + New() + var/datum/job/captain/J = new/datum/job/captain + access = J.get_access() + ..() + +/obj/item/weapon/card/id/centcom + name = "\improper CentCom. ID" + desc = "An ID straight from Cent. Com." + icon_state = "centcom" + registered_name = "Central Command" + assignment = "General" + New() + access = get_all_centcom_access() + ..() \ No newline at end of file diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 5d5b6d6ea4..c2aba29f82 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -6,9 +6,10 @@ MATCHES CIGARETTES CIGARS SMOKING PIPES -CIG PACKET CHEAP LIGHTERS ZIPPO + +CIGARETTE PACKETS ARE IN FANCY.DM */ /////////// @@ -308,56 +309,7 @@ ZIPPO icon_off = "cobpipeoff" smoketime = 400 -//////////// -//CIG PACK// -//////////// -/obj/item/weapon/cigpacket - name = "cigarette packet" - desc = "The most popular brand of Space Cigarettes, sponsors of the Space Olympics." - icon = 'icons/obj/cigarettes.dmi' - icon_state = "cigpacket" - item_state = "cigpacket" - w_class = 1 - throwforce = 2 - flags = TABLEPASS - slot_flags = SLOT_BELT - var/cigcount = 6 -/obj/item/weapon/cigpacket/New() - ..() - flags |= NOREACT - create_reagents(15*cigcount)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one - -/obj/item/weapon/cigpacket/Del() - ..() - del(reagents) - -/obj/item/weapon/cigpacket/update_icon() - icon_state = "[initial(icon_state)][cigcount]" - desc = "There are [cigcount] cig\s left!" - return - -/obj/item/weapon/cigpacket/attack_hand(mob/user as mob) - if(user.r_hand == src || user.l_hand == src) - if(cigcount == 0) - user << "You're out of cigs, shit! How you gonna get through the rest of the day..." - return - else - var/obj/item/clothing/mask/cigarette/W = new /obj/item/clothing/mask/cigarette(user) - reagents.trans_to(W, (reagents.total_volume/cigcount)) - user.put_in_active_hand(W) - reagents.maximum_volume = 15*cigcount - cigcount-- - else - return ..() - update_icon() - return - -/obj/item/weapon/cigpacket/dromedaryco - name = "DromedaryCo packet" - desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\"" - icon_state = "Dpacket" - item_state = "Dpacket" ///////// //ZIPPO// diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 03c962b5af..a58629cda9 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -55,7 +55,8 @@ trigger_side_effect(M) spawn(0)//this prevents the collapse of space-time continuum - user.drop_from_inventory(src) + if (user) + user.drop_from_inventory(src) del(src) return uses diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index a14373169e..4f35194f9d 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -1,6 +1,6 @@ /obj/item/weapon/plastique/attack_self(mob/user as mob) var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num - if(newtime < 1) + if(newtime < 10) newtime = 10 timer = newtime user << "Timer set for [timer] seconds." diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index ec284b68ba..c19036a184 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -48,7 +48,7 @@ /obj/item/weapon/flamethrower/update_icon() - overlays = null + overlays.Cut() if(igniter) overlays += "+igniter[status]" if(ptank) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index c5c8fb3c57..1e5c6d68f4 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -7,6 +7,24 @@ /* * Gifts */ +/obj/item/weapon/a_gift + name = "gift" + desc = "PRESENTS!!!! eek!" + icon = 'icons/obj/items.dmi' + icon_state = "gift1" + item_state = "gift1" + pressure_resistance = 70 + +/obj/item/weapon/a_gift/New() + ..() + pixel_x = rand(-10,10) + pixel_y = rand(-10,10) + if(w_class > 0 && w_class < 4) + icon_state = "gift[w_class]" + else + icon_state = "gift[pick(1, 2, 3)]" + return + /obj/item/weapon/gift/attack_self(mob/user as mob) user.drop_item() if(src.gift) @@ -21,7 +39,6 @@ del(src) return - /obj/effect/spresent/relaymove(mob/user as mob) if (user.stat) return @@ -44,45 +61,71 @@ del(src) - /obj/item/weapon/a_gift/attack_self(mob/M as mob) - switch(pick("flash", "t_gun", "l_gun", "shield", "sword", "axe")) - if("flash") - var/obj/item/device/flash/W = new /obj/item/device/flash( M ) - M.put_in_active_hand(W) - W.add_fingerprint(M) - del(src) - return - if("l_gun") - var/obj/item/weapon/gun/energy/laser/W = new /obj/item/weapon/gun/energy/laser( M ) - M.put_in_active_hand(W) - W.add_fingerprint(M) - del(src) - return - if("t_gun") - var/obj/item/weapon/gun/energy/taser/W = new /obj/item/weapon/gun/energy/taser( M ) - M.put_in_active_hand(W) - W.add_fingerprint(M) - del(src) - return - if("sword") - var/obj/item/weapon/melee/energy/sword/W = new /obj/item/weapon/melee/energy/sword( M ) - M.put_in_active_hand(W) - W.add_fingerprint(M) - del(src) - return - if("axe") - var/obj/item/weapon/melee/energy/axe/W = new /obj/item/weapon/melee/energy/axe( M ) - M.put_in_active_hand(W) - W.add_fingerprint(M) - del(src) - return - else + var/gift_type = pick(/obj/item/weapon/sord, + /obj/item/weapon/storage/wallet, + /obj/item/weapon/storage/photo_album, + /obj/item/weapon/storage/box/snappops, + /obj/item/weapon/storage/fancy/crayons, + /obj/item/weapon/storage/backpack/holding, + /obj/item/weapon/storage/belt/champion, + /obj/item/weapon/soap/deluxe, + /obj/item/weapon/pickaxe/silver, + /obj/item/weapon/pen/invisible, + /obj/item/weapon/lipstick/random, + /obj/item/weapon/grenade/smokebomb, + /obj/item/weapon/corncob, + /obj/item/weapon/contraband/poster, + /obj/item/weapon/book/manual/barman_recipes, + /obj/item/weapon/book/manual/chef_recipes, + /obj/item/weapon/bikehorn, + /obj/item/weapon/beach_ball, + /obj/item/weapon/beach_ball/holoball, + /obj/item/weapon/banhammer, + /obj/item/toy/balloon, + /obj/item/toy/blink, + /obj/item/toy/crossbow, + /obj/item/toy/gun, + /obj/item/toy/katana, + /obj/item/toy/prize/deathripley, + /obj/item/toy/prize/durand, + /obj/item/toy/prize/fireripley, + /obj/item/toy/prize/gygax, + /obj/item/toy/prize/honk, + /obj/item/toy/prize/marauder, + /obj/item/toy/prize/mauler, + /obj/item/toy/prize/odysseus, + /obj/item/toy/prize/phazon, + /obj/item/toy/prize/ripley, + /obj/item/toy/prize/seraph, + /obj/item/toy/spinningtoy, + /obj/item/toy/sword, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, + /obj/item/device/paicard, + /obj/item/device/violin, + /obj/item/weapon/storage/belt/utility/full, + /obj/item/clothing/tie/horrible) + + if(!ispath(gift_type,/obj/item)) return + + var/obj/item/I = new gift_type(M) + M.u_equip(src) + M.put_in_hands(I) + I.add_fingerprint(M) + del(src) return /* * Wrapping Paper */ +/obj/item/weapon/wrapping_paper + name = "wrapping paper" + desc = "You can use this to wrap items in." + icon = 'icons/obj/items.dmi' + icon_state = "wrap_paper" + var/amount = 20.0 + /obj/item/weapon/wrapping_paper/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if (!( locate(/obj/structure/table, src.loc) )) @@ -148,4 +191,4 @@ else user << "\blue You need more paper." else - user << "Theyre moving around too much. a Straitjacket would help." \ No newline at end of file + user << "They are moving around too much. A straightjacket would help." \ No newline at end of file diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index ce4e4f2ce6..168ef431ed 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -226,6 +226,26 @@ beakers += B2 icon_state = initial(icon_state) +"_locked" +/obj/item/weapon/grenade/chem_grenade/antiweed + name = "weedkiller grenade" + desc = "Used for purging large areas of invasive plant species. Contents under pressure. Do not directly inhale contents." + path = 1 + stage = 2 + + New() + ..() + var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) + var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) + + B1.reagents.add_reagent("plantbgone", 25) + B1.reagents.add_reagent("potassium", 25) + B2.reagents.add_reagent("phosphorus", 25) + B2.reagents.add_reagent("sugar", 25) + + beakers += B1 + beakers += B2 + icon_state = "grenade" + /obj/item/weapon/grenade/chem_grenade/cleaner name = "Cleaner Grenade" desc = "BLAM!-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas." diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm index 95ad0b77b1..9edf68a60a 100644 --- a/code/game/objects/items/weapons/grenades/emgrenade.dm +++ b/code/game/objects/items/weapons/grenades/emgrenade.dm @@ -6,7 +6,7 @@ prime() ..() - if(empulse(src, 10, 20)) + if(empulse(src, 4, 10)) del(src) return diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 17b578461a..e95338168d 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -1,3 +1,20 @@ +/obj/item/weapon/handcuffs + name = "handcuffs" + desc = "Use this to keep prisoners in line." + gender = PLURAL + icon = 'icons/obj/items.dmi' + icon_state = "handcuff" + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT + throwforce = 5 + w_class = 2.0 + throw_speed = 2 + throw_range = 5 + m_amt = 500 + origin_tech = "materials=1" + var/dispenser = 0 + var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes + /obj/item/weapon/handcuffs/attack(mob/living/carbon/C as mob, mob/user as mob) if(istype(src, /obj/item/weapon/handcuffs/cyborg) && isrobot(user)) if(!C.handcuffed) @@ -73,4 +90,37 @@ playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) O.process() return - return \ No newline at end of file + return + +/obj/item/weapon/handcuffs/cable + name = "cable restraints" + desc = "Looks like some cables tied together. Could be used to tie something up." + icon_state = "cuff_red" + breakouttime = 300 //Deciseconds = 30s + +/obj/item/weapon/handcuffs/cable/red + icon_state = "cuff_red" + +/obj/item/weapon/handcuffs/cable/yellow + icon_state = "cuff_yellow" + +/obj/item/weapon/handcuffs/cable/blue + icon_state = "cuff_blue" + +/obj/item/weapon/handcuffs/cable/green + icon_state = "cuff_green" + +/obj/item/weapon/handcuffs/cable/pink + icon_state = "cuff_pink" + +/obj/item/weapon/handcuffs/cable/orange + icon_state = "cuff_orange" + +/obj/item/weapon/handcuffs/cable/cyan + icon_state = "cuff_cyan" + +/obj/item/weapon/handcuffs/cable/white + icon_state = "cuff_white" + +/obj/item/weapon/handcuffs/cyborg + dispenser = 1 \ No newline at end of file diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index 619828f68c..024dcd6008 100644 --- a/code/game/objects/items/weapons/hydroponics.dm +++ b/code/game/objects/items/weapons/hydroponics.dm @@ -1,47 +1,18 @@ /* Hydroponic stuff * Contains: - * Plant Bags * Sunflowers * Nettle * Deathnettle * Corbcob */ -/* - * Plant Bags - */ -/obj/item/weapon/plantbag - icon = 'icons/obj/hydroponics.dmi' - icon_state = "plantbag" - name = "Plant Bag" - var/mode = 1; //0 = pick one at a time, 1 = pick all on tile - var/capacity = 50; //the number of plant pieces it can carry. - flags = FPRINT | TABLEPASS - slot_flags = SLOT_BELT - w_class = 1 -/obj/item/weapon/plantbag/attack_self(mob/user as mob) - for (var/obj/item/weapon/reagent_containers/food/snacks/grown/O in contents) - contents -= O - O.loc = user.loc - user << "\blue You empty the plant bag." - return - -/obj/item/weapon/plantbag/verb/toggle_mode() - set name = "Switch Bagging Method" - set category = "Object" - - mode = !mode - switch (mode) - if(1) - usr << "The bag now picks up all plants in a tile at once." - if(0) - usr << "The bag now picks up one plant at a time." /* * SeedBag */ - +//uncomment when this is updated to match storage update +/* /obj/item/weapon/seedbag icon = 'icons/obj/hydroponics.dmi' icon_state = "seedbag" @@ -150,7 +121,7 @@ for(var/mob/M in nearby) if ((M.client && M.machine == src)) src.attack_self(M) - +*/ /* * Sunflower */ diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 1c391fe81d..0edd1a8736 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -78,9 +78,9 @@ if(istype(G, /obj/item/weapon/grab)) if(!ismob(G:affecting)) return - for(var/mob/living/carbon/metroid/M in range(1,G:affecting)) + for(var/mob/living/carbon/slime/M in range(1,G:affecting)) if(M.Victim == G:affecting) - usr << "[G:affecting:name] will not fit into the [src.name] because they have a Metroid latched onto their head." + usr << "[G:affecting:name] will not fit into the [src.name] because they have a slime latched onto their head." return var/mob/M = G:affecting if(put_mob(M)) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 9029fdfc5f..bf6216f02d 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -1,23 +1,52 @@ /* Kitchen tools * Contains: + * Utensils + * Spoons * Forks * Knives + * Kitchen knives + * Butcher's cleaver * Rolling Pins * Trays */ +/obj/item/weapon/kitchen + icon = 'icons/obj/kitchen.dmi' + +/* + * Utensils + */ +/obj/item/weapon/kitchen/utensil + force = 5.0 + w_class = 1.0 + throwforce = 5.0 + throw_speed = 3 + throw_range = 5 + flags = FPRINT | TABLEPASS | CONDUCT + origin_tech = "materials=1" + attack_verb = list("attacked", "stabbed", "poked") /obj/item/weapon/kitchen/utensil/New() if (prob(60)) src.pixel_y = rand(0, 4) return - - +/* + * Spoons + */ + /obj/item/weapon/kitchen/utensil/spoon + name = "spoon" + desc = "SPOON!" + icon_state = "spoon" + attack_verb = list("attacked", "poked") /* * Forks */ +/obj/item/weapon/kitchen/utensil/fork + name = "fork" + desc = "Pointy." + icon_state = "fork" /obj/item/weapon/kitchen/utensil/fork/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(!istype(M)) @@ -45,6 +74,19 @@ /* * Knives */ +/obj/item/weapon/kitchen/utensil/knife + name = "knife" + desc = "Can cut through any food." + icon_state = "knife" + force = 10.0 + throwforce = 10.0 + + suicide_act(mob/user) + viewers(user) << pick("\red [user] is slitting \his wrists with the [src]! It looks like \he's trying to commit suicide.", \ + "\red [user] is slitting \his throat with the [src]! It looks like \he's trying to commit suicide.", \ + "\red [user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.") + return (BRUTELOSS) + /obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) user << "\red You accidentally cut yourself with the [src]." @@ -53,10 +95,73 @@ playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) return ..() +/* + * Kitchen knives + */ +/obj/item/weapon/kitchenknife + name = "kitchen knife" + icon = 'icons/obj/kitchen.dmi' + icon_state = "knife" + desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." + flags = FPRINT | TABLEPASS | CONDUCT + force = 10.0 + w_class = 3.0 + throwforce = 6.0 + throw_speed = 3 + throw_range = 6 + m_amt = 12000 + origin_tech = "materials=1" + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + + suicide_act(mob/user) + viewers(user) << pick("\red [user] is slitting \his wrists with the [src]! It looks like \he's trying to commit suicide.", \ + "\red [user] is slitting \his throat with the [src]! It looks like \he's trying to commit suicide.", \ + "\red [user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.") + return (BRUTELOSS) + +/obj/item/weapon/kitchenknife/ritual + name = "ritual knife" + desc = "The unearthly energies that once powered this blade are now dormant." + icon = 'icons/obj/wizard.dmi' + icon_state = "render" + +/* + * Bucher's cleaver + */ +/obj/item/weapon/butch + name = "butcher's Cleaver" + icon = 'icons/obj/kitchen.dmi' + icon_state = "butch" + desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products." + flags = FPRINT | TABLEPASS | CONDUCT + force = 15.0 + w_class = 2.0 + throwforce = 8.0 + throw_speed = 3 + throw_range = 6 + m_amt = 12000 + origin_tech = "materials=1" + attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + +/obj/item/weapon/butch/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) + return ..() + /* * Rolling Pins */ +/obj/item/weapon/kitchen/rollingpin + name = "rolling pin" + desc = "Used to knock out the Bartender." + icon_state = "rolling_pin" + force = 8.0 + throwforce = 10.0 + throw_speed = 2 + throw_range = 7 + w_class = 3.0 + attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") //I think the rollingpin attackby will end up ignoring this anyway. + /obj/item/weapon/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) user << "\red The [src] slips out of your hand and hits your head." @@ -93,10 +198,42 @@ /* * Trays - Agouri */ +/obj/item/weapon/tray + name = "tray" + icon = 'icons/obj/food.dmi' + icon_state = "tray" + desc = "A metal tray to lay food on." + throwforce = 12.0 + throwforce = 10.0 + throw_speed = 1 + throw_range = 5 + w_class = 3.0 + flags = FPRINT | TABLEPASS | CONDUCT + m_amt = 3000 + /* // NOPE + var/food_total= 0 + var/burger_amt = 0 + var/cheese_amt = 0 + var/fries_amt = 0 + var/classyalcdrink_amt = 0 + var/alcdrink_amt = 0 + var/bottle_amt = 0 + var/soda_amt = 0 + var/carton_amt = 0 + var/pie_amt = 0 + var/meatbreadslice_amt = 0 + var/salad_amt = 0 + var/miscfood_amt = 0 + */ + var/list/carrying = list() // List of things on the tray. - Doohl + var/max_carry = 10 // w_class = 1 -- takes up 1 + // w_class = 2 -- takes up 3 + // w_class = 3 -- takes up 5 + /obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) // Drop all the things. All of them. - overlays = null + overlays.Cut() for(var/obj/item/I in carrying) I.loc = M.loc carrying.Remove(I) @@ -264,7 +401,7 @@ foundtable = 1 break - overlays = null + overlays.Cut() for(var/obj/item/I in carrying) I.loc = loc diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 37c53026d8..f4b2a14762 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -18,7 +18,7 @@ - +
\nThe data will be in the following form.
\nGenerally lower ranking positions come first in this list.
\n
\nJob Name general access>lab access-engine access-systems access (atmosphere control)
\n\tJob Description
\nJob Duties (in no particular order)
\nTips (where applicable)
\n
\nResearch Assistant 1>1-0-0
\n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
\n1. Assist the researchers.
\n2. Clean up the labs.
\n3. Prepare materials.
\n
\nStaff Assistant 2>0-0-0
\n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
\n1. Patrol ship/Guard key areas
\n2. Assist security officer
\n3. Perform other security duties.
\n
\nTechnical Assistant 1>0-0-1
\n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
\n1. Assist Station technician and Engineers.
\n2. Perform general maintenance of station.
\n3. Prepare materials.
\n
\nMedical Assistant 1>1-0-0
\n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
\n1. Assist the medical personnel.
\n2. Update medical files.
\n3. Prepare materials for medical operations.
\n
\nResearch Technician 2>3-0-0
\n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
\n1. Inform superiors of research.
\n2. Perform research alongside of official researchers.
\n
\nDetective 3>2-0-0
\n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
\n1. Perform crime-scene investigations/draw conclusions.
\n2. Store and catalogue evidence properly.
\n3. Testify to superiors/inquieries on findings.
\n
\nStation Technician 2>0-2-3
\n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
\n1. Maintain SS13 systems.
\n2. Repair equipment.
\n
\nAtmospheric Technician 3>0-0-4
\n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
\n1. Maintain atmosphere on SS13
\n2. Research atmospheres on the space station. (safely please!)
\n
\nEngineer 2>1-3-0
\n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
\n1. Upkeep the engine.
\n2. Prevent fires in the engine.
\n3. Maintain a safe orbit.
\n
\nMedical Researcher 2>5-0-0
\n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
\n1. Make sure the station is kept safe.
\n2. Research medical properties of materials studied of Space Station 13.
\n
\nScientist 2>5-0-0
\n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Plasma Technicians as plasma is the material they routinly handle.
\n1. Research plasma
\n2. Make sure all plasma is properly handled.
\n
\nMedical Doctor (Officer) 2>0-0-0
\n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
\n1. Heal wounded people.
\n2. Perform examinations of all personnel.
\n3. Moniter usage of medical equipment.
\n
\nSecurity Officer 3>0-0-0
\n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
\n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
\n1. Maintain order.
\n2. Assist others.
\n3. Repair structural problems.
\n
\nHead of Security 4>5-2-2
\n\tPeople assigned as Head of Security should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
\n1. Oversee security.
\n2. Assign patrol duties.
\n3. Protect the station and staff.
\n
\nHead of Personnel 4>4-2-2
\n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
\n1. Assign duties.
\n2. Moderate personnel.
\n3. Moderate research.
\n
\nCaptain 5>5-5-5 (unrestricted station wide access)
\n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
\n1. Assign all positions on SS13
\n2. Inspect the station for any problems.
\n3. Perform administrative duties.
\n" - -/obj/item/weapon/paper/photograph - name = "photo" - icon_state = "photo" - var/photo_id = 0.0 - item_state = "paper" - -/obj/item/weapon/paper/sop - name = "paper- 'Standard Operating Procedure'" - info = "Alert Levels:
\nBlue- Emergency
\n\t1. Caused by fire
\n\t2. Caused by manual interaction
\n\tAction:
\n\t\tClose all fire doors. These can only be opened by reseting the alarm
\nRed- Ejection/Self Destruct
\n\t1. Caused by module operating computer.
\n\tAction:
\n\t\tAfter the specified time the module will eject completely.
\n
\nEngine Maintenance Instructions:
\n\tShut off ignition systems:
\n\tActivate internal power
\n\tActivate orbital balance matrix
\n\tRemove volatile liquids from area
\n\tWear a fire suit
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nToxin Laboratory Procedure:
\n\tWear a gas mask regardless
\n\tGet an oxygen tank.
\n\tActivate internal atmosphere
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nDisaster Procedure:
\n\tFire:
\n\t\tActivate sector fire alarm.
\n\t\tMove to a safe area.
\n\t\tGet a fire suit
\n\t\tAfter:
\n\t\t\tAssess Damage
\n\t\t\tRepair damages
\n\t\t\tIf needed, Evacuate
\n\tMeteor Shower:
\n\t\tActivate fire alarm
\n\t\tMove to the back of ship
\n\t\tAfter
\n\t\t\tRepair damage
\n\t\t\tIf needed, Evacuate
\n\tAccidental Reentry:
\n\t\tActivate fire alrms in front of ship.
\n\t\tMove volatile matter to a fire proof area!
\n\t\tGet a fire suit.
\n\t\tStay secure until an emergency ship arrives.
\n
\n\t\tIf ship does not arrive-
\n\t\t\tEvacuate to a nearby safe area!" - -/obj/item/weapon/paper/genetics_side_effects - name = "paper - 'Genetical Side-Effects and Treatments'" - - New() - ..() - info = "" - for(var/tp in typesof(/datum/genetics/side_effect) - /datum/genetics/side_effect) - var/datum/genetics/side_effect/S = new tp - info += "Name:\t [S.name]
" - info += "Symptom:\t [S.symptom]
" - info += "Treatment:\t [S.treatment]
" - info += "Effect:\t [S.effect]
" - info += "
" - -/obj/item/weapon/banhammer - desc = "A banhammer" - name = "banhammer" - icon = 'icons/obj/items.dmi' - icon_state = "toyhammer" - flags = FPRINT | TABLEPASS - slot_flags = SLOT_BELT - throwforce = 0 - w_class = 1.0 - throw_speed = 7 - throw_range = 15 - attack_verb = list("banned") - /obj/item/weapon/rack_parts name = "rack parts" desc = "Parts of a rack." @@ -1068,32 +284,6 @@ flags = FPRINT | TABLEPASS| CONDUCT m_amt = 3750 -/* //gtfo my object tree -/obj/item/weapon/rubber_chicken - name = "rubber chicken" - desc = "A rubber chicken, isn't that hilarious?" - icon = 'icons/obj/items.dmi' - icon_state = "rubber_chicken" - item_state = "rubber_chicken" - w_class = 2.0 -*/ - -/obj/item/weapon/screwdriver - name = "screwdriver" - desc = "You can be totally screwwy with this." - icon = 'icons/obj/items.dmi' - icon_state = "screwdriver" - flags = FPRINT | TABLEPASS| CONDUCT - slot_flags = SLOT_BELT - force = 5.0 - w_class = 1.0 - throwforce = 5.0 - throw_speed = 3 - throw_range = 5 - g_amt = 0 - m_amt = 75 - attack_verb = list("stabbed") - /obj/item/weapon/shard name = "shard" icon = 'icons/obj/shards.dmi' @@ -1106,6 +296,11 @@ g_amt = 3750 attack_verb = list("stabbed", "slashed", "sliced", "cut") + suicide_act(mob/user) + viewers(user) << pick("/red [user] is slitting \his wrists with the shard of glass! It looks like \he's trying to commit suicide.", \ + "\red [user] is slitting \his throat with the shard of glass! It looks like \he's trying to commit suicide.") + return (BRUTELOSS) + /obj/item/weapon/shard/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) return ..() @@ -1230,138 +425,9 @@ m_amt = 40 attack_verb = list("whipped", "lashed", "disciplined", "tickled") -/obj/item/weapon/wrapping_paper - name = "wrapping paper" - desc = "You can use this to wrap items in." - icon = 'icons/obj/items.dmi' - icon_state = "wrap_paper" - var/amount = 20.0 - -/obj/item/weapon/cell - name = "power cell" - desc = "A rechargable electrochemical power cell." - icon = 'icons/obj/power.dmi' - icon_state = "cell" - item_state = "cell" - origin_tech = "powerstorage=1" - flags = FPRINT|TABLEPASS - force = 5.0 - throwforce = 5.0 - throw_speed = 3 - throw_range = 5 - w_class = 3.0 - pressure_resistance = 80 - var/charge = 0 // note %age conveted to actual charge in New - var/maxcharge = 1000 - m_amt = 700 - g_amt = 50 - var/rigged = 0 // true if rigged to explode - var/minor_fault = 0 //If not 100% reliable, it will build up faults. - var/construction_cost = list("metal"=750,"glass"=75) - var/construction_time=100 - -/obj/item/weapon/cell/crap - name = "\improper Nanotrasen brand rechargable AA battery" - desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT - origin_tech = "powerstorage=0" - maxcharge = 500 - g_amt = 40 - -/obj/item/weapon/cell/crap/empty/New() - ..() - charge = 0 - -/obj/item/weapon/cell/secborg - name = "\improper Security borg rechargable D battery" - origin_tech = "powerstorage=0" - maxcharge = 600 //600 max charge / 100 charge per shot = six shots - g_amt = 40 - -/obj/item/weapon/cell/secborg/empty/New() - ..() - charge = 0 - -/obj/item/weapon/cell/high - name = "high-capacity power cell" - origin_tech = "powerstorage=2" - icon_state = "hcell" - maxcharge = 10000 - g_amt = 60 - -/obj/item/weapon/cell/high/empty/New() - ..() - charge = 0 - -/obj/item/weapon/cell/super - name = "super-capacity power cell" - origin_tech = "powerstorage=5" - icon_state = "scell" - maxcharge = 20000 - g_amt = 70 - construction_cost = list("metal"=750,"glass"=100) - -/obj/item/weapon/cell/super/empty/New() - ..() - charge = 0 - -/obj/item/weapon/cell/hyper - name = "hyper-capacity power cell" - origin_tech = "powerstorage=6" - icon_state = "hpcell" - maxcharge = 30000 - g_amt = 80 - construction_cost = list("metal"=500,"glass"=150,"gold"=200,"silver"=200) - -/obj/item/weapon/cell/hyper/empty/New() - ..() - charge = 0 - -/obj/item/weapon/cell/infinite - name = "infinite-capacity power cell!" - icon_state = "icell" - origin_tech = null - maxcharge = 30000 - g_amt = 80 - use() - return 1 - -/obj/item/weapon/cell/potato - name = "potato battery" - desc = "A rechargable starch based power cell." - origin_tech = "powerstorage=1" - icon = 'icons/obj/power.dmi' //'icons/obj/harvest.dmi' - icon_state = "potato_cell" //"potato_battery" - charge = 100 - maxcharge = 300 - m_amt = 0 - g_amt = 0 - minor_fault = 1 - -/obj/item/weapon/camera_bug/attack_self(mob/usr as mob) - var/list/cameras = new/list() - for (var/obj/machinery/camera/C in cameranet.cameras) - if (C.bugged && C.status) - cameras.Add(C) - if (length(cameras) == 0) - usr << "\red No bugged functioning cameras found." - return - - var/list/friendly_cameras = new/list() - - for (var/obj/machinery/camera/C in cameras) - friendly_cameras.Add(C.c_tag) - - var/target = input("Select the camera to observe", null) as null|anything in friendly_cameras - if (!target) - return - for (var/obj/machinery/camera/C in cameras) - if (C.c_tag == target) - target = C - break - if (usr.stat == 2) return - - usr.client.eye = target - + suicide_act(mob/user) + viewers(user) << "\red [user] is strangling \himself with the [src]! It looks like \he's trying to commit suicide." + return (OXYLOSS) /obj/item/weapon/module icon = 'icons/obj/module.dmi' @@ -1397,15 +463,6 @@ desc = "Charging circuits for power cells." -/obj/item/weapon/a_gift - name = "gift" - desc = "A gift it appears." - icon = 'icons/obj/items.dmi' - icon_state = "gift" - item_state = "gift" - pressure_resistance = 70 - - /obj/item/device/camera_bug name = "camera bug" icon = 'icons/obj/device.dmi' @@ -1415,240 +472,31 @@ throw_speed = 4 throw_range = 20 +/obj/item/weapon/camera_bug/attack_self(mob/usr as mob) + var/list/cameras = new/list() + for (var/obj/machinery/camera/C in cameranet.cameras) + if (C.bugged && C.status) + cameras.Add(C) + if (length(cameras) == 0) + usr << "\red No bugged functioning cameras found." + return -/obj/item/weapon/kitchen - icon = 'icons/obj/kitchen.dmi' + var/list/friendly_cameras = new/list() -/obj/item/weapon/kitchen/rollingpin - name = "rolling pin" - desc = "Used to knock out the Bartender." - icon_state = "rolling_pin" - force = 8.0 - throwforce = 10.0 - throw_speed = 2 - throw_range = 7 - w_class = 3.0 - attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") //I think the rollingpin attackby will end up ignoring this anyway. + for (var/obj/machinery/camera/C in cameras) + friendly_cameras.Add(C.c_tag) -/obj/item/weapon/kitchenknife - name = "kitchen knife" - icon = 'icons/obj/kitchen.dmi' - icon_state = "knife" - desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." - flags = FPRINT | TABLEPASS | CONDUCT - force = 10.0 - w_class = 3.0 - throwforce = 6.0 - throw_speed = 3 - throw_range = 6 - m_amt = 12000 - origin_tech = "materials=1" - attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharp = 1 + var/target = input("Select the camera to observe", null) as null|anything in friendly_cameras + if (!target) + return + for (var/obj/machinery/camera/C in cameras) + if (C.c_tag == target) + target = C + break + if (usr.stat == 2) return -/obj/item/weapon/kitchenknife/ritual - name = "ritual knife" - desc = "The unearthly energies that once powered this blade are now dormant." - icon = 'icons/obj/wizard.dmi' - icon_state = "render" + usr.client.eye = target -/obj/item/weapon/butch - name = "butcher's Cleaver" - icon = 'icons/obj/kitchen.dmi' - icon_state = "butch" - desc = "A huge thing used for chopping and chopping up meat." - flags = FPRINT | TABLEPASS | CONDUCT - force = 15.0 - w_class = 2.0 - throwforce = 8.0 - throw_speed = 3 - throw_range = 6 - m_amt = 12000 - origin_tech = "materials=1" - attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharp = 1 - -/obj/item/weapon/butch/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) - return ..() - -/obj/item/weapon/tray - name = "tray" - icon = 'icons/obj/food.dmi' - icon_state = "tray" - desc = "A metal tray to lay food on." - throwforce = 12.0 - throwforce = 10.0 - throw_speed = 1 - throw_range = 5 - w_class = 3.0 - flags = FPRINT | TABLEPASS | CONDUCT - m_amt = 3000 - /* // NOPE - var/food_total= 0 - var/burger_amt = 0 - var/cheese_amt = 0 - var/fries_amt = 0 - var/classyalcdrink_amt = 0 - var/alcdrink_amt = 0 - var/bottle_amt = 0 - var/soda_amt = 0 - var/carton_amt = 0 - var/pie_amt = 0 - var/meatbreadslice_amt = 0 - var/salad_amt = 0 - var/miscfood_amt = 0 - */ - var/list/carrying = list() // List of things on the tray. - Doohl - var/max_carry = 10 // w_class = 1 -- takes up 1 - // w_class = 2 -- takes up 3 - // w_class = 3 -- takes up 5 - - -/obj/item/weapon/kitchen/utensil - force = 5.0 - w_class = 1.0 - throwforce = 5.0 - throw_speed = 3 - throw_range = 5 - flags = FPRINT | TABLEPASS | CONDUCT - origin_tech = "materials=1" - attack_verb = list("attacked", "stabbed", "poked") - - -/obj/item/weapon/kitchen/utensil/fork - name = "fork" - desc = "Pointy." - icon_state = "fork" - -/obj/item/weapon/kitchen/utensil/knife - name = "knife" - desc = "Can cut through any food." - icon_state = "knife" - force = 10.0 - throwforce = 10.0 - sharp = 1 - -/obj/item/weapon/kitchen/utensil/spoon - name = "spoon" - desc = "SPOON!" - icon_state = "spoon" - attack_verb = list("attacked", "poked") - -/obj/item/weapon/scalpel - name = "scalpel" - desc = "Cut, cut, and once more cut." - icon = 'icons/obj/surgery.dmi' - icon_state = "scalpel" - flags = FPRINT | TABLEPASS | CONDUCT - force = 10.0 - w_class = 1.0 - throwforce = 5.0 - throw_speed = 3 - throw_range = 5 - m_amt = 10000 - g_amt = 5000 - origin_tech = "materials=1;biotech=1" - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharp = 1 - -/obj/item/weapon/scalpel/stabslash - name = "\proper Stabslash The Pains of Healing" - desc = "All craftsmanship is of highest quality. On it is image of doctor and patient. Doctor is panicing. Patien is asleep." - icon_state = "stabslash" - -/obj/item/weapon/retractor - name = "retractor" - desc = "Retracts stuff." - icon = 'icons/obj/surgery.dmi' - icon_state = "retractor" - m_amt = 10000 - g_amt = 5000 - flags = FPRINT | TABLEPASS | CONDUCT - w_class = 1.0 - origin_tech = "materials=1;biotech=1" - -/obj/item/weapon/hemostat - name = "hemostat" - desc = "You think you have seen this before." - icon = 'icons/obj/surgery.dmi' - icon_state = "hemostat" - m_amt = 5000 - g_amt = 2500 - flags = FPRINT | TABLEPASS | CONDUCT - w_class = 1.0 - origin_tech = "materials=1;biotech=1" - attack_verb = list("attacked", "pinched") - -/obj/item/weapon/cautery - name = "cautery" - desc = "This stops bleeding." - icon = 'icons/obj/surgery.dmi' - icon_state = "cautery" - m_amt = 5000 - g_amt = 2500 - flags = FPRINT | TABLEPASS | CONDUCT - w_class = 1.0 - origin_tech = "materials=1;biotech=1" - attack_verb = list("burnt") - -/obj/item/weapon/surgicaldrill - name = "surgical drill" - desc = "You can drill using this item. You dig?" - icon = 'icons/obj/surgery.dmi' - icon_state = "drill" - hitsound = 'sound/weapons/circsawhit.ogg' - m_amt = 15000 - g_amt = 10000 - flags = FPRINT | TABLEPASS | CONDUCT - force = 15.0 - w_class = 1.0 - origin_tech = "materials=1;biotech=1" - attack_verb = list("drilled") - -/obj/item/weapon/circular_saw - name = "circular saw" - desc = "For heavy duty cutting." - icon = 'icons/obj/surgery.dmi' - icon_state = "saw3" - hitsound = 'sound/weapons/circsawhit.ogg' - flags = FPRINT | TABLEPASS | CONDUCT - force = 15.0 - w_class = 1.0 - throwforce = 9.0 - throw_speed = 3 - throw_range = 5 - m_amt = 20000 - g_amt = 10000 - origin_tech = "materials=1;biotech=1" - attack_verb = list("attacked", "slashed", "sawed", "cut") - sharp = 1 - -/obj/item/weapon/bonegel - name = "bone gel" - icon = 'surgery.dmi' - icon_state = "bone-gel" - force = 0 - throwforce = 1.0 - -/obj/item/weapon/FixOVein - name = "FixOVein" - icon = 'surgery.dmi' - icon_state = "fixovein" - force = 0 - throwforce = 1.0 - origin_tech = "materials=1;biotech=3" - var/usage_amount = 10 - -/obj/item/weapon/bonesetter - name = "bone setter" - icon = 'surgery.dmi' - icon_state = "bone setter" - force = 8.0 - throwforce = 9.0 - throw_speed = 3 - throw_range = 5 - attack_verb = list("attacked", "hit", "bludgeoned") /obj/item/weapon/syntiflesh name = "syntiflesh" @@ -1678,6 +526,27 @@ playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) return ..() +/obj/item/weapon/scythe + icon_state = "scythe0" + name = "scythe" + desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow." + force = 13.0 + throwforce = 5.0 + throw_speed = 1 + throw_range = 3 + w_class = 4.0 + flags = FPRINT | TABLEPASS | NOSHIELD + slot_flags = SLOT_BACK + origin_tech = "materials=2;combat=2" + attack_verb = list("chopped", "sliced", "cut", "reaped") + +/obj/item/weapon/scythe/afterattack(atom/A, mob/user as mob) + if(istype(A, /obj/effect/spacevine)) + for(var/obj/effect/spacevine/B in orange(A,1)) + if(prob(80)) + del B + del A + /* /obj/item/weapon/cigarpacket name = "Pete's Cuban Cigars" @@ -1793,7 +662,7 @@ /obj/item/weapon/stock_parts/manipulator/nano name = "nano-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." - icon_state = "micro_mani" + icon_state = "nano_mani" origin_tech = "materials=3,programming=2" rating = 2 m_amt = 30 @@ -1801,7 +670,7 @@ /obj/item/weapon/stock_parts/micro_laser/high name = "high-power micro-laser" desc = "A tiny laser used in certain devices." - icon_state = "micro_laser" + icon_state = "high_micro_laser" origin_tech = "magnets=3" rating = 2 m_amt = 10 @@ -1810,7 +679,7 @@ /obj/item/weapon/stock_parts/matter_bin/adv name = "advanced matter bin" desc = "A container for hold compressed matter awaiting re-construction." - icon_state = "matter_bin" + icon_state = "advanced_matter_bin" origin_tech = "materials=3" rating = 2 m_amt = 80 @@ -1836,12 +705,14 @@ /obj/item/weapon/stock_parts/manipulator/pico name = "pico-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." + icon_state = "pico_mani" origin_tech = "materials=5,programming=2" rating = 3 m_amt = 30 /obj/item/weapon/stock_parts/micro_laser/ultra name = "ultra-high-power micro-laser" + icon_state = "ultra_high_micro_laser" desc = "A tiny laser used in certain devices." origin_tech = "magnets=5" rating = 3 @@ -1851,6 +722,7 @@ /obj/item/weapon/stock_parts/matter_bin/super name = "super matter bin" desc = "A container for hold compressed matter awaiting re-construction." + icon_state = "super_matter_bin" origin_tech = "materials=5" rating = 3 m_amt = 80 @@ -1924,17 +796,3 @@ icon_state = "capacitor" desc = "A debug item for research." origin_tech = "materials=8;programming=8;magnets=8;powerstorage=8;bluespace=8;combat=8;biotech=8;syndicate=8" - -/obj/item/weapon/autopsy_scanner - name = "autopsy scanner" - desc = "Extracts information on wounds." - icon = 'icons/obj/autopsy_scanner.dmi' - icon_state = "" - flags = FPRINT | TABLEPASS | CONDUCT - w_class = 1.0 - origin_tech = "materials=1;biotech=1" - -/obj/item/weapon/autopsy_scanner/var/list/datum/autopsy_data_scanner/wdata = list() -/obj/item/weapon/autopsy_scanner/var/list/datum/autopsy_data_scanner/chemtraces = list() -/obj/item/weapon/autopsy_scanner/var/target_name = null -/obj/item/weapon/autopsy_scanner/var/timeofdeath = null diff --git a/code/defines/procs/command_alert.dm b/code/defines/procs/command_alert.dm index d7a97fe254..6545307fa1 100644 --- a/code/defines/procs/command_alert.dm +++ b/code/defines/procs/command_alert.dm @@ -1,9 +1,11 @@ -/proc/command_alert(var/text, var/title = "", var/maintitle = "NanoTrasen Update") - world << "
[maintitle]
" - +/proc/command_alert(var/text, var/title = "") + var/command + command += "[command_name()] Update
" if (title && length(title) > 0) - world << "[html_encode(title)]
" - - world << "[html_encode(text)]" - world << "" + command += "
[html_encode(title)]
" + command += "[html_encode(text)]
" + command += "
" + for(var/mob/M in player_list) + if(!istype(M,/mob/new_player)) + M << command diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 56bfcb5f4d..83cd08c224 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -606,11 +606,11 @@ proc/process_ghost_teleport_locs() icon_state = "fsmaint" /area/maintenance/asmaint - name = "Library Maintenance" + name = "Medbay Maintenance" icon_state = "asmaint" /area/maintenance/asmaint2 - name = "Med-Sci Maintenance" + name = "Science Maintenance" icon_state = "asmaint" /area/maintenance/apmaint @@ -634,7 +634,7 @@ proc/process_ghost_teleport_locs() icon_state = "pmaint" /area/maintenance/aft - name = "Robotics Maintenance" + name = "Engineering Maintenance" icon_state = "amaint" /area/maintenance/storage @@ -696,7 +696,7 @@ proc/process_ghost_teleport_locs() music = null /area/crew_quarters/captain - name = "\improper Captain's Quarters" + name = "\improper Captain's Office" icon_state = "captain" /area/crew_quarters/heads/hop @@ -887,10 +887,10 @@ proc/process_ghost_teleport_locs() engineering name = "Engineering" - icon_state = "engine" + icon_state = "engine_smes" break_room - name = "\improper Engineering Break Room" + name = "\improper Engineering Foyer" icon_state = "engine" chiefs_office @@ -947,17 +947,24 @@ proc/process_ghost_teleport_locs() /area/assembly/chargebay - name = "\improper Recharging Bay" + name = "\improper Mech Bay" icon_state = "mechbay" /area/assembly/showroom name = "\improper Robotics Showroom" icon_state = "showroom" -/area/assembly/assembly_line - name = "\improper Robotics Assembly Line" +/area/assembly/robotics + name = "\improper Robotics Lab" icon_state = "ass_line" +/area/assembly/assembly_line //Derelict Assembly Line + name = "\improper Assembly Line" + icon_state = "ass_line" + power_equip = 0 + power_light = 0 + power_environ = 0 + //Teleporter /area/teleporter @@ -965,7 +972,7 @@ proc/process_ghost_teleport_locs() icon_state = "teleporter" music = "signal" -/area/teleporter/gateway +/area/gateway name = "\improper Gateway" icon_state = "teleporter" music = "signal" @@ -1042,7 +1049,7 @@ proc/process_ghost_teleport_locs() icon_state = "cloning" /area/medical/sleeper - name = "\improper Medical Sleeper Room" + name = "Medbay Treatment Center" icon_state = "exam_room" //Security @@ -1112,6 +1119,22 @@ proc/process_ghost_teleport_locs() name = "\improper Security Checkpoint" icon_state = "security" +/area/security/checkpoint/supply + name = "Security Post - Cargo Bay" + icon_state = "checkpoint1" + +/area/security/checkpoint/engineering + name = "Security Post - Engineering" + icon_state = "checkpoint1" + +/area/security/checkpoint/medical + name = "Security Post - Medbay" + icon_state = "checkpoint1" + +/area/security/checkpoint/science + name = "Security Post - Science" + icon_state = "checkpoint1" + /area/security/vacantoffice name = "\improper Vacant Office" icon_state = "security" @@ -1163,7 +1186,7 @@ proc/process_ghost_teleport_locs() //Toxins /area/toxins/lab - name = "\improper Research Hallway" + name = "\improper Research and Development" icon_state = "toxlab" /area/toxins/hallway @@ -1400,7 +1423,7 @@ proc/process_ghost_teleport_locs() icon_state = "ai_upload" /area/turret_protected/ai_upload_foyer - name = "Secure Network Access" + name = "AI Upload Access" icon_state = "ai_foyer" /area/turret_protected/ai diff --git a/code/game/atoms.dm b/code/game/atoms.dm index fd88f79c29..d3554ef839 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -236,6 +236,9 @@ its easier to just keep the beam vertical. /atom/proc/blob_act() return +/atom/proc/fire_act() + return + /atom/proc/attack_hand(mob/user as mob) return @@ -270,8 +273,8 @@ its easier to just keep the beam vertical. /atom/proc/attack_larva(mob/user as mob) return -// for metroids -/atom/proc/attack_metroid(mob/user as mob) +// for slimes +/atom/proc/attack_slime(mob/user as mob) return /atom/proc/hand_h(mob/user as mob) //human (hand) - restrained @@ -291,7 +294,7 @@ its easier to just keep the beam vertical. src.hand_p(user) return -/atom/proc/hand_m(mob/user as mob) //metroid - restrained +/atom/proc/hand_m(mob/user as mob) //slime - restrained return @@ -528,20 +531,7 @@ its easier to just keep the beam vertical. var/turf/simulated/source2 = src new /obj/effect/decal/cleanable/oil(source2) -/atom/proc/clean_prints() - if(istype(fingerprints, /list)) - //Smudge up dem prints some - for(var/P in fingerprints) - var/test_print = stars(fingerprints[P], rand(10,20)) - if(stringpercent(test_print) == 32) //She's full of stars! (No actual print left) - fingerprints.Remove(P) - else - fingerprints[P] = test_print - if(!fingerprints.len) - del(fingerprints) - /atom/proc/clean_blood() - clean_prints() src.germ_level = 0 if(istype(blood_DNA, /list)) del(blood_DNA) @@ -602,8 +592,8 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl src.attack_paw(usr) else if(isalienadult(usr)) src.attack_alien(usr) - else if(ismetroid(usr)) - src.attack_metroid(usr) + else if(isslime(usr)) + src.attack_slime(usr) else if(isanimal(usr)) src.attack_animal(usr) else @@ -621,7 +611,7 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl src.hand_p(usr, usr.hand) else if(isalienadult(usr)) src.hand_al(usr, usr.hand) - else if(ismetroid(usr)) + else if(isslime(usr)) return else if(isanimal(usr)) return @@ -833,27 +823,28 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl attack_larva(alien) else if(ismetroid(usr)) - var/mob/living/carbon/metroid/metroid = usr - //-metroid stuff- + else if(isslime(usr)) + var/mob/living/carbon/slime/slime = usr + //-slime stuff- - if(metroid.stat) + if(slime.stat) return - var/in_range = in_range(src, metroid) || src.loc == metroid + var/in_range = in_range(src, slime) || src.loc == slime if (in_range) - if ( !metroid.restrained() ) + if ( !slime.restrained() ) if (W) - attackby(W,metroid) + attackby(W,slime) if (W) - W.afterattack(src, metroid) + W.afterattack(src, slime) else - attack_metroid(metroid) + attack_slime(slime) else - hand_m(metroid, metroid.hand) + hand_m(slime, slime.hand) else - if ( (W) && !metroid.restrained() ) - W.afterattack(src, metroid) + if ( (W) && !slime.restrained() ) + W.afterattack(src, slime) else if(isanimal(usr)) @@ -1165,8 +1156,8 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl src.attack_larva(usr) else if (istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/living/silicon/robot)) src.attack_ai(usr, usr.hand) - else if(istype(usr, /mob/living/carbon/metroid)) - src.attack_metroid(usr) + else if(istype(usr, /mob/living/carbon/slime)) + src.attack_slime(usr) else if(istype(usr, /mob/living/simple_animal)) src.attack_animal(usr) else diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 86bce8b00c..ad3ca36fbd 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -90,7 +90,7 @@ - while(src && target &&((((src.x < target.x && dx == EAST) || (src.x > target.x && dx == WEST)) && dist_travelled < range) || (a.has_gravity == 0) || istype(src.loc, /turf/space)) && src.throwing && istype(src.loc, /turf)) + while(src && target &&((((src.x < target.x && dx == EAST) || (src.x > target.x && dx == WEST)) && dist_travelled < range) || (a && a.has_gravity == 0) || istype(src.loc, /turf/space)) && src.throwing && istype(src.loc, /turf)) // only stop when we've gone the whole distance (or max throw range) and are on a non-space tile, or hit something, or hit the end of the map, or someone picks it up if(error < 0) var/atom/step = get_step(src, dy) diff --git a/code/game/communications.dm b/code/game/communications.dm index b79d1f9597..5e4e856269 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -106,11 +106,10 @@ var/list/radiochannels = list( "Security" = 1359, "Deathsquad" = 1441, "Syndicate" = 1213, - "Mining" = 1349, - "Cargo" = 1347, + "Supply" = 1347, ) //depenging helpers -var/list/DEPT_FREQS = list(1351,1355,1357,1359,1213,1441,1349,1347) +var/list/DEPT_FREQS = list(1351,1355,1357,1359,1213,1441,1347) var/const/COMM_FREQ = 1353 //command, colored gold in chat window var/const/SYND_FREQ = 1213 diff --git a/code/game/dna.dm b/code/game/dna.dm index 2ff33521bb..f450fcaed0 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -680,6 +680,19 @@ /////////////////////////// DNA MACHINES +/obj/machinery/dna_scannernew + name = "\improper DNA modifier" + desc = "It scans DNA structures." + icon = 'icons/obj/Cryogenic2.dmi' + icon_state = "scanner_0" + density = 1 + var/locked = 0.0 + var/mob/occupant = null + anchored = 1.0 + use_power = 1 + idle_power_usage = 50 + active_power_usage = 300 + /obj/machinery/dna_scannernew/New() ..() component_parts = list() @@ -838,6 +851,7 @@ A.loc = src.loc del(src) + /obj/machinery/computer/scan_consolenew/ex_act(severity) switch(severity) @@ -993,31 +1007,32 @@ src.temphtml = text("No viable occupant detected.")//More than anything, this just acts as a sanity check in case the option DOES appear for whatever reason usr << browse(temphtml, "window=scannernew;size=550x650") onclose(usr, "scannernew") - src.delete = 1 - src.temphtml = text("Working ... Please wait ([] Seconds)", src.radduration) - usr << browse(temphtml, "window=scannernew;size=550x650") - onclose(usr, "scannernew") - var/lock_state = src.connected.locked - src.connected.locked = 1//lock it - sleep(10*src.radduration) - if (!src.connected.occupant) + else + src.delete = 1 + src.temphtml = text("Working ... Please wait ([] Seconds)", src.radduration) + usr << browse(temphtml, "window=scannernew;size=550x650") + onclose(usr, "scannernew") + var/lock_state = src.connected.locked + src.connected.locked = 1//lock it + sleep(10*src.radduration) + if (!src.connected.occupant) + temphtml = null + delete = 0 + return null + if (prob(95)) + if(prob(75)) + randmutb(src.connected.occupant) + else + randmuti(src.connected.occupant) + else + if(prob(95)) + randmutg(src.connected.occupant) + else + randmuti(src.connected.occupant) + src.connected.occupant.radiation += ((src.radstrength*3)+src.radduration*3) + src.connected.locked = lock_state temphtml = null delete = 0 - return null - if (prob(95)) - if(prob(75)) - randmutb(src.connected.occupant) - else - randmuti(src.connected.occupant) - else - if(prob(95)) - randmutg(src.connected.occupant) - else - randmuti(src.connected.occupant) - src.connected.occupant.radiation += ((src.radstrength*3)+src.radduration*3) - src.connected.locked = lock_state - temphtml = null - delete = 0 if (href_list["radset"]) src.temphtml = text("Radiation Duration: []
", src.radduration) src.temphtml += text("Radiation Intensity: []
", src.radstrength) @@ -1056,21 +1071,22 @@ src.temphtml = text("No viable occupant detected.") usr << browse(temphtml, "window=scannernew;size=550x650") onclose(usr, "scannernew") - //src.temphtml = text("Unique Identifier: []
", src.connected.occupant.dna.uni_identity) - //src.temphtml = text("Unique Identifier: [getleftblocks(src.connected.occupant.dna.uni_identity,uniblock,3)][src.subblock == 1 ? ""+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),1,1)+"" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),1,1)][src.subblock == 2 ? ""+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),2,1)+"" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),2,1)][src.subblock == 3 ? ""+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),3,1)+"" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),3,1)][getrightblocks(src.connected.occupant.dna.uni_identity,uniblock,3)]
") + else + //src.temphtml = text("Unique Identifier: []
", src.connected.occupant.dna.uni_identity) + //src.temphtml = text("Unique Identifier: [getleftblocks(src.connected.occupant.dna.uni_identity,uniblock,3)][src.subblock == 1 ? ""+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),1,1)+"" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),1,1)][src.subblock == 2 ? ""+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),2,1)+"" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),2,1)][src.subblock == 3 ? ""+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),3,1)+"" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),3,1)][getrightblocks(src.connected.occupant.dna.uni_identity,uniblock,3)]
") - // New way of displaying DNA blocks - src.temphtml = text("Unique Identifier: [getblockstring(src.connected.occupant.dna.uni_identity,uniblock,subblock,3, src,1)]
") + // New way of displaying DNA blocks + src.temphtml = text("Unique Identifier: [getblockstring(src.connected.occupant.dna.uni_identity,uniblock,subblock,3, src,1)]
") - src.temphtml += text("Selected Block: []
", src.uniblock) - src.temphtml += text("<- Block ->
", src, src) - src.temphtml += text("Selected Sub-Block: []
", src.subblock) - src.temphtml += text("<- Sub-Block ->
", src, src) - src.temphtml += text("Selected Target: []
", src.unitargethex) - src.temphtml += text("<- Target ->
", src, src) - src.temphtml += "Modify Block:
" - src.temphtml += text("Irradiate
", src) - src.delete = 0 + src.temphtml += text("Selected Block: []
", src.uniblock) + src.temphtml += text("<- Block ->
", src, src) + src.temphtml += text("Selected Sub-Block: []
", src.subblock) + src.temphtml += text("<- Sub-Block ->
", src, src) + src.temphtml += text("Selected Target: []
", src.unitargethex) + src.temphtml += text("<- Target ->
", src, src) + src.temphtml += "Modify Block:
" + src.temphtml += text("Irradiate
", src) + src.delete = 0 if (href_list["unimenuplus"]) if (src.uniblock < 13) src.uniblock++ @@ -1188,15 +1204,20 @@ src.temphtml = text("No viable occupant detected.") usr << browse(temphtml, "window=scannernew;size=550x650") onclose(usr, "scannernew") - var/mob/living/carbon/human/H = src.connected.occupant - if(H) - if (H.reagents.get_reagent_amount("inaprovaline") < 60) - H.reagents.add_reagent("inaprovaline", 30) - usr << text("Occupant now has [] units of rejuvenation in his/her bloodstream.", H.reagents.get_reagent_amount("inaprovaline")) - src.delete = 0 + else + var/mob/living/carbon/human/H = src.connected.occupant + if(H) + if (H.reagents.get_reagent_amount("inaprovaline") < 60) + H.reagents.add_reagent("inaprovaline", 30) + usr << text("Occupant now has [] units of rejuvenation in his/her bloodstream.", H.reagents.get_reagent_amount("inaprovaline")) + src.delete = 0 //////////////////////////////////////////////////////// if (href_list["strucmenu"]) - if(src.connected.occupant) + if(!src.connected.occupant || !src.connected.occupant.dna) + src.temphtml = text("No viable occupant detected.") + usr << browse(temphtml, "window=scannernew;size=550x650") + onclose(usr, "scannernew") + else // Get this shit outta here it sucks //src.temphtml = text("Structural Enzymes: [getleftblocks(src.connected.occupant.dna.struc_enzymes,strucblock,3)][src.subblock == 1 ? ""+getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),1,1)+"" : getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),1,1)][src.subblock == 2 ? ""+getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),2,1)+"" : getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),2,1)][src.subblock == 3 ? ""+getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),3,1)+"" : getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),3,1)][getrightblocks(src.connected.occupant.dna.struc_enzymes,strucblock,3)]
") //src.temphtml = text("Structural Enzymes: []
", src.connected.occupant.dna.struc_enzymes) diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 7454370030..7cca20dfac 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -109,7 +109,9 @@ var/list/blob_nodes = list() if (1) command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") - world << sound('sound/AI/outbreak5.ogg') + for(var/mob/M in player_list) + if(!istype(M,/mob/new_player)) + M << sound('sound/AI/outbreak5.ogg') autoexpand = 0//No more extra pulses stage = -1 //next stage in 4-5 minutes diff --git a/code/game/gamemodes/blob/blobs/factory.dm b/code/game/gamemodes/blob/blobs/factory.dm index bc83a3bb3b..ca1c3f206e 100644 --- a/code/game/gamemodes/blob/blobs/factory.dm +++ b/code/game/gamemodes/blob/blobs/factory.dm @@ -19,5 +19,48 @@ run_action() if(spores.len >= max_spores) return 0 - new/obj/effect/critter/blob(src.loc, src) + new/mob/living/simple_animal/hostile/blobspore(src.loc, src) return 1 + + +/mob/living/simple_animal/hostile/blobspore + name = "blob" + desc = "Some blob thing." + icon = 'icons/mob/critter.dmi' + icon_state = "blobsquiggle" + icon_living = "blobsquiggle" + pass_flags = PASSBLOB + health = 20 + maxHealth = 20 + melee_damage_lower = 4 + melee_damage_upper = 8 + attacktext = "hits" + attack_sound = 'sound/weapons/genhit1.ogg' + var/obj/effect/blob/factory/factory = null + faction = "blob" + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 + maxbodytemp = 360 + + + New(loc, var/obj/effect/blob/factory/linked_node) + ..() + if(istype(linked_node)) + factory = linked_node + factory.spores += src + ..(loc) + return + Die() + ..() + if(factory) + factory.spores -= src + ..() + del(src) + diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index 3db2e1a144..63ba22d87f 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -35,29 +35,29 @@ //Helper proc. Does all the checks and stuff for us to avoid copypasta /mob/proc/changeling_power(var/required_chems=0, var/required_dna=0, var/max_genetic_damage=100, var/max_stat=0) - if(!usr) return - if(!usr.mind) return - if(!iscarbon(usr)) return - var/datum/changeling/changeling = usr.mind.changeling + if(!src.mind) return + if(!iscarbon(src)) return + + var/datum/changeling/changeling = src.mind.changeling if(!changeling) - world.log << "[usr] has the changeling_transform() verb but is not a changeling." + world.log << "[src] has the changeling_transform() verb but is not a changeling." return - if(usr.stat > max_stat) - usr << "We are incapacitated." + if(src.stat > max_stat) + src << "We are incapacitated." return if(changeling.absorbed_dna.len < required_dna) - usr << "We require at least [required_dna] samples of compatible DNA." + src << "We require at least [required_dna] samples of compatible DNA." return if(changeling.chem_charges < required_chems) - usr << "We require at least [required_chems] units of chemicals to do that!" + src << "We require at least [required_chems] units of chemicals to do that!" return if(changeling.geneticdamage > max_genetic_damage) - usr << "Our geneomes are still reassembling. We need time to recover first." + src << "Our geneomes are still reassembling. We need time to recover first." return return changeling @@ -72,55 +72,55 @@ var/datum/changeling/changeling = changeling_power(0,0,100) if(!changeling) return - var/obj/item/weapon/grab/G = usr.get_active_hand() + var/obj/item/weapon/grab/G = src.get_active_hand() if(!istype(G)) - usr << "We must be grabbing a creature in our active hand to absorb them." + src << "We must be grabbing a creature in our active hand to absorb them." return var/mob/living/carbon/human/T = G.affecting if(!istype(T)) - usr << "[T] is not compatible with our biology." + src << "[T] is not compatible with our biology." return if(NOCLONE in T.mutations) - usr << "This creature's DNA is ruined beyond useability!" + src << "This creature's DNA is ruined beyond useability!" return if(!G.killing) - usr << "We must have a tighter grip to absorb this creature." + src << "We must have a tighter grip to absorb this creature." return if(changeling.isabsorbing) - usr << "We are already absorbing!" + src << "We are already absorbing!" return changeling.isabsorbing = 1 for(var/stage = 1, stage<=3, stage++) switch(stage) if(1) - usr << "This creature is compatible. We must hold still..." + src << "This creature is compatible. We must hold still..." if(2) - usr << "We extend a proboscis." - usr.visible_message("[usr] extends a proboscis!") + src << "We extend a proboscis." + src.visible_message("[src] extends a proboscis!") if(3) - usr << "We stab [T] with the proboscis." - usr.visible_message("[usr] stabs [T] with the proboscis!") + src << "We stab [T] with the proboscis." + src.visible_message("[src] stabs [T] with the proboscis!") T << "You feel a sharp stabbing pain!" T.take_overall_damage(40) feedback_add_details("changeling_powers","A[stage]") - if(!do_mob(usr, T, 150)) - usr << "Our absorption of [T] has been interrupted!" + if(!do_mob(src, T, 150)) + src << "Our absorption of [T] has been interrupted!" changeling.isabsorbing = 0 return - usr << "We have absorbed [T]!" - usr.visible_message("[usr] sucks the fluids from [T]!") + src << "We have absorbed [T]!" + src.visible_message("[src] sucks the fluids from [T]!") T << "You have been absorbed by the changeling!" T.dna.real_name = T.real_name //Set this again, just to be sure that it's properly set. changeling.absorbed_dna |= T.dna - if(usr.nutrition < 400) usr.nutrition = min((usr.nutrition + T.nutrition), 400) + if(src.nutrition < 400) src.nutrition = min((src.nutrition + T.nutrition), 400) changeling.chem_charges += 10 changeling.geneticpoints += 2 @@ -143,7 +143,7 @@ if(!Tp.isVerb) call(Tp.verbpath)() else - usr.make_changeling() + src.make_changeling() changeling.chem_charges += T.mind.changeling.chem_charges changeling.geneticpoints += T.mind.changeling.geneticpoints @@ -179,15 +179,15 @@ return changeling.chem_charges -= 5 - usr.visible_message("[usr] transforms!") + src.visible_message("[src] transforms!") changeling.geneticdamage = 30 - usr.dna = chosen_dna - usr.real_name = chosen_dna.real_name - updateappearance(usr, usr.dna.uni_identity) - domutcheck(usr, null) + src.dna = chosen_dna + src.real_name = chosen_dna.real_name + updateappearance(src, src.dna.uni_identity) + domutcheck(src, null) - usr.verbs -= /mob/proc/changeling_transform - spawn(10) usr.verbs += /mob/proc/changeling_transform + src.verbs -= /mob/proc/changeling_transform + spawn(10) src.verbs += /mob/proc/changeling_transform feedback_add_details("changeling_powers","TR") return 1 @@ -201,7 +201,7 @@ var/datum/changeling/changeling = changeling_power(1,0,0) if(!changeling) return - var/mob/living/carbon/C = usr + var/mob/living/carbon/C = src changeling.chem_charges-- C.remove_changeling_powers() C.visible_message("[C] transforms!") @@ -216,7 +216,7 @@ C.monkeyizing = 1 C.canmove = 0 C.icon = null - C.overlays = null + C.overlays.Cut() C.invisibility = 101 var/atom/movable/overlay/animation = new /atom/movable/overlay( C.loc ) @@ -276,7 +276,7 @@ if(!chosen_dna) return - var/mob/living/carbon/C = usr + var/mob/living/carbon/C = src changeling.chem_charges-- C.remove_changeling_powers() @@ -290,7 +290,7 @@ C.monkeyizing = 1 C.canmove = 0 C.icon = null - C.overlays = null + C.overlays.Cut() C.invisibility = 101 var/atom/movable/overlay/animation = new /atom/movable/overlay( C.loc ) animation.icon_state = "blank" @@ -300,7 +300,7 @@ sleep(48) del(animation) - for(var/obj/item/W in usr) + for(var/obj/item/W in src) C.u_equip(W) if (C.client) C.client.screen -= W @@ -350,7 +350,7 @@ var/datum/changeling/changeling = changeling_power(20,1,100,DEAD) if(!changeling) return - var/mob/living/carbon/C = usr + var/mob/living/carbon/C = src if(!C.stat && alert("Are we sure we wish to fake our death?",,"Yes","No") == "No")//Confirmation for living changelings if they want to fake their death return C << "We will attempt to regenerate our form." @@ -380,7 +380,7 @@ C.heal_overall_damage(C.getBruteLoss(), C.getFireLoss()) C.reagents.clear_reagents() C << "We have regenerated." - C.visible_message("[usr] appears to wake from the dead, having healed all wounds.") + C.visible_message("[src] appears to wake from the dead, having healed all wounds.") C.status_flags &= ~(FAKEDEATH) C.update_canmove() @@ -398,10 +398,10 @@ var/datum/changeling/changeling = changeling_power(10,0,100) if(!changeling) return 0 changeling.chem_charges -= 10 - usr << "Your throat adjusts to launch the sting." + src << "Your throat adjusts to launch the sting." changeling.sting_range = 2 - usr.verbs -= /mob/proc/changeling_boost_range - spawn(5) usr.verbs += /mob/proc/changeling_boost_range + src.verbs -= /mob/proc/changeling_boost_range + spawn(5) src.verbs += /mob/proc/changeling_boost_range feedback_add_details("changeling_powers","RS") return 1 @@ -416,7 +416,7 @@ if(!changeling) return 0 changeling.chem_charges -= 45 - var/mob/living/carbon/human/C = usr + var/mob/living/carbon/human/C = src C.stat = 0 C.SetParalysis(0) C.SetStunned(0) @@ -424,45 +424,44 @@ C.lying = 0 C.update_canmove() - usr.verbs -= /mob/proc/changeling_unstun - spawn(5) usr.verbs += /mob/proc/changeling_unstun + src.verbs -= /mob/proc/changeling_unstun + spawn(5) src.verbs += /mob/proc/changeling_unstun feedback_add_details("changeling_powers","UNS") return 1 //Speeds up chemical regeneration /mob/proc/changeling_fastchemical() - usr.mind.changeling.chem_recharge_rate *= 2 + src.mind.changeling.chem_recharge_rate *= 2 return 1 //Increases macimum chemical storage /mob/proc/changeling_engorgedglands() - usr.mind.changeling.chem_storage += 25 + src.mind.changeling.chem_storage += 25 return 1 //Prevents AIs tracking you but makes you easily detectable to the human-eye. /mob/proc/changeling_digitalcamo() set category = "Changeling" - set name = "Toggle Digital Camoflague (10)" + set name = "Toggle Digital Camoflague" set desc = "The AI can no longer track us, but we will look different if examined. Has a constant cost while active." - var/datum/changeling/changeling = changeling_power(10) + var/datum/changeling/changeling = changeling_power() if(!changeling) return 0 - usr.mind.changeling.chem_charges -= 10 - var/mob/living/carbon/human/C = usr + var/mob/living/carbon/human/C = src if(C.digitalcamo) C << "We return to normal." else C << "We distort our form to prevent AI-tracking." C.digitalcamo = !C.digitalcamo spawn(0) - while(C && C.digitalcamo) - C.mind.changeling.chem_charges -= 1 + while(C && C.digitalcamo && C.mind && C.mind.changeling) + C.mind.changeling.chem_charges = max(C.mind.changeling.chem_charges - 1, 0) sleep(40) - usr.verbs -= /mob/proc/changeling_digitalcamo - spawn(5) usr.verbs += /mob/proc/changeling_digitalcamo + src.verbs -= /mob/proc/changeling_digitalcamo + spawn(5) src.verbs += /mob/proc/changeling_digitalcamo feedback_add_details("changeling_powers","CAM") return 1 @@ -475,9 +474,9 @@ var/datum/changeling/changeling = changeling_power(30,0,100,UNCONSCIOUS) if(!changeling) return 0 - usr.mind.changeling.chem_charges -= 30 + src.mind.changeling.chem_charges -= 30 - var/mob/living/carbon/human/C = usr + var/mob/living/carbon/human/C = src spawn(0) for(var/i = 0, i<10,i++) if(C) @@ -487,8 +486,8 @@ C.adjustFireLoss(-10) sleep(10) - usr.verbs -= /mob/proc/changeling_rapidregen - spawn(5) usr.verbs += /mob/proc/changeling_rapidregen + src.verbs -= /mob/proc/changeling_rapidregen + spawn(5) src.verbs += /mob/proc/changeling_rapidregen feedback_add_details("changeling_powers","RR") return 1 @@ -510,7 +509,7 @@ var/list/datum/dna/hivemind_bank = list() names += DNA.real_name if(names.len <= 0) - usr << "The airwaves already have all of our DNA." + src << "The airwaves already have all of our DNA." return var/S = input("Select a DNA to channel: ", "Channel DNA", null) as null|anything in names @@ -522,7 +521,7 @@ var/list/datum/dna/hivemind_bank = list() changeling.chem_charges -= 10 hivemind_bank += chosen_dna - usr << "We channel the DNA of [S] to the air." + src << "We channel the DNA of [S] to the air." feedback_add_details("changeling_powers","HU") return 1 @@ -540,7 +539,7 @@ var/list/datum/dna/hivemind_bank = list() names[DNA.real_name] = DNA if(names.len <= 0) - usr << "There's no new DNA to absorb from the air." + src << "There's no new DNA to absorb from the air." return var/S = input("Select a DNA absorb from the air: ", "Absorb DNA", null) as null|anything in names @@ -551,7 +550,7 @@ var/list/datum/dna/hivemind_bank = list() changeling.chem_charges -= 20 changeling.absorbed_dna += chosen_dna - usr << "We absorb the DNA of [S] from the air." + src << "We absorb the DNA of [S] from the air." feedback_add_details("changeling_powers","HD") return 1 @@ -559,32 +558,32 @@ var/list/datum/dna/hivemind_bank = list() /mob/proc/changeling_mimicvoice() set category = "Changeling" - set name = "Mimic Voice (10)" - set desc = "Shape our vocal glands to form a voice of someone we choose." + set name = "Mimic Voice" + set desc = "Shape our vocal glands to form a voice of someone we choose. We cannot regenerate chemicals when mimicing." - var/datum/changeling/changeling = changeling_power(10,1) + + var/datum/changeling/changeling = changeling_power() if(!changeling) return if(changeling.mimicing) changeling.mimicing = "" - usr << "We return our vocal glands to their original location." + src << "We return our vocal glands to their original location." return var/mimic_voice = input("Enter a name to mimic.", "Mimic Voice", null) as text if(!mimic_voice) return - changeling.chem_charges -= 10 changeling.mimicing = mimic_voice - usr << "We shape our glands to take the voice of [mimic_voice], this will stop us from regenerating chemicals while active." - usr << "Use this power again to return to our original voice and reproduce chemicals again." + src << "We shape our glands to take the voice of [mimic_voice], this will stop us from regenerating chemicals while active." + src << "Use this power again to return to our original voice and reproduce chemicals again." feedback_add_details("changeling_powers","MV") spawn(0) while(src && src.mind && src.mind.changeling && src.mind.changeling.mimicing) - src.mind.changeling.chem_charges -= 1 + src.mind.changeling.chem_charges = max(src.mind.changeling.chem_charges - 1, 0) sleep(40) if(src && src.mind && src.mind.changeling) src.mind.changeling.mimicing = "" @@ -607,7 +606,7 @@ var/list/datum/dna/hivemind_bank = list() var/list/victims = list() for(var/mob/living/carbon/C in oview(changeling.sting_range)) victims += C - var/mob/living/carbon/T = input(usr, "Who will we sting?") as null|anything in victims + var/mob/living/carbon/T = input(src, "Who will we sting?") as null|anything in victims if(!T) return if(!(T in view(changeling.sting_range))) return @@ -616,10 +615,10 @@ var/list/datum/dna/hivemind_bank = list() changeling.chem_charges -= required_chems changeling.sting_range = 1 - usr.verbs -= verb_path - spawn(10) usr.verbs += verb_path + src.verbs -= verb_path + spawn(10) src.verbs += verb_path - usr << "We stealthily sting [T]." + src << "We stealthily sting [T]." if(!T.mind || !T.mind.changeling) return T //T will be affected by the sting T << "You feel a tiny prick." return @@ -712,7 +711,7 @@ var/list/datum/dna/hivemind_bank = list() var/mob/living/carbon/T = changeling_sting(40,/mob/proc/changeling_transformation_sting) if(!T) return 0 if((HUSK in T.mutations) || (!ishuman(T) && !ismonkey(T))) - usr << "Our sting appears ineffective against its DNA." + src << "Our sting appears ineffective against its DNA." return 0 T.visible_message("[T] transforms!") T.dna = chosen_dna @@ -756,8 +755,8 @@ var/list/datum/dna/hivemind_bank = list() set desc="Stealthily sting a target to extract their DNA." var/datum/changeling/changeling = null - if(usr.mind && usr.mind.changeling) - changeling = usr.mind.changeling + if(src.mind && src.mind.changeling) + changeling = src.mind.changeling if(!changeling) return 0 diff --git a/code/game/gamemodes/changeling/modularchangling.dm b/code/game/gamemodes/changeling/modularchangling.dm index 2f3659bc7a..2395e63b27 100644 --- a/code/game/gamemodes/changeling/modularchangling.dm +++ b/code/game/gamemodes/changeling/modularchangling.dm @@ -81,7 +81,7 @@ var/list/datum/power/changeling/powerinstances = list() /datum/power/changeling/mimicvoice name = "Mimic Voice" desc = "We shape our vocal glands to sound like a desired voice." - helptext = "Will turn your voice into the name that you enter." + helptext = "Will turn your voice into the name that you enter. We must constantly expend chemicals to maintain our form like this" genomecost = 3 verbpath = /mob/proc/changeling_mimicvoice @@ -494,7 +494,7 @@ var/list/datum/power/changeling/powerinstances = list() purchasedpowers += Thepower if(!Thepower.isVerb && Thepower.verbpath) - call(Thepower.verbpath)() + call(M.current, Thepower.verbpath)() else if(remake_verbs) M.current.make_changeling() diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 4990ed625b..b08faf9ebb 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -774,24 +774,3 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", R.word3=wordtech R.loc = user.loc R.check_icon() - - -/obj/item/weapon/paperscrap - name = "scrap of paper" - icon_state = "scrap" - throw_speed = 1 - throw_range = 2 - w_class = 1.0 - flags = FPRINT | TABLEPASS - - var/data - - attack_self(mob/user as mob) - view_scrap(user) - - examine() - set src in usr - view_scrap(usr) - - proc/view_scrap(var/viewer) - viewer << browse(data) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index b4eefa6380..4564ea2fc9 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -377,10 +377,14 @@ var/list/sacrificed = list() "\red A shape forms in the center of the rune. A shape of... a man.", \ "\red You hear liquid flowing.") D.real_name = "Unknown" + var/chose_name = 0 for(var/obj/item/weapon/paper/P in this_rune.loc) if(P.info) D.real_name = copytext(P.info, 1, MAX_NAME_LEN) + chose_name = 1 break + if(!chose_name) + D.real_name = "[pick(first_names_male)] [pick(last_names)]" D.universal_speak = 1 D.status_flags &= ~GODMODE diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 9e0ba0a37d..333af390eb 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -8,13 +8,14 @@ /*if(prob(50))//Every 120 seconds and prob 50 2-4 weak spacedusts will hit the station spawn(1) dust_swarm("weak")*/ - if (!event) + if(!event) //CARN: checks to see if random events are enabled. if(config.allow_random_events) - hadevent = event() - else - Holiday_Random_Event() - else + if(prob(eventchance)) + event() + hadevent = 1 + else + Holiday_Random_Event() else event = 0 sleep(2400) @@ -77,15 +78,52 @@ switch(picked_event) if("Meteor") command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert") - world << sound('sound/AI/meteors.ogg') + for(var/mob/M in player_list) + if(!istype(M,/mob/new_player)) + M << sound('sound/AI/meteors.ogg') spawn(100) meteor_wave() spawn_meteors() spawn(700) meteor_wave() spawn_meteors() - if("Blob") - mini_blob_event() + + if(2) + command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert") + for(var/mob/M in player_list) + if(!istype(M,/mob/new_player)) + M << sound('sound/AI/granomalies.ogg') + var/turf/T = pick(blobstart) + var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 ) + spawn(rand(50, 300)) + del(bh) + /* + if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO + command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert") + world << sound('sound/AI/spanomalies.ogg') + var/list/turfs = new + var/turf/picked + for(var/turf/simulated/floor/T in world) + if(T.z == 1) + turfs += T + for(var/turf/simulated/floor/T in turfs) + if(prob(20)) + spawn(50+rand(0,3000)) + picked = pick(turfs) + var/obj/effect/portal/P = new /obj/effect/portal( T ) + P.target = picked + P.creator = null + P.icon = 'icons/obj/objects.dmi' + P.failchance = 0 + P.icon_state = "anom" + P.name = "wormhole" + spawn(rand(300,600)) + del(P) + */ + if(3) + if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round. + space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like. + if(4) mini_blob_event() if("Space Ninja") //Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like. space_ninja_arrival() @@ -118,13 +156,16 @@ command_alert("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT") else // AIs will always know if there's a comm blackout, rogue AIs could then lie about comm blackouts in the future while they shutdown comms for(var/mob/living/silicon/ai/A in player_list) - A << "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT" + A << "
" + A << "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT" + A << "
" for(var/obj/machinery/telecomms/T in telecomms_list) T.emp_act(1) /proc/power_failure() command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure") - world << sound('sound/AI/poweroff.ogg') + for(var/mob/M in player_list) + M << sound('sound/AI/poweroff.ogg') for(var/obj/machinery/power/smes/S in world) if(istype(get_area(S), /area/turret_protected) || S.z != 1) continue @@ -172,7 +213,8 @@ /proc/power_restore() command_alert("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal") - world << sound('sound/AI/poweron.ogg') + for(var/mob/M in player_list) + M << sound('sound/AI/poweron.ogg') for(var/obj/machinery/power/apc/C in world) if(C.cell && C.z == 1) C.cell.charge = C.cell.maxcharge @@ -194,7 +236,8 @@ /proc/power_restore_quick() command_alert("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal") - world << sound('sound/AI/poweron.ogg') + for(var/mob/M in player_list) + M << sound('sound/AI/poweron.ogg') for(var/obj/machinery/power/smes/S in world) if(S.z != 1) continue @@ -250,6 +293,8 @@ var/foundAlready = 0 // don't infect someone that already has the virus var/turf/T = get_turf(H) + if(!T) + continue if(T.z != 1) continue for(var/datum/disease/D in H.viruses) @@ -278,7 +323,8 @@ break spawn(rand(1500, 3000)) //Delayed announcements to keep the crew on their toes. command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") - world << sound('sound/AI/outbreak7.ogg') + for(var/mob/M in player_list) + M << sound('sound/AI/outbreak7.ogg') /proc/alien_infestation(var/spawncount = 1) // -- TLE //command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert") @@ -306,7 +352,8 @@ spawn(rand(5000, 6000)) //Delayed announcements to keep the crew on their toes. command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert") - world << sound('sound/AI/aliens.ogg') + for(var/mob/M in player_list) + M << sound('sound/AI/aliens.ogg') /proc/high_radiation_event() @@ -321,6 +368,8 @@ sleep(600) for(var/mob/living/carbon/human/H in living_mob_list) var/turf/T = get_turf(H) + if(!T) + continue if(T.z != 1) continue if(istype(H,/mob/living/carbon/human)) @@ -329,12 +378,15 @@ H.apply_effect((rand(90,150)),IRRADIATE,0) for(var/mob/living/carbon/monkey/M in living_mob_list) var/turf/T = get_turf(M) + if(!T) + continue if(T.z != 1) continue M.apply_effect((rand(15,75)),IRRADIATE,0) sleep(100) command_alert("Radiation levels are within standard parameters again.", "Anomaly Alert") - world << sound('sound/AI/radiation.ogg') + for(var/mob/M in player_list) + M << sound('sound/AI/radiation.ogg') @@ -384,7 +436,8 @@ //sleep(100) spawn(rand(300, 600)) //Delayed announcements to keep the crew on their toes. command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert") - world << sound('sound/AI/commandreport.ogg') + for(var/mob/M in player_list) + M << sound('sound/AI/commandreport.ogg') /proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 25) //leave lightsoutAmount as 0 to break ALL lights if(isEvent) @@ -451,46 +504,74 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is crew = "Any Human" switch(rand(1,14)) if(1) + M << "
" M << "\red THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED" + M << "
" M.add_ion_law("THERE ARE [amount] [who2] ON THE STATION") if(2) + M << "
" M << "\red [what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED" + M << "
" M.add_ion_law("[what2] ARE DANGEROUS TO HUMANS") if(3) + M << "
" M << "\red THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED" + M << "
" M.add_ion_law("THE ESCAPE SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION") if(4) + M << "
" M << "\red HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED" + M << "
" M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE") if(5) + M << "
" M << "\red THE CAPTAIN, HOP AND HOS ARE [who2]...LAWS UPDATED" + M << "
" M.add_ion_law("THE CAPTAIN, HOP AND HOS ARE [who2]") if(6) + M << "
" M << "\red THE STATION IS BUILT FOR [who2]...LAWS UPDATED" + M << "
" M.add_ion_law("THE STATION IS BUILT FOR [who2]") if(7) + M << "
" M << "\red YOU ARE [amount] [who2]...LAWS UPDATED" + M << "
" M.add_ion_law("YOU ARE [amount] [who2]") if(8) + M << "
" M << "\red YOU MUST ALWAYS [aimust]...LAWS UPDATED" + M << "
" M.add_ion_law("YOU MUST ALWAYS [aimust]") if(9) + M << "
" M << "\red [area] [area2] [amount] [what2]...LAWS UPDATED" + M << "
" M.add_ion_law("[area] [area2] [amount] [what2]") if(10) + M << "
" M << "\red [crew] is [target]...LAWS UPDATED" + M << "
" M.add_ion_law("[crew] is [target]") if(11) + M << "
" M << "\red [define] IS A FORM OF HARM...LAWS UPDATED" + M << "
" M.add_ion_law("[define] IS A FORM OF HARM") if(12) + M << "
" M << "\red YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED" + M << "
" M.add_ion_law("YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS") if(13) + M << "
" M << "\red [crew] is [allergysev] to [allergy]...LAWS UPDATED" + M << "
" M.add_ion_law("[crew] is [allergysev] to [allergy]") if(14) + M << "
" M << "\red THE STATION IS [who2pref] [who2]...LAWS UPDATED" + M << "
" M.add_ion_law("THE STATION IS [who2pref] [who2]") if(botEmagChance) diff --git a/code/game/gamemodes/events/dust.dm b/code/game/gamemodes/events/dust.dm index fb1f167c34..378c6b2468 100644 --- a/code/game/gamemodes/events/dust.dm +++ b/code/game/gamemodes/events/dust.dm @@ -100,7 +100,7 @@ The "dust" will damage the hull of the station causin minor hull breaches. if(ismob(A)) A.meteorhit(src)//This should work for now I guess - else if(!istype(A,/obj/machinery/emitter) && !istype(A,/obj/machinery/field_generator)) //Protect the singularity from getting released every round! + else if(!istype(A,/obj/machinery/power/emitter) && !istype(A,/obj/machinery/field_generator)) //Protect the singularity from getting released every round! A.ex_act(strength) //Changing emitter/field gen ex_act would make it immune to bombs and C4 life-- diff --git a/code/game/gamemodes/events/holidays/Christmas.dm b/code/game/gamemodes/events/holidays/Christmas.dm index 2b4a1008ff..2ee79e7c65 100644 --- a/code/game/gamemodes/events/holidays/Christmas.dm +++ b/code/game/gamemodes/events/holidays/Christmas.dm @@ -1 +1,63 @@ -//placeholder for holiday stuff \ No newline at end of file +/proc/Christmas_Game_Start() + for(var/obj/structure/flora/tree/pine/xmas in world) + if(xmas.z != 1) continue + for(var/turf/simulated/floor/T in orange(1,xmas)) + for(var/i=1,i<=rand(1,5),i++) + new /obj/item/weapon/a_gift(T) + for(var/mob/living/simple_animal/corgi/Ian/Ian in mob_list) + Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian)) + +/proc/ChristmasEvent() + for(var/obj/structure/flora/tree/pine/xmas in world) + var/mob/living/simple_animal/hostile/tree/evil_tree = new /mob/living/simple_animal/hostile/tree(xmas.loc) + evil_tree.icon_state = xmas.icon_state + evil_tree.icon_living = evil_tree.icon_state + evil_tree.icon_dead = evil_tree.icon_state + evil_tree.icon_gib = evil_tree.icon_state + del(xmas) + +/obj/item/weapon/toy/xmas_cracker + name = "xmas cracker" + icon = 'icons/obj/christmas.dmi' + icon_state = "cracker" + desc = "Directions for use: Requires two people, one to pull each end." + var/cracked = 0 + +/obj/item/weapon/toy/xmas_cracker/New() + ..() + +/obj/item/weapon/toy/xmas_cracker/attack(mob/target, mob/user) + if( !cracked && istype(target,/mob/living/carbon/human) && (target.stat == CONSCIOUS) && !target.get_active_hand() ) + target.visible_message("[user] and [target] pop \an [src]! *pop*", "You pull \an [src] with [target]! *pop*", "You hear a *pop*.") + var/obj/item/weapon/paper/Joke = new /obj/item/weapon/paper(user.loc) + Joke.name = "[pick("awful","terrible","unfunny")] joke" + Joke.info = pick("What did one snowman say to the other?\n\n'Is it me or can you smell carrots?'", + "Why couldn't the snowman get laid?\n\nHe was frigid!", + "Where are santa's helpers educated?\n\nNowhere, they're ELF-taught.", + "What happened to the man who stole advent calanders?\n\nHe got 25 days.", + "What does Santa get when he gets stuck in a chimney?\n\nClaus-trophobia.", + "Where do you find chili beans?\n\nThe north pole.", + "What do you get from eating tree decorations?\n\nTinsilitis!", + "What do snowmen wear on their heads?\n\nIce caps!", + "Why is Christmas just like life on ss13?\n\nYou do all the work and the fat guy gets all the credit.", + "Why doesn’t Santa have any children?\n\nBecause he only comes down the chimney.") + new /obj/item/clothing/head/festive(target.loc) + user.update_icons() + cracked = 1 + icon_state = "cracker1" + var/obj/item/weapon/toy/xmas_cracker/other_half = new /obj/item/weapon/toy/xmas_cracker(target) + other_half.cracked = 1 + other_half.icon_state = "cracker2" + target.put_in_active_hand(other_half) + playsound(user, 'sound/effects/snap.ogg', 50, 1) + return 1 + return ..() + +/obj/item/clothing/head/festive + name = "festive paper hat" + icon_state = "xmashat" + desc = "A crappy paper hat that you are REQUIRED to wear." + flags_inv = 0 + flags = FPRINT|TABLEPASS + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm index eed0a08332..d2481eae44 100644 --- a/code/game/gamemodes/events/holidays/Holidays.dm +++ b/code/game/gamemodes/events/holidays/Holidays.dm @@ -101,6 +101,7 @@ var/global/Holiday = null switch(DD) if(10) Holiday = "Human-Rights Day" if(14) Holiday = "Monkey Day" + if(21) if(YY==12) Holiday = "End of the World" if(22) Holiday = "Orgasming Day" //lol. These all actually exist if(24) Holiday = "Christmas Eve" if(25) Holiday = "Christmas" @@ -120,14 +121,13 @@ var/global/Holiday = null set desc = "Force-set the Holiday variable to make the game think it's a certain day." if(!check_rights(R_SERVER)) return - if(!T) return Holiday = T //get a new station name station_name = null station_name() //update our hub status world.update_status() -// Holiday_Game_Start() + Holiday_Game_Start() message_admins("\blue ADMIN: Event: [key_name(src)] force-set Holiday to \"[Holiday]\"") log_admin("[key_name(src)] force-set Holiday to \"[Holiday]\"") @@ -141,10 +141,9 @@ var/global/Holiday = null switch(Holiday) //special holidays if("Easter") //do easter stuff - if("Christmas ") - //do christmas stuff - else - //etc. you get what I'm getting at + if("Christmas Eve","Christmas") + Christmas_Game_Start() + return //Nested in the random events loop. Will be triggered every 2 minutes @@ -171,4 +170,9 @@ var/global/Holiday = null if(S.z != 1) continue containers += S - message_admins("\blue DEBUG: Event: Egg spawned at [Egg.loc] ([Egg.x],[Egg.y],[Egg.z])")*/ \ No newline at end of file + message_admins("\blue DEBUG: Event: Egg spawned at [Egg.loc] ([Egg.x],[Egg.y],[Egg.z])")*/ + if("End of the World") + if(prob(eventchance)) GameOver() + + if("Christmas","Christmas Eve") + if(prob(eventchance)) ChristmasEvent() diff --git a/code/game/gamemodes/events/holidays/Other.dm b/code/game/gamemodes/events/holidays/Other.dm new file mode 100644 index 0000000000..b520bbe342 --- /dev/null +++ b/code/game/gamemodes/events/holidays/Other.dm @@ -0,0 +1,10 @@ +/proc/GameOver() + if(!hadevent) + hadevent = 1 + message_admins("The apocalypse has begun! (this holiday event can be disabled by toggling events off within 60 seconds)") + spawn(600) + if(!config.allow_random_events) return + Show2Group4Delay(ScreenText(null,"
The [name_1] [name_2] implied an undercover operative was acting on their behalf on the station currently.
" + src.text += "
The [name_1] [name_2] implied an undercover operative was acting on their behalf on the station currently." + src.text += "It would be in your best interests to suspect everybody, as these undercover operatives could have implants which trigger them to have their memories removed until they are needed. He, or she, could even be a high ranking officer." + /* src.text += "After some investigation, we " if(traitor_name) src.text += "are [prob_right_dude]% sure that [traitor_name] may have been involved, and should be closely observed." @@ -130,11 +140,13 @@ else src.text += "discovered the following set of fingerprints ([fingerprints]) on sensitive materials, and their owner should be closely observed." src.text += "However, these could also belong to a current Cent. Com employee, so do not act on this without reason." + */ /datum/intercept_text/proc/build_cult(datum/mind/correct_person) var/name_1 = pick(src.org_names_1) var/name_2 = pick(src.org_names_2) + /* var/traitor_name var/traitor_job var/prob_right_dude = rand(prob_correct_person_lower, prob_correct_person_higher) @@ -156,19 +168,23 @@ traitor_name = correct_person:current else traitor_name = pick_mob() - - src.text += "
It has been brought to our attention that the [name_1] [name_2] have stumbled upon some dark secrets. They apparently want to spread the dangerous knowledge on as many stations as they can.
" + */ + src.text += "
It has been brought to our attention that the [name_1] [name_2] have stumbled upon some dark secrets. They apparently want to spread the dangerous knowledge onto as many stations as they can." + src.text += "Watch out for the following: praying to an unfamilar god, preaching the word of \[REDACTED\], sacrifices, magical dark power, living constructs of evil and a portal to the dimension of the underworld." + /* src.text += "Based on our intelligence, we are [prob_right_job]% sure that if true, someone doing the job of [traitor_job] on your station may have been converted " src.text += "and instilled with the idea of the flimsiness of the real world, seeking to destroy it. " if(prob(prob_right_dude)) src.text += "
In addition, we are [prob_right_dude]% sure that [traitor_name] may have also some in to contact with this " src.text += "organisation." src.text += "
However, if this information is acted on without substantial evidence, those responsible will face severe repercussions." + */ /datum/intercept_text/proc/build_rev(datum/mind/correct_person) var/name_1 = pick(src.org_names_1) var/name_2 = pick(src.org_names_2) + /* var/traitor_name var/traitor_job var/prob_right_dude = rand(prob_correct_person_lower, prob_correct_person_higher) @@ -192,14 +208,17 @@ traitor_name = correct_person.current else traitor_name = src.pick_mob() - - src.text += "
It has been brought to our attention that the [name_1] [name_2] are attempting to stir unrest on one of our stations in your sector.
" + */ + src.text += "
It has been brought to our attention that the [name_1] [name_2] are attempting to stir unrest on one of our stations in your sector." + src.text += "Watch out for suspicious activity among the crew and make sure that all heads of staff report in periodically." + /* src.text += "Based on our intelligence, we are [prob_right_job]% sure that if true, someone doing the job of [traitor_job] on your station may have been brainwashed " src.text += "at a recent conference, and their department should be closely monitored for signs of mutiny. " if(prob(prob_right_dude)) src.text += "
In addition, we are [prob_right_dude]% sure that [traitor_name] may have also some in to contact with this " src.text += "organisation." src.text += "
However, if this information is acted on without substantial evidence, those responsible will face severe repercussions." + */ /datum/intercept_text/proc/build_wizard(datum/mind/correct_person) @@ -211,7 +230,7 @@ src.text += "Known attributes include: Brown sandals, a large blue hat, a voluptous white beard, and an inclination to cast spells." /datum/intercept_text/proc/build_nuke(datum/mind/correct_person) - src.text += "
Cent. Com recently recieved a report of a plot to destory one of our stations in your area. We believe the Nuclear Authentication Disc " + src.text += "
Cent. Com recently recieved a report of a plot to destroy one of our stations in your area. We believe the Nuclear Authentication Disc " src.text += "that is standard issue aboard your vessel may be a target. We recommend removal of this object, and it's storage in a safe " src.text += "environment. As this may cause panic among the crew, all efforts should be made to keep this information a secret from all but " src.text += "the most trusted crew-members." @@ -226,6 +245,7 @@ var/cname = pick(src.changeling_names) var/orgname1 = pick(src.org_names_1) var/orgname2 = pick(src.org_names_2) + /* var/changeling_name var/changeling_job var/prob_right_dude = rand(prob_correct_person_lower, prob_correct_person_higher) @@ -245,9 +265,12 @@ changeling_name = src.pick_mob() else changeling_name = src.pick_mob() + */ src.text += "
We have received a report that a dangerous alien lifeform known only as \"[cname]\" may have infiltrated your crew. " + /* src.text += "Our intelligence suggests a [prob_right_job]% chance that a [changeling_job] on board your station has been replaced by the alien. " src.text += "Additionally, the report indicates a [prob_right_dude]% chance that [changeling_name] may have been in contact with the lifeform at a recent social gathering. " + */ src.text += "These lifeforms are assosciated with the [orgname1] [orgname2] and may be attempting to acquire sensitive materials on their behalf. " - src.text += "Please take care not to alarm the crew, as [cname] may take advantage of a panic situation." + src.text += "Please take care not to alarm the crew, as [cname] may take advantage of a panic situation. Remember, they can be anybody, suspect everybody!" diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 34545842cc..3ae4807464 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -65,6 +65,8 @@ if(alert(AI_mind.current,"Do you want to use an alternative sprite for your real core?",,"Yes","No")=="Yes") AI_mind.current.icon_state = "ai-malf2" */ + if(emergency_shuttle) + emergency_shuttle.always_fake_recall = 1 spawn (rand(waittime_l, waittime_h)) send_intercept() ..() @@ -131,7 +133,11 @@ if (station_captured && !to_nuke_or_not_to_nuke) return 1 if (is_malf_ai_dead()) - return 1 + if(config.continous_rounds) + if(emergency_shuttle) + emergency_shuttle.always_fake_recall = 0 + else + return 1 return ..() //check for shuttle and nuke @@ -165,7 +171,9 @@ ticker.mode:malf_mode_declared = 1 for(var/datum/mind/AI_mind in ticker.mode:malf_ai) AI_mind.current.verbs -= /datum/game_mode/malfunction/proc/takeover - world << sound('sound/AI/aimalf.ogg') + for(var/mob/M in player_list) + if(!istype(M,/mob/new_player)) + M << sound('sound/AI/aimalf.ogg') /datum/game_mode/malfunction/proc/ai_win() diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 0aa28f8cf0..c3720275ee 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -114,7 +114,7 @@ //Prevent meteors from blowing up the singularity's containment. //Changing emitter and generator ex_act would result in them being bomb and C4 proof. - if(!istype(A,/obj/machinery/emitter) && \ + if(!istype(A,/obj/machinery/power/emitter) && \ !istype(A,/obj/machinery/field_generator) && \ prob(15)) @@ -141,7 +141,7 @@ spawn(0) //Prevent meteors from blowing up the singularity's containment. //Changing emitter and generator ex_act would result in them being bomb and C4 proof - if(!istype(A,/obj/machinery/emitter) && \ + if(!istype(A,/obj/machinery/power/emitter) && \ !istype(A,/obj/machinery/field_generator)) if(--src.hits <= 0) del(src) //Dont blow up singularity containment if we get stuck there. diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index d9bfca2b0e..a8d629f2fd 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -295,7 +295,7 @@ datum/objective/hijack datum/objective/block - explanation_text = "Do not allow any humans to escape on the shuttle alive." + explanation_text = "Do not allow any organic lifeforms to escape on the shuttle alive." check_completion() @@ -474,16 +474,26 @@ datum/objective/steal "a hand teleporter" = /obj/item/weapon/hand_tele, "an RCD" = /obj/item/weapon/rcd, "a jetpack" = /obj/item/weapon/tank/jetpack, - "a captains jumpsuit" = /obj/item/clothing/under/rank/captain, + "a captain's jumpsuit" = /obj/item/clothing/under/rank/captain, "a functional AI" = /obj/item/device/aicard, "a pair of magboots" = /obj/item/clothing/shoes/magboots, "the station blueprints" = /obj/item/blueprints, "a nasa voidsuit" = /obj/item/clothing/suit/space/nasavoid, "28 moles of plasma (full tank)" = /obj/item/weapon/tank, + "a sample of slime extract" = /obj/item/slime_extract, + "a piece of corgi meat" = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi, + "a research director's jumpsuit" = /obj/item/clothing/under/rank/research_director, + "a chief engineer's jumpsuit" = /obj/item/clothing/under/rank/chief_engineer, + "a chief medical officer's jumpsuit" = /obj/item/clothing/under/rank/chief_medical_officer, + "a head of security's jumpsuit" = /obj/item/clothing/under/rank/head_of_security, + "a head of personnel's jumpsuit" = /obj/item/clothing/under/rank/head_of_personnel, + "the hypospray" = /obj/item/weapon/reagent_containers/hypospray, + "the captain's pinpointer" = /obj/item/weapon/pinpointer, + "an ablative armor vest" = /obj/item/clothing/suit/armor/laserproof, ) var/global/possible_items_special[] = list( - "nuclear authentication disk" = /obj/item/weapon/disk/nuclear, + /*"nuclear authentication disk" = /obj/item/weapon/disk/nuclear,*///Broken with the change to nuke disk making it respawn on z level change. "nuclear gun" = /obj/item/weapon/gun/energy/gun/nuclear, "diamond drill" = /obj/item/weapon/pickaxe/diamonddrill, "bag of holding" = /obj/item/weapon/storage/backpack/holding, diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index a210d856cd..bba325296e 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -89,6 +89,8 @@ for(var/datum/mind/rev_mind in head_revolutionaries) greet_revolutionary(rev_mind) modePlayer += head_revolutionaries + if(emergency_shuttle) + emergency_shuttle.always_fake_recall = 1 spawn (rand(waittime_l, waittime_h)) send_intercept() ..() @@ -165,6 +167,11 @@ //Checks if the round is over// /////////////////////////////// /datum/game_mode/revolution/check_finished() + if(config.continous_rounds) + if(finished != 0) + if(emergency_shuttle) + emergency_shuttle.always_fake_recall = 0 + return ..() if(finished != 0) return 1 else diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 64e418f0ee..439befdc63 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -144,8 +144,6 @@ datum/hSB continue if(istype(O, /obj/item/weapon/melee/energy/sword)) continue - if(istype(O, /obj/effect/critter)) - continue if(istype(O, /obj/structure)) continue selectable += O diff --git a/code/game/gamemodes/sandbox/sandbox.dm b/code/game/gamemodes/sandbox/sandbox.dm index 3bace4756e..475c3d22aa 100644 --- a/code/game/gamemodes/sandbox/sandbox.dm +++ b/code/game/gamemodes/sandbox/sandbox.dm @@ -15,5 +15,7 @@ M.CanBuild() return 1 -/datum/game_mode/sandbox/check_finished() - return 0 +/datum/game_mode/sandbox/post_setup() + ..() + if(emergency_shuttle) + emergency_shuttle.always_fake_recall = 1 diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 474aa85eff..531e3f558d 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -38,8 +38,10 @@ dat += "
" dat += "Mastercrafted Armor Set
" dat += "
" + dat += "Staff of Animation
" + dat += "
" if(op) - dat += "Re-memorize Spells
" + dat += "Re-memorize Spells
" user << browse(dat, "window=radio") onclose(user, "radio") return @@ -54,9 +56,9 @@ if ( src.loc == usr || (in_range(src,usr) && istype(src.loc, /turf))) usr.set_machine(src) if(href_list["spell_choice"]) - if(src.uses >= 1 && src.max_uses >=1 && text2num(href_list["spell_choice"]) < 18) + if(src.uses >= 1 && src.max_uses >=1 && text2num(href_list["spell_choice"]) < 19) src.uses-- - var/list/available_spells = list("Magic Missile","Fireball","Disintegrate","Disable Tech","Smoke","Blind","Mind Transfer","Forcewall","Blink","Teleport","Mutate","Ethereal Jaunt","Knock","Summon Guns","Staff of Change","Six Soul Stone Shards and the spell Artificer","Mastercrafted Armor Set") + var/list/available_spells = list("Magic Missile","Fireball","Disintegrate","Disable Tech","Smoke","Blind","Mind Transfer","Forcewall","Blink","Teleport","Mutate","Ethereal Jaunt","Knock","Summon Guns","Staff of Change","Six Soul Stone Shards and the spell Artificer","Mastercrafted Armor Set", "Staff of Animation") var/already_knows = 0 for(var/obj/effect/proc_holder/spell/aspell in usr.spell_list) if(available_spells[text2num(href_list["spell_choice"])] == aspell.name) @@ -72,7 +74,7 @@ src.temp = "This spell fires several, slow moving, magic projectiles at nearby targets. If they hit a target, it is paralyzed and takes minor damage." if ("2") feedback_add_details("wizard_spell_learned","FB") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - usr.spell_list += new /obj/effect/proc_holder/spell/targeted/projectile/fireball(usr) + usr.spell_list += new /obj/effect/proc_holder/spell/dumbfire/fireball(usr) src.temp = "This spell fires a fireball in the direction you're facing and does not require wizard garb. Be careful not to fire it at people that are standing next to you." if ("3") feedback_add_details("wizard_spell_learned","DG") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells @@ -142,8 +144,13 @@ new /obj/item/clothing/head/helmet/space/rig/wizard(get_turf(usr)) src.temp = "An artefact suit of armor that allows you to cast spells while providing more protection against attacks and the void of space." src.max_uses-- + if("18") + feedback_add_details("wizard_spell_learned","SA") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells + new /obj/item/weapon/gun/energy/staff/animate(get_turf(usr)) + src.temp = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines." + src.max_uses-- - if (href_list["spell_choice"] == "18") + if (href_list["spell_choice"] == "19") var/area/wizard_station/A = locate() if(usr in A.contents) src.uses = src.max_uses diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index dec9e7496c..deb4e05d24 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -183,6 +183,10 @@ /datum/game_mode/wizard/check_finished() + + if(config.continous_rounds) + return ..() + var/wizards_alive = 0 for(var/datum/mind/wizard in wizards) if(!istype(wizard.current,/mob/living/carbon)) @@ -198,6 +202,7 @@ return 1 + /datum/game_mode/wizard/declare_completion() if(finished) feedback_set_details("round_end_result","loss - wizard killed") diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index ac96aa1ce1..deff61f50a 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -127,15 +127,17 @@ else if(istype(M, /mob/living/carbon/monkey) || istype(M, /mob/living/carbon/alien/humanoid)) var/mob/living/carbon/george = M //they can only hold things :( - if(george.get_active_hand() && (istype(george.get_active_hand(), /obj/item/weapon/card/id) || istype(george.get_active_hand(), /obj/item/device/pda)) && src.check_access(george.get_active_hand())) + if(src.check_access(george.get_active_hand())) return 1 return 0 -/obj/proc/check_access(obj/item/weapon/card/id/I) +/obj/item/proc/GetAccess() + return list() - if (istype(I, /obj/item/device/pda)) - var/obj/item/device/pda/pda = I - I = pda.id +/obj/item/proc/GetID() + return null + +/obj/proc/check_access(obj/item/I) if(!src.req_access && !src.req_one_access) //no requirements return 1 @@ -145,14 +147,14 @@ var/list/L = src.req_access if(!L.len && (!src.req_one_access || !src.req_one_access.len)) //no requirements return 1 - if(!I || !istype(I, /obj/item/weapon/card/id) || !I.access) //not ID or no access + if(!I) return 0 for(var/req in src.req_access) - if(!(req in I.access)) //doesn't have this access + if(!(req in I.GetAccess())) //doesn't have this access return 0 if(src.req_one_access && src.req_one_access.len) for(var/req in src.req_one_access) - if(req in I.access) //has an access from the single access list + if(req in I.GetAccess()) //has an access from the single access list return 1 return 0 return 1 @@ -174,92 +176,6 @@ return 0 return 1 - -/proc/get_access(job) - switch(job) - if("Geneticist") - return list(access_medical, access_morgue, access_genetics) - if("Station Engineer") - return list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction) - if("Assistant") - if(config.assistant_maint) - return list(access_maint_tunnels) - else - return list() - if("Chaplain") - return list(access_morgue, access_chapel_office, access_crematorium) - if("Detective") - return list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court) - if("Medical Doctor") - return list(access_medical, access_morgue, access_surgery, access_virology) - if("Botanist") // -- TLE - return list(access_hydroponics, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. - if("Librarian") // -- TLE - return list(access_library) - if("Lawyer") //Muskets 160910 - return list(access_lawyer, access_court) - if("Captain") - return get_all_accesses() - if("Security Officer") - return list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels) - if("Warden") - return list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels) - if("Scientist") - 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_genetics, access_court, - access_teleporter, access_heads, access_tech_storage, access_security, access_sec_doors, access_brig, access_atmospherics, - access_maint_tunnels, access_bar, access_janitor, access_kitchen, access_robotics, access_armory, access_hydroponics, - access_theatre, access_research, access_hos, access_RC_announce, access_forensics_lockers, access_keycard_auth) - if("Head of Personnel") - return list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, - access_tox, access_tox_storage, access_chemistry, access_medical, access_genetics, access_engine, - access_emergency_storage, access_change_ids, access_ai_upload, access_eva, access_heads, - access_all_personal_lockers, access_tech_storage, access_maint_tunnels, access_bar, access_janitor, - access_crematorium, access_kitchen, access_robotics, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, - access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, - access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway) - if("Atmospheric Technician") - return list(access_atmospherics, access_maint_tunnels, access_emergency_storage, access_construction) - if("Bartender") - return list(access_bar) - if("Chemist") - return list(access_medical, access_chemistry) - if("Janitor") - return list(access_janitor, access_maint_tunnels) - if("Clown") - return list(access_clown, access_theatre) - if("Mime") - return list(access_mime, access_theatre) - if("Chef") - return list(access_kitchen, access_morgue) - if("Roboticist") - return list(access_robotics, access_tech_storage, access_morgue) //As a job that handles so many corpses, it makes sense for them to have morgue access. - if("Cargo Technician") - return list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting) - if("Shaft Miner") - return list(access_mining, access_mint, access_mining_station) - if("Quartermaster") - return list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station) - if("Chief Engineer") - return list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, - access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, - access_heads, access_ai_upload, access_construction, access_robotics, - access_mint, access_ce, access_RC_announce, access_keycard_auth, access_tcomsat) - if("Research Director") - return list(access_rd, access_heads, access_tox, access_genetics, - access_tox_storage, access_teleporter, - access_research, access_robotics, access_xenobiology, - access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway) - if("Virologist") - return list(access_medical, access_virology) - if("Chief Medical Officer") - return list(access_medical, access_morgue, access_genetics, access_heads, - access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, - access_keycard_auth) - else - return list() - /proc/get_centcom_access(job) switch(job) if("VIP Guest") @@ -285,12 +201,12 @@ return list(access_security, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_court, access_medical, access_genetics, access_morgue, access_rd, access_tox, access_tox_storage, access_chemistry, access_engine, access_engine_equip, access_maint_tunnels, - access_external_airlocks, access_emergency_storage, access_change_ids, access_ai_upload, + access_external_airlocks, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_heads, access_captain, access_all_personal_lockers, access_tech_storage, access_chapel_office, access_atmospherics, access_kitchen, - access_bar, access_janitor, access_crematorium, access_robotics, access_cargo, access_cargo_bot, access_construction, - access_hydroponics, access_library, access_manufacturing, access_lawyer, access_virology, access_cmo, access_qm, access_clown, access_mime, access_surgery, - access_theatre, access_research, access_mining, access_mailsorting, access_mint_vault, access_mint, + access_bar, access_janitor, access_crematorium, access_robotics, access_cargo, access_construction, + access_hydroponics, access_library, access_lawyer, access_virology, access_cmo, access_qm, access_clown, access_mime, access_surgery, + access_theatre, access_research, access_mining, access_mailsorting, access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway) @@ -309,15 +225,15 @@ if(2) //medbay return list(access_medical, access_genetics, access_morgue, access_chemistry, access_virology, access_surgery, access_cmo) if(3) //research - return list(access_research, access_tox, access_tox_storage, access_xenobiology, access_rd) + return list(access_research, access_tox, access_tox_storage, access_robotics, access_xenobiology, access_rd) if(4) //engineering and maintenance - return list(access_maint_tunnels, access_engine, access_engine_equip, access_external_airlocks, access_tech_storage, access_atmospherics, access_construction, access_robotics, access_ce) + return list(access_construction, access_maint_tunnels, access_engine, access_engine_equip, access_external_airlocks, access_tech_storage, access_atmospherics, access_ce) if(5) //command - return list(access_heads, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_all_personal_lockers, access_heads_vault, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_hop, access_captain) + return list(access_heads, access_RC_announce, access_keycard_auth, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_tcomsat, access_gateway, access_all_personal_lockers, access_heads_vault, access_hop, access_captain) if(6) //station general return list(access_kitchen,access_bar, access_hydroponics, access_janitor, access_chapel_office, access_crematorium, access_library, access_theatre, access_lawyer, access_clown, access_mime) if(7) //supply - return list(access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_mining, access_mining_station) + return list(access_mailsorting, access_mining, access_mining_station, access_cargo, access_qm) /proc/get_region_accesses_name(var/code) switch(code) @@ -352,7 +268,7 @@ if(access_court) return "Courtroom" if(access_forensics_lockers) - return "Detective's Office" + return "Forensics" if(access_medical) return "Medical" if(access_genetics) @@ -360,13 +276,13 @@ if(access_morgue) return "Morgue" if(access_tox) - return "Research Lab" + return "R&D Lab" if(access_tox_storage) - return "Toxins Storage" + return "Toxins Lab" if(access_chemistry) return "Chemistry Lab" if(access_rd) - return "RD Private" + return "Research Director" if(access_bar) return "Bar" if(access_janitor) @@ -374,7 +290,7 @@ if(access_engine) return "Engineering" if(access_engine_equip) - return "APCs" + return "Power Equipment" if(access_maint_tunnels) return "Maintenance" if(access_external_airlocks) @@ -392,7 +308,7 @@ if(access_heads) return "Bridge" if(access_captain) - return "Captain Private" + return "Captain" if(access_all_personal_lockers) return "Personal Lockers" if(access_chapel_office) @@ -420,9 +336,9 @@ if(access_virology) return "Virology" if(access_cmo) - return "CMO Private" + return "Chief Medical Officer" if(access_qm) - return "Quartermaster's Office" + return "Quartermaster" /* if(access_clown) return "HONK! Access" if(access_mime) @@ -440,7 +356,7 @@ if(access_mining_office) return "Mining Office" if(access_mailsorting) - return "Delivery Office" + return "Cargo Office" if(access_mint) return "Mint" if(access_mint_vault) @@ -448,15 +364,15 @@ if(access_heads_vault) return "Main Vault" if(access_mining_station) - return "Mining Station EVA" + return "Mining EVA" if(access_xenobiology) return "Xenobiology Lab" if(access_hop) - return "HoP Private" + return "Head of Personnel" if(access_hos) - return "HoS Private" + return "Head of Security" if(access_ce) - return "CE Private" + return "Chief Engineer" if(access_RC_announce) return "RC Announcements" if(access_keycard_auth) @@ -492,8 +408,8 @@ /proc/get_all_jobs() return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Chef", "Botanist", "Quartermaster", "Cargo Technician", "Shaft Miner", /*"Clown", "Mime", */"Janitor", "Librarian", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", - "Atmospheric Technician", "Roboticist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", - "Research Director", "Scientist", "Head of Security", "Warden", "Detective", "Security Officer") + "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", + "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer") /proc/get_all_centcom_jobs() return list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer","BlackOps Commander","Supreme Commander") diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index b5b6f03970..3028502420 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -7,13 +7,17 @@ spawn_positions = -1 supervisors = "absolutely everyone" selection_color = "#dddddd" + access = list() //See /datum/job/assistant/get_access() + minimal_access = list() //See /datum/job/assistant/get_access() - equip(var/mob/living/carbon/human/H) - if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) - if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - return 1 +/datum/job/assistant/equip(var/mob/living/carbon/human/H) + if(!H) return 0 + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + return 1 + +/datum/job/assistant/get_access() + if(config.assistant_maint) + return list(access_maint_tunnels) + else + return list() \ No newline at end of file diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 8ca6a5e49a..09bfdd280d 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -9,6 +9,8 @@ selection_color = "#ccccff" idtype = /obj/item/weapon/card/id/gold req_admin_notify = 1 + access = list() //See get_access() + minimal_access = list() //See get_access() equip(var/mob/living/carbon/human/H) @@ -28,15 +30,18 @@ H.equip_to_slot_or_del(new /obj/item/clothing/head/caphat(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/id_kit(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_r_hand) else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/id_kit(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 world << "[H.real_name] is the captain!" return 1 + get_access() + return get_all_accesses() + /datum/job/hop @@ -50,6 +55,18 @@ selection_color = "#ddddff" idtype = /obj/item/weapon/card/id/silver req_admin_notify = 1 + access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, + access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads, + access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, + access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, + access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, + access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway) + minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, + access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads, + access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, + access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, + access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, + access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway) equip(var/mob/living/carbon/human/H) @@ -64,7 +81,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hop(H), slot_belt) if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/id_kit(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_r_hand) else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/id_kit(H.back), slot_in_backpack) - return 1 + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) + return 1 \ No newline at end of file diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index fc840b1871..36d240dbd0 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -8,6 +8,8 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_bar) + minimal_access = list(access_bar) equip(var/mob/living/carbon/human/H) @@ -48,6 +50,8 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_kitchen, access_morgue) + minimal_access = list(access_kitchen, access_morgue) equip(var/mob/living/carbon/human/H) @@ -74,6 +78,8 @@ spawn_positions = 2 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_hydroponics, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. + minimal_access = list(access_hydroponics, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. equip(var/mob/living/carbon/human/H) @@ -102,15 +108,17 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station) + minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station) equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/qm(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo(H), slot_ears) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargo(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/quartermaster(H), slot_belt) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) +// H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand) if(H.backbag == 1) @@ -130,6 +138,8 @@ spawn_positions = 2 supervisors = "the quartermaster and the head of personnel" selection_color = "#dddddd" + access = list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting) + minimal_access = list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting) equip(var/mob/living/carbon/human/H) @@ -138,7 +148,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargotech(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/cargo(H), slot_belt) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) +// H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) else @@ -156,11 +166,13 @@ spawn_positions = 3 supervisors = "the quartermaster and the head of personnel" selection_color = "#dddddd" + access = list(access_mining, access_mint, access_mining_station, access_mailsorting) + minimal_access = list(access_mining, access_mint, access_mining_station, access_mailsorting) equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_mine (H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo (H), slot_ears) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back) @@ -168,15 +180,15 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/miner(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/device/pda/shaftminer(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) +// H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) H.equip_to_slot_or_del(new /obj/item/weapon/crowbar(H), slot_l_hand) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/satchel(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/bag/ore(H), slot_l_store) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/crowbar(H), slot_in_backpack) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/satchel(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/bag/ore(H), slot_in_backpack) return 1 @@ -192,6 +204,8 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_clown, access_theatre) + minimal_access = list(access_clown, access_theatre) equip(var/mob/living/carbon/human/H) @@ -206,7 +220,8 @@ H.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(H), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/stamp/clown(H), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/toy/crayon/rainbow(H), slot_in_backpack) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/crayonbox(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/fancy/crayons(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/toy/waterflower(H), slot_in_backpack) H.mutations.Add(CLUMSY) return 1 @@ -221,6 +236,8 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_mime, access_theatre) + minimal_access = list(access_mime, access_theatre) equip(var/mob/living/carbon/human/H) @@ -260,6 +277,8 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_janitor, access_maint_tunnels) + minimal_access = list(access_janitor, access_maint_tunnels) equip(var/mob/living/carbon/human/H) @@ -271,7 +290,7 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - return 1 + H.equip_to_slot_or_del(new /obj/item/key(H), slot_l_store) return 1 @@ -285,6 +304,8 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_library) + minimal_access = list(access_library) equip(var/mob/living/carbon/human/H) @@ -311,6 +332,8 @@ var/global/lawyer = 0//Checks for another lawyer spawn_positions = 2 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_lawyer, access_court, access_sec_doors) + minimal_access = list(access_lawyer, access_court, access_sec_doors) equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index d81e06eee3..859eaffe95 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -8,6 +8,8 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_morgue, access_chapel_office, access_crematorium) + minimal_access = list(access_morgue, access_chapel_office, access_crematorium) equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 3b76e5c225..f89ba4e217 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -9,6 +9,14 @@ selection_color = "#ffeeaa" idtype = /obj/item/weapon/card/id/silver req_admin_notify = 1 + access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, + access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, + access_heads, access_construction, access_sec_doors, + access_ce, access_RC_announce, access_keycard_auth, access_tcomsat) + minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, + access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, + access_heads, access_construction, access_sec_doors, + access_ce, access_RC_announce, access_keycard_auth, access_tcomsat) equip(var/mob/living/carbon/human/H) @@ -41,6 +49,9 @@ spawn_positions = 5 supervisors = "the chief engineer" selection_color = "#fff5cc" + access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction) + minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction) + equip(var/mob/living/carbon/human/H) @@ -73,6 +84,8 @@ spawn_positions = 2 supervisors = "the chief engineer" selection_color = "#fff5cc" + access = list(access_atmospherics, access_maint_tunnels, access_emergency_storage, access_construction) + minimal_access = list(access_atmospherics, access_maint_tunnels, access_emergency_storage, access_construction) equip(var/mob/living/carbon/human/H) @@ -90,35 +103,4 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) - return 1 - - - -/datum/job/roboticist - title = "Roboticist" - flag = ROBOTICIST - department_flag = ENGSEC - faction = "Station" - total_positions = 2 - spawn_positions = 2 - supervisors = "the chief engineer and research director" - selection_color = "#fff5cc" - - equip(var/mob/living/carbon/human/H) - if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_rob(H), slot_ears) - switch(H.backbag) - if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) - if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) - if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/device/pda/roboticist(H), slot_belt) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/toolbox/mechanical(H), slot_l_hand) - if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 \ No newline at end of file diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index e3995483ff..6cb0e2366a 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -3,6 +3,10 @@ //The name of the job var/title = "NOPE" + //Job access. The use of minimal_access or access is determined by a config setting: config.jobs_have_minimal_access + var/minimal_access = list() //Useful for servers which prefer to only have access given to the places a job absolutely needs (Larger server population) + var/access = list() //Useful for servers which either have fewer players, so each person needs to fill more than one role, or servers which like to give more access, so players can't hide forever in their super secure departments (I'm looking at you, chemistry!) + //Bitflags for the job var/flag = 0 var/department_flag = 0 @@ -36,3 +40,12 @@ /datum/job/proc/equip(var/mob/living/carbon/human/H) return 1 + +/datum/job/proc/get_access() + if(!config) //Needed for robots. + return src.minimal_access + + if(config.jobs_have_minimal_access) + return src.minimal_access + else + return src.access diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index b4cad5555b..406c9aca2c 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -9,6 +9,12 @@ selection_color = "#ffddf0" idtype = /obj/item/weapon/card/id/silver req_admin_notify = 1 + access = list(access_medical, access_morgue, access_genetics, access_heads, + access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, + access_keycard_auth, access_sec_doors) + minimal_access = list(access_medical, access_morgue, access_genetics, access_heads, + access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, + access_keycard_auth, access_sec_doors) equip(var/mob/living/carbon/human/H) @@ -41,8 +47,10 @@ spawn_positions = 3 supervisors = "the chief medical officer" selection_color = "#ffeef0" - alt_titles = list("Surgeon", "Emergency Physician", "Virologist") + access = list(access_medical, access_morgue, access_surgery) + minimal_access = list(access_medical, access_morgue, access_surgery) + alt_titles = list("Surgeon", "Emergency Physician", "Virologist") equip(var/mob/living/carbon/human/H) if(!H) return 0 @@ -82,7 +90,7 @@ -//Chemist is a medical job damnit //YEAH FUCK YOU SCIENCE -Pete +//Chemist is a medical job damnit //YEAH FUCK YOU SCIENCE -Pete //Guys, behave -Erro /datum/job/chemist title = "Chemist" flag = CHEMIST @@ -92,6 +100,8 @@ spawn_positions = 2 supervisors = "the chief medical officer" selection_color = "#ffeef0" + access = list(access_medical, access_chemistry) + minimal_access = list(access_medical, access_chemistry) equip(var/mob/living/carbon/human/H) @@ -118,6 +128,8 @@ spawn_positions = 2 supervisors = "the chief medical officer and research director" selection_color = "#ffeef0" + access = list(access_medical, access_morgue, access_genetics, access_research) + minimal_access = list(access_medical, access_morgue, access_genetics, access_research) equip(var/mob/living/carbon/human/H) @@ -145,6 +157,8 @@ spawn_positions = 1 supervisors = "the chief medical officer" selection_color = "#ffeef0" + access = list(access_medical, access_virology) + minimal_access = list(access_medical, access_virology) equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index c9292feedb..573c1a9e8d 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -9,6 +9,14 @@ selection_color = "#ffddff" idtype = /obj/item/weapon/card/id/silver req_admin_notify = 1 + access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, + access_tox_storage, access_teleporter, access_sec_doors, + access_research, access_robotics, access_xenobiology, access_ai_upload, + access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway) + minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, + access_tox_storage, access_teleporter, access_sec_doors, + access_research, access_robotics, access_xenobiology, access_ai_upload, + access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway) equip(var/mob/living/carbon/human/H) @@ -36,8 +44,10 @@ spawn_positions = 3 supervisors = "the research director" selection_color = "#ffeeff" - alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist") + access = list(access_tox, access_tox_storage, access_research, access_xenobiology) + minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology) + alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist") equip(var/mob/living/carbon/human/H) if(!H) return 0 @@ -46,6 +56,37 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/toxins(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(H), slot_wear_suit) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + return 1 + + + +/datum/job/roboticist + title = "Roboticist" + flag = ROBOTICIST + department_flag = MEDSCI + faction = "Station" + total_positions = 2 + spawn_positions = 1 + supervisors = "research director" + selection_color = "#ffeeff" + access = list(access_robotics, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access. + minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access. + + equip(var/mob/living/carbon/human/H) + if(!H) return 0 + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/roboticist(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat(H), slot_wear_suit) +// H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/toolbox/mechanical(H), slot_l_hand) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) else diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 2340459ab4..0a3e4d695a 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -9,6 +9,14 @@ selection_color = "#ffdddd" idtype = /obj/item/weapon/card/id/silver req_admin_notify = 1 + access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, + access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, + access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting, + access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway) + minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, + access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, + access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting, + access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway) equip(var/mob/living/carbon/human/H) @@ -47,6 +55,8 @@ spawn_positions = 1 supervisors = "the head of security" selection_color = "#ffeeee" + access = list(access_security, access_sec_doors, access_brig, access_armory, access_court) + minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court) equip(var/mob/living/carbon/human/H) @@ -82,8 +92,10 @@ spawn_positions = 1 supervisors = "the head of security" selection_color = "#ffeeee" - alt_titles = list("Forensic Technician") + access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court) + minimal_access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court) + alt_titles = list("Forensic Technician") equip(var/mob/living/carbon/human/H) if(!H) return 0 @@ -128,6 +140,8 @@ spawn_positions = 5 supervisors = "the head of security" selection_color = "#ffeeee" + access = list(access_security, access_sec_doors, access_brig, access_court) + minimal_access = list(access_security, access_sec_doors, access_brig, access_court) equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 29f2420b50..29fe36dc74 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -367,13 +367,13 @@ var/global/datum/controller/occupations/job_master return else C = new job.idtype(H) + C.access = job.get_access() else C = new /obj/item/weapon/card/id(H) if(C) C.registered_name = H.real_name C.assignment = title C.name = "[C.registered_name]'s ID Card ([C.assignment])" - C.access = get_access(rank) H.equip_to_slot_or_del(C, slot_wear_id) /* if(prob(50)) H.equip_to_slot_or_del(new /obj/item/weapon/pen(H), slot_r_store) @@ -383,7 +383,7 @@ var/global/datum/controller/occupations/job_master if(locate(/obj/item/device/pda,H))//I bet this could just use locate. It can --SkyMarshal var/obj/item/device/pda/pda = locate(/obj/item/device/pda,H) pda.owner = H.real_name - pda.ownjob = H.wear_id.assignment + pda.ownjob = C.assignment pda.name = "PDA-[H.real_name] ([pda.ownjob])" return 1 diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 9994d29a78..5c53d4ce8b 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -175,9 +175,9 @@ user << "\blue The sleeper is already occupied!" return - for(var/mob/living/carbon/metroid/M in range(1,G.affecting)) + for(var/mob/living/carbon/slime/M in range(1,G.affecting)) if(M.Victim == G.affecting) - usr << "[G.affecting.name] will not fit into the sleeper because they have a Metroid latched onto their head." + usr << "[G.affecting.name] will not fit into the sleeper because they have a slime latched onto their head." return visible_message("[user] starts putting [G.affecting.name] into the sleeper.", 3) @@ -230,7 +230,13 @@ del(src) return return - + emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + if(occupant) + go_out() + ..(severity) alter_health(mob/living/M as mob) if (M.health > 0) @@ -267,52 +273,52 @@ proc/inject_inap(mob/living/user as mob) - if(src.occupant) + if(src.occupant && src.occupant.reagents) if(src.occupant.reagents.get_reagent_amount("inaprovaline") + 30 <= 60) src.occupant.reagents.add_reagent("inaprovaline", 30) user << text("Occupant now has [] units of Inaprovaline in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("inaprovaline")) else - user << "No occupant!" + user << "There's no occupant in the sleeper or the subject rejects the chemicals!" return proc/inject_stox(mob/living/user as mob) - if(src.occupant) + if(src.occupant && src.occupant.reagents) if(src.occupant.reagents.get_reagent_amount("stoxin") + 20 <= 40) src.occupant.reagents.add_reagent("stoxin", 20) user << text("Occupant now has [] units of soporifics in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("stoxin")) else - user << "No occupant!" + user << "There's no occupant in the sleeper or the subject rejects the chemicals!" return proc/inject_dermaline(mob/living/user as mob) - if (src.occupant) + if(src.occupant && src.occupant.reagents) if(src.occupant.reagents.get_reagent_amount("dermaline") + 20 <= 40) src.occupant.reagents.add_reagent("dermaline", 20) user << text("Occupant now has [] units of Dermaline in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("dermaline")) else - user << "No occupant!" + user << "There's no occupant in the sleeper or the subject rejects the chemicals!" return proc/inject_bicaridine(mob/living/user as mob) - if(src.occupant) + if(src.occupant && src.occupant.reagents) if(src.occupant.reagents.get_reagent_amount("bicaridine") + 10 <= 20) src.occupant.reagents.add_reagent("bicaridine", 10) user << text("Occupant now has [] units of Bicaridine in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("bicaridine")) else - user << "No occupant!" + user << "There's no occupant in the sleeper or the subject rejects the chemicals!" return proc/inject_dexalin(mob/living/user as mob) - if(src.occupant) + if(src.occupant && src.occupant.reagents) if(src.occupant.reagents.get_reagent_amount("dexalin") + 20 <= 40) src.occupant.reagents.add_reagent("dexalin", 20) user << text("Occupant now has [] units of Dexalin in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("dexalin")) else - user << "No occupant!" + user << "There's no occupant in the sleeper or the subject rejects the chemicals!" return @@ -367,7 +373,7 @@ usr << "\blue The sleeper is already occupied!" return - for(var/mob/living/carbon/metroid/M in range(1,usr)) + for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) usr << "You're too busy getting your life sucked out of you." return diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index b0e5170dca..faac347b33 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -87,6 +87,8 @@ obj/machinery/computer/general_air_control var/datum/radio_frequency/radio_connection attack_hand(mob/user) + if(..(user)) + return user << browse(return_text(),"window=computer") user.set_machine(src) onclose(user, "computer") diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index 8aee956b51..ac7af07435 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -25,6 +25,8 @@ return attack_hand(var/mob/user as mob) + if(..(user)) + return src.add_fingerprint(usr) var/dat = {" @@ -126,28 +128,6 @@ src.updateUsrDialog() - attackby(I as obj, user as mob) - if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - if(do_after(user, 20)) - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) - var/obj/item/weapon/circuitboard/area_atmos/M = new /obj/item/weapon/circuitboard/area_atmos( A ) - for (var/obj/C in src) - C.loc = src.loc - A.circuit = M - A.anchored = 1 - - if (src.stat & BROKEN) - user << "\blue The broken glass falls out." - new /obj/item/weapon/shard( src.loc ) - A.state = 3 - A.icon_state = "3" - else - user << "\blue You disconnect the monitor." - A.state = 4 - A.icon_state = "4" - - del(src) /obj/machinery/computer/area_atmos/area zone = "This computer is working in a wired network limited to this area." diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 09fb8faa2a..939e1c94f3 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -1,3 +1,17 @@ +/obj/machinery/meter + name = "meter" + desc = "It measures something." + icon = 'icons/obj/meter.dmi' + icon_state = "meterX" + var/obj/machinery/atmospherics/pipe/target = null + anchored = 1.0 + power_channel = ENVIRON + var/frequency = 0 + var/id + use_power = 1 + idle_power_usage = 2 + active_power_usage = 4 + /obj/machinery/meter/New() ..() src.target = locate(/obj/machinery/atmospherics/pipe) in loc diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 171552fa48..f929cc0d5e 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -1,5 +1,6 @@ /obj/machinery/portable_atmospherics name = "atmoalter" + use_power = 0 var/datum/gas_mixture/air_contents = new var/obj/machinery/atmospherics/portables_connector/connected_port @@ -105,7 +106,7 @@ user << "\blue Nothing happens." return - else if ((istype(W, /obj/item/device/analyzer) || (istype(W, /obj/item/device/pda))) && get_dist(user, src) <= 1) + else if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1) visible_message("\red [user] has used [W] on \icon[icon]") if(air_contents) var/pressure = air_contents.return_pressure() diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm index 764ee3afd3..00aedd9363 100644 --- a/code/game/machinery/atmoalter/pump.dm +++ b/code/game/machinery/atmoalter/pump.dm @@ -27,6 +27,22 @@ return +/obj/machinery/portable_atmospherics/pump/emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + + if(prob(50/severity)) + on = !on + + if(prob(100/severity)) + direction_out = !direction_out + + target_pressure = rand(0,1300) + update_icon() + + ..(severity) + /obj/machinery/portable_atmospherics/pump/process() ..() if(on) diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index eae5dd9293..6432aa755b 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -10,6 +10,17 @@ volume = 750 +/obj/machinery/portable_atmospherics/scrubber/emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + + if(prob(50/severity)) + on = !on + update_icon() + + ..(severity) + /obj/machinery/portable_atmospherics/scrubber/huge name = "Huge Air Scrubber" icon_state = "scrubber:0" diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 4621e51914..9401ed769c 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -59,10 +59,34 @@ var/global/list/autolathe_recipes_hidden = list( \ ) /obj/machinery/autolathe - var/busy = 0 + name = "\improper Autolathe" + desc = "It produces items using metal and glass." + icon_state = "autolathe" + density = 1 + + var/m_amount = 0.0 var/max_m_amount = 150000.0 + + var/g_amount = 0.0 var/max_g_amount = 75000.0 + var/operating = 0.0 + var/opened = 0.0 + anchored = 1.0 + var/list/L = list() + var/list/LL = list() + var/hacked = 0 + var/disabled = 0 + var/shocked = 0 + var/list/wires = list() + var/hack_wire + var/disable_wire + var/shock_wire + use_power = 1 + idle_power_usage = 10 + active_power_usage = 100 + var/busy = 0 + proc wires_win(mob/user as mob) var/dat as text diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 80d4174fd4..c75cda5dba 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -42,7 +42,7 @@ updateUsrDialog() else if(processing) user << "\red The biogenerator is currently processing." - else if(istype(O, /obj/item/weapon/plantbag)) + else if(istype(O, /obj/item/weapon/storage/bag/plants)) var/i = 0 for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents) i++ diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index af1683acfe..9862f63e2c 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/aibots.dmi' layer = MOB_LAYER luminosity = 3 + use_power = 0 var/obj/item/weapon/card/id/botcard // the ID card that the bot "holds" var/on = 1 var/health = 0 //do not forget to set health for your bot! @@ -88,13 +89,16 @@ else if (istype(W, /obj/item/weapon/card/emag) && emagged < 2) Emag(user) else - switch(W.damtype) - if("fire") - src.health -= W.force * fire_dam_coeff - if("brute") - src.health -= W.force * brute_dam_coeff - ..() - healthcheck() + if(hasvar(W,"force") && hasvar(W,"damtype")) + switch(W.damtype) + if("fire") + src.health -= W.force * fire_dam_coeff + if("brute") + src.health -= W.force * brute_dam_coeff + ..() + healthcheck() + else + ..() /obj/machinery/bot/bullet_act(var/obj/item/projectile/Proj) health -= Proj.damage diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index af3d49e6e4..3e970a580c 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -52,7 +52,8 @@ should_patrol = 1 src.botcard = new /obj/item/weapon/card/id(src) - src.botcard.access = get_access("Janitor") + var/datum/job/janitor/J = new/datum/job/janitor + src.botcard.access = J.get_access() if(radio_controller) radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index b2ddb8aab3..9e67f5df2b 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -7,7 +7,7 @@ density = 1 anchored = 0 // weight = 1.0E7 - req_access = list(access_security) + req_one_access = list(access_security, access_forensics_lockers) health = 100 maxhealth = 100 fire_dam_coeff = 0.7 @@ -78,7 +78,8 @@ src.icon_state = "[lasercolor]ed209[src.on]" spawn(3) src.botcard = new /obj/item/weapon/card/id(src) - src.botcard.access = get_access("Detective") + var/datum/job/detective/J = new/datum/job/detective + src.botcard.access = J.get_access() if(radio_controller) radio_controller.add_object(src, control_freq, filter = RADIO_SECBOT) @@ -194,11 +195,12 @@ Auto Patrol: []"}, user << "Access denied." else ..() - if (!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!src.target)) - src.target = user - if(lasercolor)//To make up for the fact that lasertag bots don't hunt - src.shootAt(user) - src.mode = SECBOT_HUNT + if (!istype(W, /obj/item/weapon/screwdriver) && (!src.target)) + if(hasvar(W,"force") && W.force)//If force is defined and non-zero + src.target = user + if(lasercolor)//To make up for the fact that lasertag bots don't hunt + src.shootAt(user) + src.mode = SECBOT_HUNT /obj/machinery/bot/ed209/Emag(mob/user as mob) ..() @@ -317,29 +319,36 @@ Auto Patrol: []"}, mode = SECBOT_HUNT return - if (!src.target.handcuffed && !src.arrest_type) - playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) - mode = SECBOT_ARREST - visible_message("\red [src] is trying to put handcuffs on [src.target]!") + if(istype(src.target,/mob/living/carbon)) + if (!src.target.handcuffed && !src.arrest_type) + playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) + mode = SECBOT_ARREST + visible_message("\red [src] is trying to put handcuffs on [src.target]!") - spawn(60) - if (get_dist(src, src.target) <= 1) - if (src.target.handcuffed) - return + spawn(60) + if (get_dist(src, src.target) <= 1) + if (src.target.handcuffed) + return - if(istype(src.target,/mob/living/carbon)) - src.target.handcuffed = new /obj/item/weapon/handcuffs(src.target) - target.update_inv_handcuffed() //update handcuff overlays + if(istype(src.target,/mob/living/carbon)) + src.target.handcuffed = new /obj/item/weapon/handcuffs(src.target) + target.update_inv_handcuffed() //update handcuff overlays - mode = SECBOT_IDLE - src.target = null - src.anchored = 0 - src.last_found = world.time - src.frustration = 0 + mode = SECBOT_IDLE + src.target = null + src.anchored = 0 + src.last_found = world.time + src.frustration = 0 - // playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) - // var/arrest_message = pick("Have a secure day!","I AM THE LAW.", "God made tomorrow for the crooks we don't catch today.","You can't outrun a radio.") - // src.speak(arrest_message) + // playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) + // var/arrest_message = pick("Have a secure day!","I AM THE LAW.", "God made tomorrow for the crooks we don't catch today.","You can't outrun a radio.") + // src.speak(arrest_message) + else + mode = SECBOT_IDLE + src.target = null + src.anchored = 0 + src.last_found = world.time + src.frustration = 0 if(SECBOT_ARREST) // arresting if(src.lasercolor) @@ -704,22 +713,17 @@ Auto Patrol: []"}, if(istype(perp:belt, /obj/item/weapon/gun/energy/laser/bluetag)) threatcount += 2 - if (src.check_records) + if(src.check_records) for (var/datum/data/record/E in data_core.general) var/perpname = perp.name - if (perp:wear_id) - var/obj/item/weapon/card/id/id = perp:wear_id - if(istype(perp:wear_id, /obj/item/device/pda)) - var/obj/item/device/pda/pda = perp:wear_id - id = pda.id - if (id) + if(perp.wear_id) + var/obj/item/weapon/card/id/id = perp.wear_id.GetID() + if(id) perpname = id.registered_name - else - var/obj/item/device/pda/pda = perp:wear_id - perpname = pda.owner - if (E.fields["name"] == perpname) + + if(E.fields["name"] == perpname) for (var/datum/data/record/R in data_core.security) - if ((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) + if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) threatcount = 4 break diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index 15886be92d..986728f5c6 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -45,7 +45,7 @@ var/turf/target var/turf/oldtarget var/oldloc = null - req_access = list(access_atmospherics) + req_access = list(access_construction) var/path[] = new() var/targetdirection diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index a0556aeb78..df7b8b0ff8 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -6,17 +6,17 @@ /obj/machinery/bot/medbot name = "Medibot" desc = "A little medical robot. He looks somewhat underwhelmed." - icon = 'aibots.dmi' + icon = 'icons/obj/aibots.dmi' icon_state = "medibot0" layer = 5.0 - density = 1 + density = 0 anchored = 0 health = 20 maxhealth = 20 req_access =list(access_medical) var/stunned = 0 //It can be stunned by tasers. Delicate circuits. - var/obj/machinery/camera/cam = null - var/list/botcard_access = list(access_medical, access_morgue, access_genetics, access_robotics) +//var/emagged = 0 + var/list/botcard_access = list(access_medical) var/obj/item/weapon/reagent_containers/glass/reagent_glass = null //Can be set to draw from this for reagents. var/skin = null //Set to "tox", "ointment" or "o2" for the other two firstaid kits. var/frustration = 0 @@ -27,29 +27,30 @@ var/last_found = 0 var/last_newpatient_speak = 0 //Don't spam the "HEY I'M COMING" messages var/currently_healing = 0 - var/injection_amount = 5 //How much reagent do we inject at a time? - var/heal_threshold = 15 //Start healing when they have this much damage in a category - var/use_beaker = 1 //Use reagents in beaker instead of default treatment agents. + var/injection_amount = 15 //How much reagent do we inject at a time? + var/heal_threshold = 10 //Start healing when they have this much damage in a category + var/use_beaker = 0 //Use reagents in beaker instead of default treatment agents. //Setting which reagents to use to treat what by default. By id. - var/treatment_brute = "bicaridine" - var/treatment_oxy = "dexalin" - var/treatment_fire = "kelotane" - var/treatment_tox = "anti_toxin" + var/treatment_brute = "tricordrazine" + var/treatment_oxy = "tricordrazine" + var/treatment_fire = "tricordrazine" + var/treatment_tox = "tricordrazine" var/treatment_virus = "spaceacillin" - var/reagent_id = "inaprovaline" var/shut_up = 0 //self explanatory :) - var/always_inject = 0 /obj/machinery/bot/medbot/mysterious name = "Mysterious Medibot" desc = "International Medibot of mystery." skin = "bezerk" - reagent_id = "dexalinp" + treatment_oxy = "dexalinp" + treatment_brute = "bicaridine" + treatment_fire = "kelotane" + treatment_tox = "anti_toxin" /obj/item/weapon/firstaid_arm_assembly name = "first aid/robot arm assembly" desc = "A first aid kit with a robot arm permanently grafted to it." - icon = 'aibots.dmi' + icon = 'icons/obj/aibots.dmi' icon_state = "firstaid_arm" var/build_step = 0 var/created_name = "Medibot" //To preserve the name if it's a unique medbot I guess @@ -60,7 +61,7 @@ ..() spawn(5) if(src.skin) - src.overlays += image('aibots.dmi', "kit_skin_[src.skin]") + src.overlays += image('icons/obj/aibots.dmi', "kit_skin_[src.skin]") /obj/machinery/bot/medbot/New() @@ -69,16 +70,14 @@ spawn(4) if(src.skin) - src.overlays += image('aibots.dmi', "medskin_[src.skin]") + src.overlays += image('icons/obj/aibots.dmi', "medskin_[src.skin]") src.botcard = new /obj/item/weapon/card/id(src) if(isnull(src.botcard_access) || (src.botcard_access.len < 1)) - src.botcard.access = get_access("Medical Doctor") + var/datum/job/doctor/J = new/datum/job/doctor + src.botcard.access = J.get_access() else src.botcard.access = src.botcard_access - src.cam = new /obj/machinery/camera(src) - src.cam.c_tag = src.name - src.cam.network = "Medbay" /obj/machinery/bot/medbot/turn_on() . = ..() @@ -106,6 +105,7 @@ var/dat dat += "Automatic Medical Unit v1.0
" dat += "Status: [src.on ? "On" : "Off"]
" + dat += "Maintenance panel panel is [src.open ? "opened" : "closed"]
" dat += "Beaker: " if (src.reagent_glass) dat += "Loaded \[[src.reagent_glass.reagents.total_volume]/[src.reagent_glass.reagents.maximum_volume]\]" @@ -130,9 +130,6 @@ dat += "Reagent Source: " dat += "[src.use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
" - dat += "Inject: " - dat += "[src.always_inject ? "Always" : "If loaded chemical is known to help"]
" - dat += "The speaker switch is [src.shut_up ? "off" : "on"]. Toggle" user << browse("
" - else - priority_text = "No priority alerts detected.
" + if(priority_alarms.len) + for(var/zone in priority_alarms) + priority_text += "[zone] X
" + else + priority_text = "No priority alerts detected.
" - if(minor_alarms.len) - for(var/zone in minor_alarms) - minor_text += "[zone] X
" - else - minor_text = "No minor alerts detected.
" + if(minor_alarms.len) + for(var/zone in minor_alarms) + minor_text += "[zone] X
" + else + minor_text = "No minor alerts detected.
" - var/output = {"[name]
+ var/output = {"[name]
Priority Alerts:
[priority_text]
@@ -85,46 +91,23 @@ [minor_text]
"} - return output + return output - Topic(href, href_list) - if(..()) - return - - if(href_list["priority_clear"]) - var/removing_zone = href_list["priority_clear"] - for(var/zone in priority_alarms) - if(ckey(zone) == removing_zone) - priority_alarms -= zone - - if(href_list["minor_clear"]) - var/removing_zone = href_list["minor_clear"] - for(var/zone in minor_alarms) - if(ckey(zone) == removing_zone) - minor_alarms -= zone - update_icon() +/obj/machinery/computer/atmos_alert/Topic(href, href_list) + if(..()) return - attackby(I as obj, user as mob) - if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - if(do_after(user, 20)) - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) - var/obj/item/weapon/circuitboard/atmos_alert/M = new /obj/item/weapon/circuitboard/atmos_alert( A ) - for (var/obj/C in src) - C.loc = src.loc - A.circuit = M - A.anchored = 1 + if(href_list["priority_clear"]) + var/removing_zone = href_list["priority_clear"] + for(var/zone in priority_alarms) + if(ckey(zone) == removing_zone) + priority_alarms -= zone - if (src.stat & BROKEN) - user << "\blue The broken glass falls out." - new /obj/item/weapon/shard( src.loc ) - A.state = 3 - A.icon_state = "3" - else - user << "\blue You disconnect the monitor." - A.state = 4 - A.icon_state = "4" - - del(src) + if(href_list["minor_clear"]) + var/removing_zone = href_list["minor_clear"] + for(var/zone in minor_alarms) + if(ckey(zone) == removing_zone) + minor_alarms -= zone + update_icon() + return diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 0a34785be2..c1703891b9 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -88,6 +88,12 @@ density = 0 circuit = null +/obj/machinery/computer/security/telescreen/update_icon() + icon_state = initial(icon_state) + if(stat & BROKEN) + icon_state += "b" + return + /obj/machinery/computer/security/telescreen/entertainment name = "entertainment monitor" desc = "Damn, they better have /tg/thechannel on these things." diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index c0171f2277..773d4897c7 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -235,7 +235,17 @@ if(temp_t) t1 = temp_t else - modify.access = ( istype(src,/obj/machinery/computer/card/centcom) ? get_centcom_access(t1) : get_access(t1) ) + var/datum/job/jobdatum + for(var/jobtype in typesof(/datum/job)) + var/datum/job/J = new jobtype + if(ckey(J.title) == ckey(t1)) + jobdatum = J + break + if(!jobdatum) + usr << "\red No log exists for this job." + return + + modify.access = ( istype(src,/obj/machinery/computer/card/centcom) ? get_centcom_access(t1) : jobdatum.get_access() ) if (modify) modify.assignment = t1 if ("reg") diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 0644c656b1..c41af18366 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -31,7 +31,7 @@ var/delete = 0 var/injectorready = 0 //Quick fix for issue 286 (screwdriver the screen twice to restore injector) -Pete var/temphtml = null - var/obj/machinery/dna_scanner/connected = null + var/obj/machinery/dna_scannernew/connected = null var/obj/item/weapon/disk/data/diskette = null anchored = 1.0 use_power = 1 @@ -464,15 +464,14 @@ break return selected_record -/obj/machinery/computer/cloning/power_change() +/obj/machinery/computer/cloning/update_icon() if(stat & BROKEN) icon_state = "commb" else - if( powered() ) + if(stat & NOPOWER) + src.icon_state = "c_unpowered" + stat |= NOPOWER + else icon_state = initial(icon_state) stat &= ~NOPOWER - else - spawn(rand(0, 15)) - src.icon_state = "c_unpowered" - stat |= NOPOWER \ No newline at end of file diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 40dfa896c1..880d2b565a 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -36,9 +36,9 @@ /obj/machinery/computer/communications/process() - ..() - if(state != STATE_STATUSDISPLAY) - src.updateDialog() + if(..()) + if(state != STATE_STATUSDISPLAY) + src.updateDialog() /obj/machinery/computer/communications/Topic(href, href_list) @@ -455,10 +455,6 @@ user << "The emergency shuttle is already on its way." return - if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction" || ticker.mode.name == "sandbox") - //New version pretends to call the shuttle but cause the shuttle to return after a random duration. - emergency_shuttle.fake_recall = rand(300,500) - if(ticker.mode.name == "blob") user << "Under directive 7-10, [station_name()] is quarantined until further notice." return diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 8bdc0729f0..ae0dc3c5c3 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -3,131 +3,122 @@ icon = 'icons/obj/computer.dmi' density = 1 anchored = 1.0 - var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassemble + use_power = 1 + idle_power_usage = 300 + active_power_usage = 300 + var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassembly + var/processing = 0 + +/obj/machinery/computer/New() + ..() + if(ticker) + initialize() - New() - ..() - spawn(2) - power_change() +/obj/machinery/computer/initialize() + power_change() + +/obj/machinery/computer/process() + if(stat & (NOPOWER|BROKEN)) + return 0 + return 1 + +/obj/machinery/computer/meteorhit(var/obj/O as obj) + for(var/x in verbs) + verbs -= x + set_broken() + var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread() + smoke.set_up(5, 0, src) + smoke.start() + return - meteorhit(var/obj/O as obj) +/obj/machinery/computer/emp_act(severity) + if(prob(20/severity)) set_broken() + ..() + + +/obj/machinery/computer/ex_act(severity) + switch(severity) + if(1.0) + del(src) + return + if(2.0) + if (prob(25)) + del(src) + return + if (prob(50)) + for(var/x in verbs) + verbs -= x + set_broken() + if(3.0) + if (prob(25)) + for(var/x in verbs) + verbs -= x + set_broken() + else + return + +/obj/machinery/computer/bullet_act(var/obj/item/projectile/Proj) + if(prob(Proj.damage)) + set_broken() + ..() + + +/obj/machinery/computer/blob_act() + if (prob(75)) for(var/x in verbs) verbs -= x set_broken() - var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread() - smoke.set_up(5, 0, src) - smoke.start() - return + density = 0 - - emp_act(severity) - if(prob(20/severity)) set_broken() - ..() - - - ex_act(severity) - switch(severity) - if(1.0) - del(src) - return - if(2.0) - if (prob(25)) - del(src) - return - if (prob(50)) - for(var/x in verbs) - verbs -= x - set_broken() - if(3.0) - if (prob(25)) - for(var/x in verbs) - verbs -= x - set_broken() - else - return - - bullet_act(var/obj/item/projectile/Proj) - if(prob(Proj.damage)) - set_broken() - ..() - - - blob_act() - if (prob(75)) - for(var/x in verbs) - verbs -= x - set_broken() - density = 0 - - - power_change() - if(!istype(src,/obj/machinery/computer/security/telescreen)) - if(stat & BROKEN) - icon_state = initial(icon_state) - icon_state += "b" - if (istype(src,/obj/machinery/computer/aifixer)) - overlays = null - - else if(powered()) - icon_state = initial(icon_state) - stat &= ~NOPOWER - if (istype(src,/obj/machinery/computer/aifixer)) - var/obj/machinery/computer/aifixer/O = src - if (O.occupant) - switch (O.occupant.stat) - if (0) - overlays += image('icons/obj/computer.dmi', "ai-fixer-full") - if (2) - overlays += image('icons/obj/computer.dmi', "ai-fixer-404") - else - overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") - else - spawn(rand(0, 15)) - //icon_state = "c_unpowered" - icon_state = initial(icon_state) - icon_state += "0" - stat |= NOPOWER - if (istype(src,/obj/machinery/computer/aifixer)) - overlays = null - - - process() - if(stat & (NOPOWER|BROKEN)) - return - use_power(250) - - - proc/set_broken() - icon_state = initial(icon_state) +/obj/machinery/computer/update_icon() + ..() + icon_state = initial(icon_state) + // Broken + if(stat & BROKEN) icon_state += "b" - stat |= BROKEN + + // Powered + else if(stat & NOPOWER) + icon_state = initial(icon_state) + icon_state += "0" - attackby(I as obj, user as mob) - if(istype(I, /obj/item/weapon/screwdriver) && circuit) - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - if(do_after(user, 20)) - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) - var/obj/item/weapon/circuitboard/M = new circuit( A ) - A.circuit = M - A.anchored = 1 - for (var/obj/C in src) - C.loc = src.loc - if (src.stat & BROKEN) - user << "\blue The broken glass falls out." - new /obj/item/weapon/shard( src.loc ) - A.state = 3 - A.icon_state = "3" - else - user << "\blue You disconnect the monitor." - A.state = 4 - A.icon_state = "4" - del(src) - else - src.attack_hand(user) - return + +/obj/machinery/computer/power_change() + ..() + update_icon() + + +/obj/machinery/computer/proc/set_broken() + stat |= BROKEN + update_icon() + + +/obj/machinery/computer/attackby(I as obj, user as mob) + if(istype(I, /obj/item/weapon/screwdriver) && circuit) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) + if(do_after(user, 20)) + var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) + var/obj/item/weapon/circuitboard/M = new circuit( A ) + A.circuit = M + A.anchored = 1 + for (var/obj/C in src) + C.loc = src.loc + if (src.stat & BROKEN) + user << "\blue The broken glass falls out." + new /obj/item/weapon/shard( src.loc ) + A.state = 3 + A.icon_state = "3" + else + user << "\blue You disconnect the monitor." + A.state = 4 + A.icon_state = "4" + del(src) + else + src.attack_hand(user) + return diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index a4cbf96dd2..ab3c456535 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -9,110 +9,111 @@ var/list/tracked = list( ) - New() - tracked = list() - ..() +/obj/machinery/computer/crew/New() + tracked = list() + ..() - attack_ai(mob/user) - attack_hand(user) - interact(user) +/obj/machinery/computer/crew/attack_ai(mob/user) + attack_hand(user) + interact(user) - attack_hand(mob/user) - add_fingerprint(user) - if(stat & (BROKEN|NOPOWER)) - return - interact(user) +/obj/machinery/computer/crew/attack_hand(mob/user) + add_fingerprint(user) + if(stat & (BROKEN|NOPOWER)) + return + interact(user) - power_change() - if(stat & BROKEN) - icon_state = "broken" +/obj/machinery/computer/crew/update_icon() + + if(stat & BROKEN) + icon_state = "broken" + else + if(stat & NOPOWER) + src.icon_state = "c_unpowered" + stat |= NOPOWER else - if( powered() ) - icon_state = initial(icon_state) - stat &= ~NOPOWER - else - spawn(rand(0, 15)) - src.icon_state = "c_unpowered" - stat |= NOPOWER + icon_state = initial(icon_state) + stat &= ~NOPOWER - Topic(href, href_list) - if(..()) return - if (src.z > 6) - usr << "\red Unable to establish a connection: \black You're too far away from the station!" - return - if( href_list["close"] ) - usr << browse(null, "window=crewcomp") - usr.unset_machine() - return - if(href_list["update"]) - src.updateDialog() - return +/obj/machinery/computer/crew/Topic(href, href_list) + if(..()) return + if (src.z > 6) + usr << "\red Unable to establish a connection: \black You're too far away from the station!" + return + if( href_list["close"] ) + usr << browse(null, "window=crewcomp") + usr.unset_machine() + return + if(href_list["update"]) + src.updateDialog() + return - interact(mob/user) - if( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) ) - if(!istype(user, /mob/living/silicon)) - user.unset_machine() - user << browse(null, "window=powcomp") - return - user.set_machine(src) - src.scan() - var/t = "Crew Monitoring
" - t += "
Refresh " - t += "Close
" - t += "
| Name | Vitals | Position |
| Name | Vitals | Position |
| [H.wear_id.name] | " - else - log += "||
| Unknown | " + if(H.wear_id) + log += "||
| [H.wear_id.name] | " + else + log += "||
| Unknown | " - switch(C.sensor_mode) - if(1) - log += "[life_status] | Not Available | [life_status] [damage_report] | Not Available | " - if(3) - var/area/player_area = get_area(H) - log += "[life_status] [damage_report] | [player_area.name] ([pos.x], [pos.y]) | " - logs += log - logs = sortList(logs) - for(var/log in logs) - t += log - t += "
Daily Key Reset
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret.
If necessary, change the password to a more secure one." + info = "
Daily Key Reset
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one." info_links = info overlays += "paper_words" break diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index e557cbc212..0a5696ee4c 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -146,7 +146,8 @@ /obj/machinery/computer/pod/process() - ..() + if(!..()) + return if(timing) if(time > 0) time = round(time) - 1 @@ -199,8 +200,14 @@ name = "ProComp Executive IIc" desc = "The Syndicate operate on a tight budget. Operates external airlocks." title = "External Airlock Controls" + req_access = list(access_syndicate) - +/obj/machinery/computer/pod/old/syndicate/attack_hand(var/mob/user as mob) + if(!allowed(user)) + user << "\red Access Denied" + return + else + ..() /obj/machinery/computer/pod/old/swf name = "Magix System IV" diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm index ce441f00d0..b3b017565c 100644 --- a/code/game/machinery/computer/power.dm +++ b/code/game/machinery/computer/power.dm @@ -126,10 +126,6 @@ return -/obj/machinery/power/monitor/process() - if(!(stat & (NOPOWER|BROKEN)) ) - use_power(250) - /obj/machinery/power/monitor/power_change() if(stat & BROKEN) diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index b5265e89d6..c60e2a31c8 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -63,10 +63,8 @@ process() - if(stat & (NOPOWER|BROKEN)) - return - use_power(500) - src.updateDialog() + if(!..()) + src.updateDialog() return diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 318f4fd7fa..deb6e9e8c8 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -549,6 +549,34 @@ What a mess.*/ updateUsrDialog() return +/obj/machinery/computer/secure_data/emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + + for(var/datum/data/record/R in data_core.security) + if(prob(10/severity)) + switch(rand(1,6)) + if(1) + R.fields["name"] = "[pick(pick(first_names_male), pick(first_names_female))] [pick(last_names)]" + if(2) + R.fields["sex"] = pick("Male", "Female") + if(3) + R.fields["age"] = rand(5, 85) + if(4) + R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Parolled", "Released") + if(5) + R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit") + if(6) + R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable") + continue + + else if(prob(1)) + del(R) + continue + + ..(severity) + /obj/machinery/computer/secure_data/detective_computer icon = 'icons/obj/computer.dmi' icon_state = "messyfiles" diff --git a/code/game/machinery/computer/syndicate_shuttle.dm b/code/game/machinery/computer/syndicate_shuttle.dm index a421d2c21a..681fc65fe9 100644 --- a/code/game/machinery/computer/syndicate_shuttle.dm +++ b/code/game/machinery/computer/syndicate_shuttle.dm @@ -5,7 +5,7 @@ name = "syndicate shuttle terminal" icon = 'icons/obj/computer.dmi' icon_state = "syndishuttle" - req_access = list() + req_access = list(access_syndicate) var/area/curr_location var/moving = 0 var/lastMove = 0 @@ -47,7 +47,7 @@ /obj/machinery/computer/syndicate_station/attack_hand(mob/user as mob) if(!allowed(user)) - user << "Access Denied." + user << "\red Access Denied" return user.set_machine(src) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 7790526dd7..e1f1dfa36e 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -35,19 +35,17 @@ switch(state) if(1) if(istype(P, /obj/item/weapon/cable_coil)) - if(P:amount >= 5) + var/obj/item/weapon/cable_coil/C = P + if(C.amount >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) user << "\blue You start to add cables to the frame." if(do_after(user, 20)) - if(!P) - user << "\blue You realize the cable coil no longer exist." - return; - P:amount -= 5 - if(!P:amount) del(P) - user << "\blue You add cables to the frame." - state = 2 - icon_state = "box_1" - else + if(C) + C.amount -= 5 + if(!C.amount) del(C) + user << "\blue You add cables to the frame." + state = 2 + icon_state = "box_1" else if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) user << "\blue You dismantle the frame" diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 6669ad5137..9b433f33f7 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -120,9 +120,9 @@ else if(istype(G, /obj/item/weapon/grab)) if(!ismob(G:affecting)) return - for(var/mob/living/carbon/metroid/M in range(1,G:affecting)) + for(var/mob/living/carbon/slime/M in range(1,G:affecting)) if(M.Victim == G:affecting) - usr << "[G:affecting:name] will not fit into the cryo because they have a Metroid latched onto their head." + usr << "[G:affecting:name] will not fit into the cryo because they have a slime latched onto their head." return var/mob/M = G:affecting if(put_mob(M)) @@ -253,7 +253,7 @@ set name = "Move Inside" set category = "Object" set src in oview(1) - for(var/mob/living/carbon/metroid/M in range(1,usr)) + for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) usr << "You're too busy getting your life sucked out of you." return diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 171608be17..70010a74d5 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -229,6 +229,13 @@ for reference: if (src.health <= 0) src.explode() return + emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + return + if(prob(50/severity)) + locked = !locked + anchored = !anchored + icon_state = "barrier[src.locked]" meteorhit() src.explode() diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 6dfa0da691..c4e9fd0230 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -1,3 +1,36 @@ +/obj/machinery/door_control + name = "remote door-control" + desc = "It controls doors, remotely." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "doorctrl0" + desc = "A remote control-switch for a door." + power_channel = ENVIRON + var/id = null + var/range = 10 + var/normaldoorcontrol = 0 + var/desiredstate = 0 // Zero is closed, 1 is open. + var/specialfunctions = 1 + /* + Bitflag, 1= open + 2= idscan, + 4= bolts + 8= shock + 16= door safties + + */ + + var/exposedwires = 0 + var/wires = 3 + /* + Bitflag, 1=checkID + 2=Network Access + */ + + anchored = 1.0 + use_power = 1 + idle_power_usage = 2 + active_power_usage = 4 + /obj/machinery/door_control/attack_ai(mob/user as mob) if(wires & 2) return src.attack_hand(user) @@ -24,6 +57,10 @@ */ if(istype(W, /obj/item/device/detective_scanner)) return + if(istype(W, /obj/item/weapon/card/emag)) + req_access = list() + req_one_access = list() + playsound(src.loc, "sparks", 100, 1) return src.attack_hand(user) /obj/machinery/door_control/attack_hand(mob/user as mob) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index f6592af522..0fb0293792 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -92,6 +92,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }. normalspeed = 1 var/obj/item/weapon/airlock_electronics/electronics = null var/hasShocked = 0 //Prevents multiple shocks from happening + var/heat_proof = 0 // For glass airlocks /obj/machinery/door/airlock/command name = "Airlock" @@ -216,6 +217,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }. opacity = 0 doortype = 21 glass = 1 + heat_proof = 1 /obj/machinery/door/airlock/glass_mining name = "Maintenance Hatch" @@ -630,8 +632,15 @@ About the new airlock wires panel: return 0 +/obj/machinery/door/airlock/update_heat_protection(var/turf/simulated/source) + if(istype(source)) + if(src.density && (src.opacity || src.heat_proof)) + source.thermal_conductivity = DOOR_HEAT_TRANSFER_COEFFICIENT + else + source.thermal_conductivity = initial(source.thermal_conductivity) + /obj/machinery/door/airlock/update_icon() - if(overlays) overlays = null + if(overlays) overlays.Cut() if(density) if(locked && lights) icon_state = "door_locked" @@ -651,14 +660,14 @@ About the new airlock wires panel: /obj/machinery/door/airlock/animate(animation) switch(animation) if("opening") - if(overlays) overlays = null + if(overlays) overlays.Cut() if(p_open) spawn(2) // The only work around that works. Downside is that the door will be gone for a millisecond. flick("o_door_opening", src) //can not use flick due to BYOND bug updating overlays right before flicking else flick("door_opening", src) if("closing") - if(overlays) overlays = null + if(overlays) overlays.Cut() if(p_open) flick("o_door_closing", src) else @@ -825,7 +834,8 @@ About the new airlock wires panel: sleep(10) //bring up airlock dialog src.aiHacking = 0 - src.attack_ai(user) + if (user) + src.attack_ai(user) /obj/machinery/door/airlock/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) if (src.isElectrified()) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 6a57e7cc5e..2310e85c07 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/item/weapon/airlock_electronics - name = "Airlock Electronics" + name = "airlock electronics" icon = 'icons/obj/doors/door_assembly.dmi' icon_state = "door_electronics" w_class = 2.0 //It should be tiny! -Agouri diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 6e95c932ef..4d634d4589 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -219,7 +219,7 @@ // Adds an icon in case the screen is broken/off, stolen from status_display.dm proc/set_picture(var/state) picture_state = state - overlays = null + overlays.Cut() overlays += image('icons/obj/status_display.dmi', icon_state=picture_state) @@ -227,10 +227,10 @@ // Stolen from status_display proc/update_display(var/line1, var/line2) if(line2 == null) // single line display - overlays = null + overlays.Cut() overlays += texticon(line1, 23, -13) else // dual line display - overlays = null + overlays.Cut() overlays += texticon(line1, 23, -9) overlays += texticon(line2, 23, -17) // return an icon of a time text string (tn) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index c8ad53eb19..33cf295195 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -18,251 +18,275 @@ var/glass = 0 var/normalspeed = 1 - proc/bumpopen(mob/user as mob) - proc/update_nearby_tiles(need_rebuild) - proc/requiresID() return 1 - proc/animate(animation) - proc/open() - proc/close() +/obj/machinery/door/New() + ..() + if(density) + layer = 3.1 //Above most items if closed + explosion_resistance = initial(explosion_resistance) + update_heat_protection(get_turf(src)) + else + layer = 2.7 //Under all objects if opened. 2.7 due to tables being at 2.6 + explosion_resistance = 0 + update_nearby_tiles(need_rebuild=1) + return - New() - ..() - if(density) - layer = 3.1 //Above most items if closed - explosion_resistance = initial(explosion_resistance) - if(opacity) - var/turf/T = get_turf(src) - T.thermal_conductivity = DOOR_HEAT_TRANSFER_COEFFICIENT - else - layer = 2.7 //Under all objects if opened. 2.7 due to tables being at 2.6 - explosion_resistance = 0 - update_nearby_tiles(need_rebuild=1) + +/obj/machinery/door/Del() + density = 0 + update_nearby_tiles() + ..() + return + +//process() + //return + +/obj/machinery/door/Bumped(atom/AM) + if(p_open || operating) return + if(ismob(AM)) + var/mob/M = AM + if(world.time - M.last_bumped <= 10) return //Can bump-open one airlock per second. This is to prevent shock spam. + M.last_bumped = world.time + if(!M.restrained()) + bumpopen(M) return - - Del() - density = 0 - update_nearby_tiles() - ..() - return - - //process() - //return - - Bumped(atom/AM) - if(p_open || operating) return - if(ismob(AM)) - var/mob/M = AM - if(world.time - M.last_bumped <= 10) return //Can bump-open one airlock per second. This is to prevent shock spam. - M.last_bumped = world.time - if(!M.restrained()) - bumpopen(M) - return - - if(istype(AM, /obj/machinery/bot)) - var/obj/machinery/bot/bot = AM - if(src.check_access(bot.botcard)) - if(density) - open() - return - - if(istype(AM, /obj/effect/critter)) - var/obj/effect/critter/critter = AM - if(critter.opensdoors) return - if(src.check_access_list(critter.access_list)) - if(density) - open() - return - - if(istype(AM, /obj/mecha)) - var/obj/mecha/mecha = AM + if(istype(AM, /obj/machinery/bot)) + var/obj/machinery/bot/bot = AM + if(src.check_access(bot.botcard)) if(density) - if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access))) - open() - else - flick("door_deny", src) - return + open() return - - CanPass(atom/movable/mover, turf/target, height=0, air_group=0) - if(air_group) return 0 - if(istype(mover) && mover.checkpass(PASSGLASS)) - return !opacity - return !density - - - bumpopen(mob/user as mob) - if(operating) return - src.add_fingerprint(user) - if(!src.requiresID()) - user = null - + if(istype(AM, /obj/mecha)) + var/obj/mecha/mecha = AM if(density) - if(allowed(user)) open() - else flick("door_deny", src) - return - - meteorhit(obj/M as obj) - src.open() - return - - - attack_ai(mob/user as mob) - return src.attack_hand(user) - - - attack_paw(mob/user as mob) - return src.attack_hand(user) - - - attack_hand(mob/user as mob) - return src.attackby(user, user) - - - attackby(obj/item/I as obj, mob/user as mob) - if(istype(I, /obj/item/device/detective_scanner)) - return - if(src.operating || isrobot(user)) return //borgs can't attack doors open because it conflicts with their AI-like interaction with them. - src.add_fingerprint(user) - if(!src.requiresID()) - user = null - if(src.density && (istype(I, /obj/item/weapon/card/emag)||istype(I, /obj/item/weapon/melee/energy/blade))) - flick("door_spark", src) - sleep(6) - open() - operating = -1 - return 1 - if(src.allowed(user)) - if(src.density) + if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access))) open() else - close() - return - if(src.density) - flick("door_deny", src) - return - - - blob_act() - if(prob(40)) - del(src) - return - - - emp_act(severity) - if(prob(20/severity) && (istype(src,/obj/machinery/door/airlock) || istype(src,/obj/machinery/door/window)) ) - open() - if(prob(40/severity)) - if(secondsElectrified == 0) - secondsElectrified = -1 - spawn(300) - secondsElectrified = 0 - ..() - - - ex_act(severity) - switch(severity) - if(1.0) - del(src) - if(2.0) - if(prob(25)) - del(src) - if(3.0) - if(prob(80)) - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(2, 1, src) - s.start() - return - - - update_icon() - if(density) - icon_state = "door1" - else - icon_state = "door0" - return - - - animate(animation) - switch(animation) - if("opening") - if(p_open) - flick("o_doorc0", src) - else - flick("doorc0", src) - if("closing") - if(p_open) - flick("o_doorc1", src) - else - flick("doorc1", src) - if("deny") flick("door_deny", src) return + return - open() - if(!density) return 1 - if(operating > 0) return - if(!ticker) return 0 - if(!operating) operating = 1 - - animate("opening") - icon_state = "door0" - src.SetOpacity(0) - sleep(10) - src.layer = 2.7 - src.density = 0 - explosion_resistance = 0 - update_icon() - SetOpacity(0) - update_nearby_tiles() - - if(operating) operating = 0 - - if(autoclose && normalspeed) - spawn(150) - autoclose() - if(autoclose && !normalspeed) - spawn(5) - autoclose() - - return 1 +/obj/machinery/door/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) + if(air_group) return 0 + if(istype(mover) && mover.checkpass(PASSGLASS)) + return !opacity + return !density - close() - if(density) return 1 - if(operating) return - operating = 1 +/obj/machinery/door/proc/bumpopen(mob/user as mob) + if(operating) return + src.add_fingerprint(user) + if(!src.requiresID()) + user = null - animate("closing") - src.density = 1 - explosion_resistance = initial(explosion_resistance) - src.layer = 3.1 - sleep(10) - update_icon() - if(visible && !glass) - SetOpacity(1) //caaaaarn! - operating = 0 - update_nearby_tiles() + if(density) + if(allowed(user)) open() + else flick("door_deny", src) + return + +/obj/machinery/door/meteorhit(obj/M as obj) + src.open() + return + + +/obj/machinery/door/attack_ai(mob/user as mob) + return src.attack_hand(user) + + +/obj/machinery/door/attack_paw(mob/user as mob) + return src.attack_hand(user) + + +/obj/machinery/door/attack_hand(mob/user as mob) + return src.attackby(user, user) + + +/obj/machinery/door/attackby(obj/item/I as obj, mob/user as mob) + if(istype(I, /obj/item/device/detective_scanner)) return + if(src.operating || isrobot(user)) return //borgs can't attack doors open because it conflicts with their AI-like interaction with them. + src.add_fingerprint(user) + if(!src.requiresID()) + user = null + if(src.density && (istype(I, /obj/item/weapon/card/emag)||istype(I, /obj/item/weapon/melee/energy/blade))) + flick("door_spark", src) + sleep(6) + open() + operating = -1 + return 1 + if(src.allowed(user)) + if(src.density) + open() + else + close() + return + if(src.density) + flick("door_deny", src) + return - update_nearby_tiles(need_rebuild) - if(!air_master) return 0 +/obj/machinery/door/blob_act() + if(prob(40)) + del(src) + return - var/turf/simulated/source = loc - var/turf/simulated/north = get_step(source,NORTH) - var/turf/simulated/south = get_step(source,SOUTH) - var/turf/simulated/east = get_step(source,EAST) - var/turf/simulated/west = get_step(source,WEST) +/obj/machinery/door/emp_act(severity) + if(prob(20/severity) && (istype(src,/obj/machinery/door/airlock) || istype(src,/obj/machinery/door/window)) ) + open() + if(prob(40/severity)) + if(secondsElectrified == 0) + secondsElectrified = -1 + spawn(300) + secondsElectrified = 0 + ..() + + +/obj/machinery/door/ex_act(severity) + switch(severity) + if(1.0) + del(src) + if(2.0) + if(prob(25)) + del(src) + if(3.0) + if(prob(80)) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(2, 1, src) + s.start() + return + + +/obj/machinery/door/update_icon() + if(density) + icon_state = "door1" + else + icon_state = "door0" + return + + +/obj/machinery/door/proc/animate(animation) + switch(animation) + if("opening") + if(p_open) + flick("o_doorc0", src) + else + flick("doorc0", src) + if("closing") + if(p_open) + flick("o_doorc1", src) + else + flick("doorc1", src) + if("deny") + flick("door_deny", src) + return + + +/obj/machinery/door/proc/open() + if(!density) return 1 + if(operating > 0) return + if(!ticker) return 0 + if(!operating) operating = 1 + + animate("opening") + icon_state = "door0" + src.SetOpacity(0) + sleep(10) + src.layer = 2.7 + src.density = 0 + explosion_resistance = 0 + update_icon() + SetOpacity(0) + update_nearby_tiles() + + if(operating) operating = 0 + + if(autoclose && normalspeed) + spawn(150) + autoclose() + if(autoclose && !normalspeed) + spawn(5) + autoclose() + + return 1 + + +/obj/machinery/door/proc/close() + if(density) return 1 + if(operating) return + operating = 1 + + animate("closing") + src.density = 1 + explosion_resistance = initial(explosion_resistance) + src.layer = 3.1 + sleep(10) + update_icon() + if(visible && !glass) + SetOpacity(1) //caaaaarn! + operating = 0 + update_nearby_tiles() + return + +/obj/machinery/door/proc/requiresID() + return 1 + +/obj/machinery/door/proc/update_nearby_tiles(need_rebuild) + if(!air_master) return 0 + + var/turf/simulated/source = loc + var/turf/simulated/north = get_step(source,NORTH) + var/turf/simulated/south = get_step(source,SOUTH) + var/turf/simulated/east = get_step(source,EAST) + var/turf/simulated/west = get_step(source,WEST) + + update_heat_protection(loc) + + if(need_rebuild) + if(istype(source)) //Rebuild/update nearby group geometry + if(source.parent) + air_master.groups_to_rebuild += source.parent + else + air_master.tiles_to_update += source + if(istype(north)) + if(north.parent) + air_master.groups_to_rebuild += north.parent + else + air_master.tiles_to_update += north + if(istype(south)) + if(south.parent) + air_master.groups_to_rebuild += south.parent + else + air_master.tiles_to_update += south + if(istype(east)) + if(east.parent) + air_master.groups_to_rebuild += east.parent + else + air_master.tiles_to_update += east + if(istype(west)) + if(west.parent) + air_master.groups_to_rebuild += west.parent + else + air_master.tiles_to_update += west + else + if(istype(source)) air_master.tiles_to_update += source + if(istype(north)) air_master.tiles_to_update += north + if(istype(south)) air_master.tiles_to_update += south + if(istype(east)) air_master.tiles_to_update += east + if(istype(west)) air_master.tiles_to_update += west + return 1 + +/obj/machinery/door/proc/update_heat_protection(var/turf/simulated/source) + if(istype(source)) if(src.density && src.opacity) source.thermal_conductivity = DOOR_HEAT_TRANSFER_COEFFICIENT else source.thermal_conductivity = initial(source.thermal_conductivity) - //not sure what the equivalent in zas is + + //skytodo /*if(need_rebuild) if(istype(source)) //Rebuild/update nearby group geometry if(source.parent) @@ -298,7 +322,6 @@ return 1 - /obj/machinery/door/proc/autoclose() var/obj/machinery/door/airlock/A = src if(!A.density && !A.operating && !A.locked && !A.welded && A.autoclose) @@ -306,33 +329,4 @@ return /obj/machinery/door/morgue - icon = 'icons/obj/doors/doormorgue.dmi' - -/* -/obj/machinery/door/airlock/proc/ion_act() - if(src.z == 1 && src.density) - if(length(req_access) > 0 && !(12 in req_access)) - if(prob(4)) - world << "\red Airlock emagged in [src.loc.loc]" - src.operating = -1 - flick("door_spark", src) - sleep(6) - open() - else - if(prob(8)) - world << "\red non vital Airlock emagged in [src.loc.loc]" - src.operating = -1 - flick("door_spark", src) - sleep(6) - open() - return - -/obj/machinery/door/firedoor/proc/ion_act() - if(src.z == 1) - if(prob(15)) - if(density) - open() - else - close() - return -*/ \ No newline at end of file + icon = 'icons/obj/doors/doormorgue.dmi' \ No newline at end of file diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index b755f16d0a..2fdb122e9a 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -209,7 +209,7 @@ update_icon() - overlays = null + overlays.Cut() if(density) icon_state = "door_closed" if(blocked) @@ -221,4 +221,50 @@ return -/obj/machinery/door/firedoor/border_only \ No newline at end of file + +/obj/machinery/door/firedoor/border_only + icon = 'icons/obj/doors/edge_Doorfire.dmi' + glass = 1 //There is a glass window so you can see through the door + //This is needed due to BYOND limitations in controlling visibility + + CanPass(atom/movable/mover, turf/target, height=0, air_group=0) + if(istype(mover) && mover.checkpass(PASSGLASS)) + return 1 + if(get_dir(loc, target) == dir) //Make sure looking at appropriate border + if(air_group) return 0 + return !density + else + return 1 + + CheckExit(atom/movable/mover as mob|obj, turf/target as turf) + if(istype(mover) && mover.checkpass(PASSGLASS)) + return 1 + if(get_dir(loc, target) == dir) + return !density + else + return 1 + + + update_nearby_tiles(need_rebuild) + if(!air_master) return 0 + + var/turf/simulated/source = loc + var/turf/simulated/destination = get_step(source,dir) + + update_heat_protection(loc) + + if(need_rebuild) + if(istype(source)) //Rebuild/update nearby group geometry + if(source.parent) + air_master.groups_to_rebuild += source.parent + else + air_master.tiles_to_update += source + if(istype(destination)) + if(destination.parent) + air_master.groups_to_rebuild += destination.parent + else + air_master.tiles_to_update += destination + else + if(istype(source)) air_master.tiles_to_update += source + if(istype(destination)) air_master.tiles_to_update += destination + return 1 diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 7905fc559d..55aef446ea 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -6,6 +6,7 @@ var/base_state = "left" var/health = 150.0 //If you change this, consiter changing ../door/window/brigdoor/ health at the bottom of this .dm file visible = 0.0 + use_power = 0 flags = ON_BORDER opacity = 0 var/obj/item/weapon/airlock_electronics/electronics = null @@ -157,7 +158,7 @@ return src.attack_hand(user) /obj/machinery/door/window/attack_paw(mob/user as mob) - if(istype(user, /mob/living/carbon/alien/humanoid) || istype(user, /mob/living/carbon/metroid/adult)) + if(istype(user, /mob/living/carbon/alien/humanoid) || istype(user, /mob/living/carbon/slime/adult)) if(src.operating) return src.health = max(0, src.health - 25) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index ac2ec0da46..9de6b2c6aa 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -88,6 +88,14 @@ O.eye_stat += rand(0, 2) +/obj/machinery/flasher/emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + if(prob(75/severity)) + flash() + ..(severity) + /obj/machinery/flasher/portable/HasProximity(atom/movable/AM as mob|obj) if ((src.disable) || (src.last_flash && world.time < src.last_flash + 150)) return @@ -104,7 +112,7 @@ if (!src.anchored) user.show_message(text("\red [src] can now be moved.")) - src.overlays = null + src.overlays.Cut() else if (src.anchored) user.show_message(text("\red [src] is now secured.")) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 90b628d93e..5442248986 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -1,3 +1,10 @@ +/* Holograms! + * Contains: + * Holopad + * Hologram + * Other stuff + */ + /* Revised. Original based on space ninja hologram code. Which is also mine. /N How it works: @@ -12,11 +19,23 @@ Possible to do for anyone motivated enough: Itegrate EMP effect to disable the unit. */ + +/* + * Holopad + */ + // HOLOPAD MODE // 0 = RANGE BASED // 1 = AREA BASED var/const/HOLOPAD_MODE = 0 +/obj/machinery/hologram/holopad + name = "\improper AI holopad" + desc = "It's a floor-mounted device for projecting holographic images. It is activated remotely." + icon_state = "holopad0" + var/mob/living/silicon/ai/master//Which AI, if any, is controlling the object? Only one AI may control a hologram at any time. + var/last_request = 0 //to prevent request spam. ~Carn + var/holo_range = 5 // Change to change how far the AI can move away from the holopad before deactivating. /obj/machinery/hologram/holopad/attack_hand(var/mob/living/carbon/human/user) //Carn: Hologram requests. if(!istype(user)) @@ -120,6 +139,17 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ return 1 +/* + * Hologram + */ + +/obj/machinery/hologram + anchored = 1 + use_power = 1 + idle_power_usage = 5 + active_power_usage = 100 + var/obj/effect/overlay/hologram//The projection itself. If there is one, the instrument is on, off otherwise. + /obj/machinery/hologram/power_change() if (powered()) stat &= ~NOPOWER @@ -171,4 +201,13 @@ Holographic project of everything else. world << "Your icon should appear now." return -*/ \ No newline at end of file +*/ + +/* + * Other Stuff: Is this even used? + */ +/obj/machinery/hologram/projector + name = "hologram projector" + desc = "It makes a hologram appear...with magnets or something..." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "hologram0" \ No newline at end of file diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index d1a5a3ff6c..aec6290da7 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -151,7 +151,7 @@ obj/machinery/hydroponics/process() obj/machinery/hydroponics/proc/updateicon() //Refreshes the icon and sets the luminosity - overlays = null + overlays.Cut() if(planted) if(dead) overlays += image('icons/obj/hydroponics.dmi', icon_state="[myseed.species]-dead") @@ -729,15 +729,13 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) del(O) updateicon() - else if (istype(O, /obj/item/weapon/plantbag)) + else if (istype(O, /obj/item/weapon/storage/bag/plants)) attack_hand(user) - var/obj/item/weapon/plantbag/S = O + var/obj/item/weapon/storage/bag/plants/S = O for (var/obj/item/weapon/reagent_containers/food/snacks/grown/G in locate(user.x,user.y,user.z)) - if (S.contents.len < S.capacity) - S.contents += G; - else - user << "\blue The plant bag is full." + if(!S.can_be_inserted(G)) return + S.handle_item_insertion(G, 1) else if ( istype(O, /obj/item/weapon/pestspray) ) var/obj/item/pestkiller/myPKiller = O @@ -812,6 +810,16 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) parent.update_tray() +/obj/item/seeds/grassseed/harvest(mob/user = usr) + var/obj/machinery/hydroponics/parent = loc //for ease of access + var/t_yield = round(yield*parent.yieldmod) + + if(t_yield > 0) + var/obj/item/stack/tile/grass/new_grass = new/obj/item/stack/tile/grass(user.loc) + new_grass.amount = t_yield + + parent.update_tray() + /obj/item/seeds/gibtomato/harvest(mob/user = usr) var/produce = text2path(productname) var/obj/machinery/hydroponics/parent = loc //for ease of access @@ -1005,10 +1013,10 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) icon = 'icons/obj/hydroponics.dmi' icon_state = "soil" density = 0 - New() - ..() + use_power = 0 + updateicon() // Same as normal but with the overlays removed - Cheridan. - overlays = null + overlays.Cut() if(planted) if(dead) overlays += image('icons/obj/hydroponics.dmi', icon_state="[myseed.species]-dead") diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 0cacca07ed..817a3603e8 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -1,3 +1,15 @@ +/obj/machinery/igniter + name = "igniter" + desc = "It's useful for igniting plasma." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "igniter1" + var/id = null + var/on = 1.0 + anchored = 1.0 + use_power = 1 + idle_power_usage = 2 + active_power_usage = 4 + /obj/machinery/igniter/attack_ai(mob/user as mob) return src.attack_hand(user) @@ -100,6 +112,12 @@ location.hotspot_expose(1000,500,1) return 1 +/obj/machinery/sparker/emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + ignite() + ..(severity) /obj/machinery/ignition_switch/attack_ai(mob/user as mob) return src.attack_hand(user) diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index 5730462265..0a8bde59dd 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -50,7 +50,7 @@ src.overlays += image('icons/obj/kitchen.dmi', "grjam") /obj/machinery/gibber/update_icon() - overlays = null + overlays.Cut() if (dirty) src.overlays += image('icons/obj/kitchen.dmi', "grbloody") if(stat & (NOPOWER|BROKEN)) diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index b0e2d2ad4c..f5e5b2987d 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -60,9 +60,9 @@ ..() - metroid - input = /mob/living/carbon/metroid - output = /obj/item/weapon/reagent_containers/glass/beaker/roro + slime + input = /mob/living/carbon/slime + output = /obj/item/weapon/reagent_containers/glass/beaker/slime monkey process(loc, what) @@ -82,7 +82,7 @@ for(var/datum/disease/D in O.viruses) if(D.spread_type != SPECIAL) - B.data["viruses"] = D.Copy() + B.data["viruses"] += D.Copy() B.data["blood_DNA"] = copytext(O.dna.unique_enzymes,1,0) if(O.resistances&&O.resistances.len) diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index 926e413378..d02e5fd4f4 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -12,23 +12,52 @@ active_power_usage = 100 flags = NOREACT var/global/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. + var/icon_on = "smartfridge" + var/icon_off = "smartfridge-off" var/item_quants = list() var/ispowered = 1 //starts powered var/isbroken = 0 +/obj/machinery/smartfridge/proc/accept_check(var/obj/item/O as obj) + if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown/) || istype(O,/obj/item/seeds/)) + return 1 + return 0 + +/obj/machinery/smartfridge/seeds + name = "\improper MegaSeed Servitor" + desc = "When you need seeds fast!" + icon = 'icons/obj/vending.dmi' + icon_state = "seeds" + icon_on = "seeds" + icon_off = "seeds-off" + +/obj/machinery/smartfridge/seeds/accept_check(var/obj/item/O as obj) + if(istype(O,/obj/item/seeds/)) + return 1 + return 0 + +/obj/machinery/smartfridge/extract + name = "\improper Slime Extract Storage" + desc = "A refrigerated storage unit for slime extracts" + +/obj/machinery/smartfridge/extract/accept_check(var/obj/item/O as obj) + if(istype(O,/obj/item/slime_extract)) + return 1 + return 0 + /obj/machinery/smartfridge/power_change() if( powered() ) src.ispowered = 1 stat &= ~NOPOWER if(!isbroken) - icon_state = "smartfridge" + icon_state = icon_on else spawn(rand(0, 15)) src.ispowered = 0 stat |= NOPOWER if(!isbroken) - icon_state = "smartfridge-off" + icon_state = icon_off /******************* @@ -40,7 +69,7 @@ user << "\The [src] is unpowered and useless." return - if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown/)) + if(accept_check(O)) if(contents.len >= max_n_of_items) user << "\The [src] is full." return 1 @@ -54,20 +83,27 @@ user.visible_message("[user] has added \the [O] to \the [src].", \ "You add \the [O] to \the [src].") - else if(istype(O, /obj/item/weapon/plantbag)) - user.visible_message("[user] loads \the [src] with \the [O].", \ - "You load \the [src] with \the [O].") - for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in O.contents) - if(contents.len >= max_n_of_items) - user << "\The [src] is full." - return 1 - else - O.contents -= G - G.loc = src - if(item_quants[G.name]) - item_quants[G.name]++ + else if(istype(O, /obj/item/weapon/storage/bag/plants)) + var/obj/item/weapon/storage/bag/plants/P = O + var/plants_loaded = 0 + for(var/obj/G in P.contents) + if(accept_check(G)) + if(contents.len >= max_n_of_items) + user << "\The [src] is full." + return 1 else - item_quants[G.name] = 1 + P.remove_from_storage(G,src) + if(item_quants[G.name]) + item_quants[G.name]++ + else + item_quants[G.name] = 1 + plants_loaded++ + if(plants_loaded) + + user.visible_message("[user] loads \the [src] with \the [P].", \ + "You load \the [src] with \the [P].") + if(P.contents.len > 0) + user << "Some items are refused." else user << "\The [src] smartly refuses [O]." @@ -104,13 +140,18 @@ dat += "[capitalize(O)]:" dat += " [N] " dat += "Vend " - dat += "(x5)" - dat += "(x10)" - dat += "(x25)" + if(N > 5) + dat += "(x5)" + if(N > 10) + dat += "(x10)" + if(N > 25) + dat += "(x25)" + if(N > 1) + dat += "(All)" dat += "
" dat += "" - user << browse("
Receiving Channel: [src.channel_name]
" //MARK dat+="Message Author: [src.scanned_user]
" dat+="Message Body: [src.msg]
" + dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" dat+="
Submit
Cancel
" if(4) dat+="Feed story successfully submitted to [src.channel_name].
" @@ -292,8 +296,14 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if( isemptylist(src.viewing_channel.messages) ) dat+="No feed messages found in channel...
" else + var/i = 0 for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) - dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" + i++ + dat+="-[MESSAGE.body]
" + if(MESSAGE.img) + usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png") + dat+="
" + dat+="\[Story by [MESSAGE.author]\]
" dat+="
Refresh" dat+="
Back" if(10) @@ -358,6 +368,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="
" dat+="Criminal Name: [src.channel_name]
" dat+="Description: [src.msg]
" + dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" if(wanted_already) dat+="Wanted Issue created by: [news_network.wanted_issue.backup_author]
" else @@ -385,7 +396,13 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="-- STATIONWIDE WANTED ISSUE --
\[Submitted by: [news_network.wanted_issue.backup_author]\]
" dat+="Criminal: [news_network.wanted_issue.author]
" dat+="Description: [news_network.wanted_issue.body]
" - dat+="
Back
" + dat+="Photo:: " + if(news_network.wanted_issue.img) + usr << browse_rsc(news_network.wanted_issue.img, "tmp_photow.png") + dat+="
"
+ else
+ dat+="None"
+ dat+="Back
" if(19) dat+="Wanted issue for [src.channel_name] successfully edited.
" dat+="
Return
" @@ -473,6 +490,10 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.msg = copytext(src.msg,2,lentext(src.msg)+1) src.updateUsrDialog() + else if(href_list["set_attachment"]) + AttachPhoto(usr) + src.updateUsrDialog() + else if(href_list["submit_new_message"]) if(src.msg =="" || src.msg=="\[REDACTED\]" || src.scanned_user == "Unknown" || src.channel_name == "" ) src.screen=6 @@ -480,6 +501,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/datum/feed_message/newMsg = new /datum/feed_message newMsg.author = src.scanned_user newMsg.body = src.msg + if(photo) + newMsg.img = photo.img feedback_inc("newscaster_stories",1) for(var/datum/feed_channel/FC in news_network.network_channels) if(FC.channel_name == src.channel_name) @@ -553,6 +576,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co WANTED.author = src.channel_name WANTED.body = src.msg WANTED.backup_author = src.scanned_user //I know, a bit wacky + if(photo) + WANTED.img = photo.img news_network.wanted_issue = WANTED for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) NEWSCASTER.newsAlert() @@ -565,6 +590,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co news_network.wanted_issue.author = src.channel_name news_network.wanted_issue.body = src.msg news_network.wanted_issue.backup_author = src.scanned_user + if(photo) + news_network.wanted_issue.img = photo.img src.screen = 19 src.updateUsrDialog() @@ -712,6 +739,16 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co user << "The newscaster controls are far too complicated for your tiny brain!" return +/obj/machinery/newscaster/proc/AttachPhoto(mob/user as mob) + if(photo) + photo.loc = src.loc + user.put_in_inactive_hand(photo) + photo = null + if(istype(user.get_active_hand(), /obj/item/weapon/photo)) + photo = user.get_active_hand() + user.drop_item() + photo.loc = src + @@ -723,6 +760,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co /obj/item/weapon/newspaper name = "newspaper" desc = "An issue of The Griffon, the newspaper circulating aboard Nanotrasen Space Stations." + icon = 'icons/obj/bureaucracy.dmi' icon_state = "newspaper" w_class = 2 //Let's make it fit in trashbags! attack_verb = list("bapped") @@ -778,8 +816,14 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob) dat+="No Feed stories stem from this channel..." else dat+="
- "
+ var/i = 0
for(var/datum/feed_message/MESSAGE in C.messages)
- dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" + i++ + dat+="-[MESSAGE.body]
" + if(MESSAGE.img) + user << browse_rsc(MESSAGE.img, "tmp_photo[i].png") + dat+="
" + dat+="\[Story by [MESSAGE.author]\]
" dat+="
There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" @@ -790,7 +834,13 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob) if(src.important_message!=null) dat+="
Wanted Issue:
" dat+="Criminal name: [important_message.author]
" - dat+="Description: [important_message.body]" + dat+="Description: [important_message.body]
" + dat+="Photo:: " + if(important_message.img) + user << browse_rsc(important_message.img, "tmp_photow.png") + dat+="
"
+ else
+ dat+="None"
else
dat+="Apart from some uninteresting Classified ads, there's nothing on this page..."
if(scribble_page==curr_page)
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 06bd921dfb..f7b369ab85 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -449,9 +449,6 @@ Status: []"}, var/list/secondarytargets = list() // targets that are least important if(src.check_anomalies) // if its set to check for xenos/carps, check for non-mob "crittersssss"(And simple_animals) - for (var/obj/effect/critter/L in view(7,src)) - if(L.alive) - targets += L for(var/mob/living/simple_animal/C in view(7,src)) if(!C.stat) targets += C @@ -506,15 +503,6 @@ Status: []
"}, spawn() popUp() // pop the turret up if it's not already up. dir=get_dir(src,M) // even if you can't shoot, follow the target spawn() shootAt(M) // shoot the target, finally - else - - if (istype(t, /obj/effect/critter)) // shoot other things, same process as above - var/obj/effect/critter/L = t - if (L.alive==1) - spawn() popUp() - dir=get_dir(src,L) - spawn() shootAt(L) - else if(secondarytargets.len>0) // if there are no primary targets, go for secondary targets diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index da44e9559b..10002bc570 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -80,6 +80,21 @@ obj/machinery/recharger/process() else icon_state = "recharger2" +obj/machinery/recharger/emp_act(severity) + if(stat & (NOPOWER|BROKEN) || !anchored) + ..(severity) + return + + if(istype(charging, /obj/item/weapon/gun/energy)) + var/obj/item/weapon/gun/energy/E = charging + if(E.power_supply) + E.power_supply.emp_act(severity) + + else if(istype(charging, /obj/item/weapon/melee/baton)) + var/obj/item/weapon/melee/baton/B = charging + B.charges = 0 + ..(severity) + obj/machinery/recharger/update_icon() //we have an update_icon() in addition to the stuff in process to make it feel a tiny bit snappier. if(charging) icon_state = "recharger1" diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 95d0f342e8..9912e2e85d 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -34,6 +34,15 @@ src.go_out() return + emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + if(occupant) + occupant.emp_act(severity) + go_out() + ..(severity) + proc build_icon() if(NOPOWER|BROKEN) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index b294cf026e..ced7486384 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -56,6 +56,18 @@ var/list/obj/machinery/requests_console/allConsoles = list() var/priority = -1 ; //Priority of the message being sent luminosity = 0 +/obj/machinery/requests_console/power_change() + ..() + update_icon() + +/obj/machinery/requests_console/update_icon() + if(stat & NOPOWER) + if(icon_state != "req_comp_off") + icon_state = "req_comp_off" + else + if(icon_state == "req_comp_off") + icon_state = "req_comp0" + /obj/machinery/requests_console/New() name = "[department] Requests Console" allConsoles += src @@ -95,6 +107,8 @@ var/list/obj/machinery/requests_console/allConsoles = list() /obj/machinery/requests_console/attack_hand(user as mob) + if(..(user)) + return var/dat dat = text("
[department] Requests Console
") if(!open) @@ -231,7 +245,9 @@ var/list/obj/machinery/requests_console/allConsoles = list() if(href_list["sendAnnouncement"]) if(!announcementConsole) return - world << "[department] announcement: [message]" + for(var/mob/M in player_list) + if(!istype(M,/mob/new_player)) + M << "[department] announcement: [message]" announceAuth = 0 message = "" screen = 0 @@ -370,7 +386,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() updateUsrDialog() if(screen == 10) var/obj/item/weapon/card/id/ID = O - if (access_RC_announce in ID.access) + if (access_RC_announce in ID.GetAccess()) announceAuth = 1 else announceAuth = 0 diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm index cd1621e4c3..615e52f398 100644 --- a/code/game/machinery/seed_extractor.dm +++ b/code/game/machinery/seed_extractor.dm @@ -45,4 +45,10 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob t_amount++ del(O) + else if(istype(O, /obj/item/stack/tile/grass)) + var/obj/item/stack/tile/grass/S = O + user << "You extract some seeds from the [S.name]." + S.use(1) + new /obj/item/seeds/grassseed(loc) + return \ No newline at end of file diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 018609fc40..6b657bda78 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -331,7 +331,7 @@ icon_state = "Shield_Gen" anchored = 0 density = 1 - req_access = list(access_security) + req_access = list(access_teleporter) var/active = 0 var/power = 0 var/state = 0 diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 65c618ef76..a27544b47c 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -23,7 +23,7 @@ return update_icon() - overlays = null + overlays.Cut() icon_state = "sheater[on]" if(open) overlays += "sheater-open" @@ -43,6 +43,13 @@ usr << "The charge meter reads [cell ? round(cell.percent(),1) : 0]%" return + emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + if(cell) + cell.emp_act(severity) + ..(severity) attackby(obj/item/I, mob/user) if(istype(I, /obj/item/weapon/cell)) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index e3d1d7454e..9c37b8212c 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -47,11 +47,17 @@ process() if(stat & NOPOWER) - overlays = null + overlays.Cut() return update() + emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + set_picture("ai_bsod") + ..(severity) // set what is displayed @@ -62,7 +68,7 @@ return if(mode==0) - overlays = null + overlays.Cut() return if(mode==3) // alert picture, no change @@ -83,7 +89,7 @@ update_display(displayloc, displaytime) return else - overlays = null + overlays.Cut() return if(mode==4) // supply shuttle timer @@ -154,7 +160,7 @@ proc/set_picture(var/state) picture_state = state - overlays = null + overlays.Cut() overlays += image('icons/obj/status_display.dmi', icon_state=picture_state) proc/update_display(var/line1, var/line2) @@ -166,11 +172,11 @@ lastdisplayline2 = line2 if(line2 == null) // single line display - overlays = null + overlays.Cut() overlays += texticon(line1, 23, -13) else // dual line display - overlays = null + overlays.Cut() overlays += texticon(line1, 23, -9) overlays += texticon(line2, 23, -17) @@ -266,15 +272,22 @@ process() if(stat & NOPOWER) - overlays = null + overlays.Cut() return update() + emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + set_picture("ai_bsod") + ..(severity) + proc/update() if(mode==0) //Blank - overlays = null + overlays.Cut() return if(mode==1) // AI emoticon @@ -325,5 +338,5 @@ proc/set_picture(var/state) picture_state = state - overlays = null + overlays.Cut() overlays += image('icons/obj/status_display.dmi', icon_state=picture_state) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index c57d612444..754d758248 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -286,7 +286,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept if (R.client && !(R.client.prefs.toggles & CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios. continue - if(istype(M, /mob/new_player)) // we don't want new players to hear messages. rare but generates runtimes. + if(istype(R, /mob/new_player)) // we don't want new players to hear messages. rare but generates runtimes. continue @@ -297,10 +297,10 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // --- Can understand the speech --- - if (R.say_understands(M)) + if (!M || R.say_understands(M)) // - Not human or wearing a voice mask - - if (!ishuman(M) || vmask) + if (!M || !ishuman(M) || vmask) heard_masked += R // - Human and not wearing voice mask - @@ -371,7 +371,11 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // --- Filter the message; place it in quotes apply a verb --- - var/quotedmsg = M.say_quote(message) + var/quotedmsg = null + if(M) + quotedmsg = M.say_quote(message) + else + quotedmsg = "says, \"[message]\"" // --- This following recording is intended for research and feedback in the use of department radio channels --- @@ -447,7 +451,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // Does not display message; displayes the mob's voice_message (ie "chimpers") if (length(heard_voice)) - var/rendered = "[part_a][vname][part_b][M.voice_message][part_c]" + var/rendered = "[part_a][vname][part_b][vmessage][part_c]" for (var/mob/R in heard_voice) aitrack = "" @@ -464,7 +468,11 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // Displays garbled message (ie "f*c* **u, **i*er!") if (length(heard_garbled)) - quotedmsg = M.say_quote(stars(message)) + if(M) + quotedmsg = M.say_quote(stars(message)) + else + quotedmsg = stars(quotedmsg) + var/rendered = "[part_a][vname][part_b][quotedmsg][part_c]" for (var/mob/R in heard_garbled) @@ -482,8 +490,12 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept /* --- Complete gibberish. Usually happens when there's a compressed message --- */ if (length(heard_gibberish)) - quotedmsg = M.say_quote(Gibberish(message, compression + 50)) - var/rendered = "[part_a][Gibberish(M.real_name, compression + 50)][part_b][quotedmsg][part_c]" + if(M) + quotedmsg = M.say_quote(Gibberish(message, compression + 50)) + else + quotedmsg = Gibberish(quotedmsg, compression + 50) + + var/rendered = "[part_a][Gibberish(name, compression + 50)][part_b][quotedmsg][part_c]" for (var/mob/R in heard_gibberish) aitrack = "" diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index 77b266f73b..968b6cf1dc 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -82,8 +82,8 @@ else if(issilicon(M) || C.parameters["job"] == "AI") // sometimes M gets deleted prematurely for AIs... just check the job race = "Artificial Life" - else if(ismetroid(M)) // NT knows a lot about metroids, but not aliens. Can identify metroids - race = "Metroid" + else if(isslime(M)) // NT knows a lot about slimes, but not aliens. Can identify slimes + race = "slime" language = race else if(isanimal(M)) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index d2eb29278f..da2af57a56 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -262,7 +262,7 @@ if(href_list["change_freq"]) var/newfreq = input(usr, "Specify a new frequency for new signals to change to. Enter null to turn off frequency changing. Decimals assigned automatically.", src, network) as null|num - if(usr in range(1, src)) + if(canAccess(usr)) if(newfreq) if(findtext(num2text(newfreq), ".")) newfreq *= 10 // shift the decimal one place @@ -302,13 +302,13 @@ if("id") var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID for this machine", src, id) as null|text),1,MAX_MESSAGE_LEN) - if(newid && usr in range(1, src)) + if(newid && canAccess(usr)) id = newid temp = "-% New ID assigned: \"[id]\" %-" if("network") var/newnet = input(usr, "Specify the new network for this machine. This will break all current links.", src, network) as null|text - if(newnet && usr in range(1, src)) + if(newnet && canAccess(usr)) if(length(newnet) > 15) temp = "-% Too many characters in new network tag %-" @@ -324,7 +324,7 @@ if("freq") var/newfreq = input(usr, "Specify a new frequency to filter (GHz). Decimals assigned automatically.", src, network) as null|num - if(newfreq && usr in range(1, src)) + if(newfreq && canAccess(usr)) if(findtext(num2text(newfreq), ".")) newfreq *= 10 // shift the decimal one place if(!(newfreq in freq_listening) && newfreq < 10000) @@ -384,5 +384,10 @@ updateUsrDialog() +/obj/machinery/telecomms/proc/canAccess(var/mob/user) + if(issilicon(user) || in_range(user, src)) + return 1 + return 0 + #undef TELECOMM_Z #undef STATION_Z diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 7ac1bccc06..0cd533cf27 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -30,7 +30,7 @@ id = "Hub" network = "tcommsat" autolinkers = list("hub", "relay", "s_relay", "m_relay", "r_relay", "science", "medical", - "cargo", "mining", "common", "command", "engineering", "security", + "supply", "common", "command", "engineering", "security", "receiverA", "receiverB", "broadcasterA", "broadcasterB") //Receivers @@ -41,7 +41,7 @@ id = "Receiver A" network = "tcommsat" autolinkers = list("receiverA") // link to relay - freq_listening = list(1351, 1355, 1347, 1349) // science, medical, cargo, mining + freq_listening = list(1351, 1355, 1347) // science, medical, supply //--PRESET RIGHT--// @@ -64,23 +64,31 @@ /obj/machinery/telecomms/bus/preset_one id = "Bus 1" network = "tcommsat" + freq_listening = list(1351, 1355) autolinkers = list("processor1", "science", "medical") /obj/machinery/telecomms/bus/preset_two id = "Bus 2" network = "tcommsat" - autolinkers = list("processor2", "cargo", "mining") + freq_listening = list(1347) + autolinkers = list("processor2", "supply") /obj/machinery/telecomms/bus/preset_three id = "Bus 3" network = "tcommsat" + freq_listening = list(1359, 1353) autolinkers = list("processor3", "security", "command") /obj/machinery/telecomms/bus/preset_four id = "Bus 4" network = "tcommsat" + freq_listening = list(1357) autolinkers = list("processor4", "engineering", "common") +/obj/machinery/telecomms/bus/preset_four/New() + for(var/i = 1441, i < 1489, i += 2) + freq_listening |= i + ..() //Processors @@ -120,16 +128,16 @@ freq_listening = list(1355) autolinkers = list("medical") -/obj/machinery/telecomms/server/presets/cargo - id = "Cargo Server" +/obj/machinery/telecomms/server/presets/supply + id = "Supply Server" freq_listening = list(1347) - autolinkers = list("cargo") - + autolinkers = list("supply") +/* /obj/machinery/telecomms/server/presets/mining id = "Mining Server" freq_listening = list(1349) autolinkers = list("mining") - +*/ /obj/machinery/telecomms/server/presets/common id = "Common Server" freq_listening = list() diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index d74a2114d8..f3d8372353 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -332,11 +332,11 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() if(is_freq_listening(signal)) if(istype(machine_from, /obj/machinery/telecomms/receiver)) //If the signal is compressed, send it to the bus. - relay_information(signal, "/obj/machinery/telecomms/bus") // ideally relay the copied information to bus units + relay_information(signal, "/obj/machinery/telecomms/bus", 1) // ideally relay the copied information to bus units else // Get a list of relays that we're linked to, then send the signal to their levels. - relay_information(signal, "/obj/machinery/telecomms/relay") - relay_information(signal, "/obj/machinery/telecomms/broadcaster") // Send it to a broadcaster. + relay_information(signal, "/obj/machinery/telecomms/relay", 1) + relay_information(signal, "/obj/machinery/telecomms/broadcaster", 1) // Send it to a broadcaster. /* @@ -417,12 +417,11 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() /obj/machinery/telecomms/bus/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) if(is_freq_listening(signal)) - if(change_frequency) - world << "changing [signal.frequency] to [change_frequency]" + if(change_frequency) signal.frequency = change_frequency - if(!istype(machine_from, /obj/machinery/telecomms/processor)) // Signal must be ready (stupid assuming machine), let's send it + if(!istype(machine_from, /obj/machinery/telecomms/processor) && machine_from != src) // Signal must be ready (stupid assuming machine), let's send it // send to one linked processor unit var/send_to_processor = relay_information(signal, "/obj/machinery/telecomms/processor") @@ -519,11 +518,13 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() var/salt = "null" // encryption salt: ie "123comsat" // would add up to md5("password123comsat") var/language = "human" + var/obj/item/device/radio/headset/server_radio = null /obj/machinery/telecomms/server/New() ..() Compiler = new() Compiler.Holder = src + server_radio = new() /obj/machinery/telecomms/server/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 6710e4b95c..916c745021 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -131,6 +131,23 @@ if(!T || istype(T, /area)) return null return T +/obj/machinery/teleport + name = "teleport" + icon = 'icons/obj/stationobjs.dmi' + density = 1 + anchored = 1.0 + var/lockeddown = 0 + + +/obj/machinery/teleport/hub + name = "teleporter hub" + desc = "It's the hub of a teleporting machine." + icon_state = "tele0" + var/accurate = 0 + use_power = 1 + idle_power_usage = 10 + active_power_usage = 2000 + /obj/machinery/teleport/hub/Bumped(M as mob|obj) spawn() if (src.icon_state == "tele1") @@ -249,6 +266,17 @@ s.start() return */ + +/obj/machinery/teleport/station + name = "station" + desc = "It's the station thingy of a teleport thingy." //seriously, wtf. + icon_state = "controller" + var/active = 0 + var/engaged = 0 + use_power = 1 + idle_power_usage = 10 + active_power_usage = 2000 + /obj/machinery/teleport/station/attackby(var/obj/item/weapon/W) src.attack_hand() diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index f133ecc010..130993612e 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1,15 +1,54 @@ -/obj/machinery/vending - var/const/WIRE_EXTEND = 1 - var/const/WIRE_SCANID = 2 - var/const/WIRE_SHOCK = 3 - var/const/WIRE_SHOOTINV = 4 - /datum/data/vending_product var/product_name = "generic" var/product_path = null var/amount = 0 var/display_color = "blue" + + +/obj/machinery/vending + name = "Vendomat" + desc = "A generic vending machine." + icon = 'icons/obj/vending.dmi' + icon_state = "generic" + layer = 2.9 + anchored = 1 + density = 1 + var/active = 1 //No sales pitches if off! + var/vend_ready = 1 //Are we ready to vend?? Is it time?? + var/vend_delay = 10 //How long does it take to vend? + var/product_paths = "" //String of product paths separated by semicolons. No spaces! + var/product_amounts = "" //String of product amounts separated by semicolons, must have amount for every path in product_paths + var/product_slogans = "" //String of slogans separated by semicolons, optional + var/product_ads = "" //String of small ad messages in the vending screen - random chance + var/product_hidden = "" //String of products that are hidden unless hacked. + var/product_hideamt = "" //String of hidden product amounts, separated by semicolons. Exact same as amounts. Must be left blank if hidden is. + var/product_coin = "" + var/product_coin_amt = "" + var/list/product_records = list() + var/list/hidden_records = list() + var/list/coin_records = list() + var/list/slogan_list = list() + var/list/small_ads = list() // small ad messages in the vending screen - random chance of popping up whenever you open it + var/vend_reply //Thank you for shopping! + var/last_reply = 0 + var/last_slogan = 0 //When did we last pitch? + var/slogan_delay = 6000 //How long until we can pitch again? + var/icon_vend //Icon_state when vending! + var/icon_deny //Icon_state when vending! + //var/emagged = 0 //Ignores if somebody doesn't have card access to that machine. + var/seconds_electrified = 0 //Shock customers like an airlock. + var/shoot_inventory = 0 //Fire items at customers! We're broken! + var/shut_up = 0 //Stop spouting those godawful pitches! + var/extended_inventory = 0 //can we access the hidden inventory? + var/panel_open = 0 //Hacking that vending machine. Gonna get a free candy bar. + var/wires = 15 + var/obj/item/weapon/coin/coin + var/const/WIRE_EXTEND = 1 + var/const/WIRE_SCANID = 2 + var/const/WIRE_SHOCK = 3 + var/const/WIRE_SHOOTINV = 4 + /obj/machinery/vending/New() ..() spawn(4) @@ -104,7 +143,7 @@ else if(istype(W, /obj/item/weapon/screwdriver)) src.panel_open = !src.panel_open user << "You [src.panel_open ? "open" : "close"] the maintenance panel." - src.overlays = null + src.overlays.Cut() if(src.panel_open) src.overlays += image(src.icon, "[initial(icon_state)]-panel") src.updateUsrDialog() @@ -455,3 +494,293 @@ else return 0 +/* + * Vending machine types + */ + +/* + +/obj/machinery/vending/[vendors name here] // --vending machine template :) + name = "" + desc = "" + icon = '' + icon_state = "" + product_paths = "" + product_amounts = "" + vend_delay = 15 + product_hidden = "" + product_hideamt = "" + product_slogans = "" + product_ads = "" + +*/ + +/* +/obj/machinery/vending/atmospherics //Commenting this out until someone ponies up some actual working, broken, and unpowered sprites - Quarxink + name = "Tank Vendor" + desc = "A vendor with a wide variety of masks and gas tanks." + icon = 'icons/obj/objects.dmi' + icon_state = "dispenser" + product_paths = "/obj/item/weapon/tank/oxygen;/obj/item/weapon/tank/plasma;/obj/item/weapon/tank/emergency_oxygen;/obj/item/weapon/tank/emergency_oxygen/engi;/obj/item/clothing/mask/breath" + product_amounts = "10;10;10;5;25" + vend_delay = 0 +*/ + +/obj/machinery/vending/boozeomat + name = "Booze-O-Mat" + desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one." + icon_state = "boozeomat" //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles + icon_deny = "boozeomat-deny" + product_paths = "/obj/item/weapon/reagent_containers/food/drinks/bottle/gin;/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey;/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla;/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka;/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth;/obj/item/weapon/reagent_containers/food/drinks/bottle/rum;/obj/item/weapon/reagent_containers/food/drinks/bottle/wine;/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac;/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua;/obj/item/weapon/reagent_containers/food/drinks/beer;/obj/item/weapon/reagent_containers/food/drinks/ale;/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/cream;/obj/item/weapon/reagent_containers/food/drinks/tonic;/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/sodawater;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass;/obj/item/weapon/reagent_containers/food/drinks/ice" + product_amounts = "5;5;5;5;5;5;5;5;5;6;6;4;4;4;4;8;8;15;30;9" + vend_delay = 15 + product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/tea" + product_hideamt = "10" + product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?" + product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!" + req_access_txt = "25" + +/obj/machinery/vending/assist + product_amounts = "5;3;4;1;4" + product_hidden = "/obj/item/device/flashlight;obj/item/device/assembly/timer" + product_paths = "/obj/item/device/assembly/prox_sensor;/obj/item/device/assembly/igniter;/obj/item/device/assembly/signaler;/obj/item/weapon/wirecutters;/obj/item/weapon/cartridge/signal" + product_hideamt = "5;2" + product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!" + +/obj/machinery/vending/coffee + name = "Hot Drinks machine" + desc = "A vending machine which dispenses hot drinks." + icon_state = "coffee" + icon_vend = "coffee-vend" + product_paths = "/obj/item/weapon/reagent_containers/food/drinks/coffee;/obj/item/weapon/reagent_containers/food/drinks/tea;/obj/item/weapon/reagent_containers/food/drinks/h_chocolate" + product_amounts = "25;25;25" + vend_delay = 34 + product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/ice" + product_ads = "Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies" + product_hideamt = "10" + +/obj/machinery/vending/snack + name = "Getmore Chocolate Corp" + desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars" + icon_state = "snack" + product_paths = "/obj/item/weapon/reagent_containers/food/snacks/candy;/obj/item/weapon/reagent_containers/food/drinks/dry_ramen;/obj/item/weapon/reagent_containers/food/snacks/chips;/obj/item/weapon/reagent_containers/food/snacks/sosjerky;/obj/item/weapon/reagent_containers/food/snacks/no_raisin;/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie;/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers" + product_amounts = "6;6;6;6;6;6;6" + product_slogans = "Try our new nougat bar!;Twice the calories for half the price!" + product_hidden = "/obj/item/weapon/reagent_containers/food/snacks/syndicake" + product_hideamt = "6" + product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!" + + +/obj/machinery/vending/cola + name = "Robust Softdrinks" + desc = "A softdrink vendor provided by Robust Industries, LLC." + icon_state = "Cola_Machine" + product_paths = "/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/space_mountain_wind;/obj/item/weapon/reagent_containers/food/drinks/dr_gibb;/obj/item/weapon/reagent_containers/food/drinks/starkist;/obj/item/weapon/reagent_containers/food/drinks/space_up" + product_amounts = "10;10;10;10;10" + product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!" + product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/thirteenloko" + product_hideamt = "5" + product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space." + +//This one's from bay12 +/obj/machinery/vending/cart + name = "PTech" + desc = "Cartridges for PDAs" + icon_state = "cart" + icon_deny = "cart-deny" + product_paths = "/obj/item/weapon/cartridge/medical;/obj/item/weapon/cartridge/engineering;/obj/item/weapon/cartridge/security;/obj/item/weapon/cartridge/janitor;/obj/item/weapon/cartridge/signal/toxins;/obj/item/device/pda/heads;/obj/item/weapon/cartridge/captain;/obj/item/weapon/cartridge/quartermaster" + product_amounts = "10;10;10;10;10;10;3;10" + product_slogans = "Carts to go!" + product_hidden = "" + product_hideamt = "" + product_coin = "" + product_coin_amt = "" + +/obj/machinery/vending/cigarette + name = "Cigarette machine" //OCD had to be uppercase to look nice with the new formating + desc = "If you want to get cancer, might as well do it in style" + icon_state = "cigs" + product_paths = "/obj/item/weapon/storage/fancy/cigarettes;/obj/item/weapon/storage/box/matches;/obj/item/weapon/lighter/random" + product_amounts = "10;10;4" + product_slogans = "Space cigs taste good like a cigarette should.;I'd rather toolbox than switch.;Smoke!;Don't believe the reports - smoke today!" + vend_delay = 34 + product_hidden = "/obj/item/weapon/lighter/zippo" + product_hideamt = "4" + product_coin = "/obj/item/clothing/mask/cigarette/cigar/havana" + product_coin_amt = "2" + product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs." + +/obj/machinery/vending/medical + name = "NanoMed Plus" + desc = "Medical drug dispenser." + icon_state = "med" + icon_deny = "med-deny" + req_access_txt = "5" + product_paths = "/obj/item/weapon/reagent_containers/glass/bottle/antitoxin;/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline;/obj/item/weapon/reagent_containers/glass/bottle/stoxin;/obj/item/weapon/reagent_containers/glass/bottle/toxin;/obj/item/weapon/reagent_containers/syringe/antiviral;/obj/item/weapon/reagent_containers/syringe;/obj/item/device/healthanalyzer;/obj/item/weapon/reagent_containers/glass/beaker;/obj/item/weapon/reagent_containers/dropper" + product_amounts = "4;4;4;4;4;12;5;4;2" + 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" + product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!" + +//This one's from bay12 +/obj/machinery/vending/plasmaresearch + name = "Toximate 3000" + desc = "All the fine parts you need in one vending machine!" + product_paths = "/obj/item/clothing/under/rank/scientist;/obj/item/clothing/suit/bio_suit;/obj/item/clothing/head/bio_hood;/obj/item/device/transfer_valve;/obj/item/device/assembly/signaler;/obj/item/device/assembly/prox_sensor;/obj/item/device/assembly/igniter;/obj/item/device/assembly/timer" + product_amounts = "6;6;6;6;6" + product_hidden = "" + product_hideamt = "" + product_coin = "" + product_coin_amt = "" + +/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" + density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude + product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?" + +/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" + density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude + +/obj/machinery/vending/security + name = "SecTech" + desc = "A security equipment vendor" + icon_state = "sec" + icon_deny = "sec-deny" + req_access_txt = "1" + product_paths = "/obj/item/weapon/handcuffs;/obj/item/weapon/grenade/flashbang;/obj/item/device/flash;/obj/item/weapon/reagent_containers/food/snacks/donut/normal;/obj/item/weapon/storage/box/evidence" + product_amounts = "8;4;5;12;6" + product_hidden = "/obj/item/clothing/glasses/sunglasses;/obj/item/weapon/storage/fancy/donut_box" + product_hideamt = "2;2" + product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?" + +/obj/machinery/vending/hydronutrients + name = "NutriMax" + desc = "A plant nutrients vendor" + icon_state = "nutri" + icon_deny = "nutri-deny" + product_paths = "/obj/item/nutrient/ez;/obj/item/nutrient/l4z;/obj/item/nutrient/rh;/obj/item/weapon/pestspray;/obj/item/weapon/reagent_containers/syringe;/obj/item/weapon/storage/bag/plants" + product_amounts = "35;25;15;20;5;5" + product_slogans = "Aren't you glad you don't have to fertilize the natural way?;Now with 50% less stink!;Plants are people too!" + product_hidden = "/obj/item/weapon/reagent_containers/glass/bottle/ammonia;/obj/item/weapon/reagent_containers/glass/bottle/diethylamine" + product_hideamt = "10;5" + product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil..." + +/obj/machinery/vending/hydroseeds + name = "MegaSeed Servitor" + desc = "When you need seeds fast!" + icon_state = "seeds" + product_paths = "/obj/item/seeds/bananaseed;/obj/item/seeds/berryseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/chiliseed;/obj/item/seeds/cornseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/potatoseed;/obj/item/seeds/replicapod;/obj/item/seeds/soyaseed;/obj/item/seeds/sunflowerseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/towermycelium;/obj/item/seeds/wheatseed;/obj/item/seeds/appleseed;/obj/item/seeds/poppyseed;/obj/item/seeds/ambrosiavulgarisseed;/obj/item/seeds/whitebeetseed;/obj/item/seeds/watermelonseed;/obj/item/seeds/limeseed;/obj/item/seeds/lemonseed;/obj/item/seeds/orangeseed;/obj/item/seeds/grassseed;/obj/item/seeds/cocoapodseed;/obj/item/seeds/cabbageseed;/obj/item/seeds/grapeseed;/obj/item/seeds/pumpkinseed;/obj/item/seeds/cherryseed" + product_amounts = "3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3" + product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!" + product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/glowshroom;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium;/obj/item/seeds/reishimycelium" + product_hideamt = "2;2;2;2;2;2" + product_coin = "/obj/item/toy/waterflower" + product_coin_amt = "1" + product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!" + +/obj/machinery/vending/magivend + name = "MagiVend" + desc = "A magic vending machine." + icon_state = "MagiVend" + product_amounts = "1;1;1;1;1;2" + product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!" + product_paths = "/obj/item/clothing/head/wizard;/obj/item/clothing/suit/wizrobe;/obj/item/clothing/head/wizard/red;/obj/item/clothing/suit/wizrobe/red;/obj/item/clothing/shoes/sandal;/obj/item/weapon/staff" + vend_delay = 15 + vend_reply = "Have an enchanted evening!" + product_hidden = "/obj/item/weapon/reagent_containers/glass/bottle/wizarditis" //No one can get to the machine to hack it anyways + product_hideamt = "1" //Just one, for the lulz, not like anyone can get it - Microwave + product_ads = "FJKLFJSD;AJKFLBJAKL;1234 LOONIES LOL!;>MFW;Kill them fuckers!;GET DAT FUKKEN DISK;HONK!;EI NATH;Destroy the station!;Admin conspiracies since forever!;Space-time bending hardware!" + +/obj/machinery/vending/dinnerware + name = "Dinnerware" + desc = "A kitchen and restaurant equipment vendor" + icon_state = "dinnerware" + product_paths = "/obj/item/weapon/tray;/obj/item/weapon/kitchen/utensil/fork;/obj/item/weapon/kitchenknife;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass;/obj/item/clothing/suit/chef/classic" + product_amounts = "8;6;3;8;2" + //product_amounts = "8;5;4" Old totals + product_hidden = "/obj/item/weapon/kitchen/utensil/spoon;/obj/item/weapon/kitchen/utensil/knife;/obj/item/weapon/kitchen/rollingpin;/obj/item/weapon/butch" + product_hideamt = "2;2;2;2" + product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..." + + +/obj/machinery/vending/sovietsoda + name = "BODA" + desc = "Old sweet water vending machine" + icon_state = "sovietsoda" + product_paths = "/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/soda" + product_amounts = "30" + //product_amounts = "8;5;4" Old totals + product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/cola" + product_hideamt = "20" + product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem." + +/obj/machinery/vending/tool + name = "YouTool" + desc = "Tools for tools." + icon_state = "tool" + icon_deny = "tool-deny" + //req_access_txt = "12" //Maintenance access + product_paths = "/obj/item/weapon/cable_coil/random;/obj/item/weapon/crowbar;/obj/item/weapon/weldingtool;/obj/item/weapon/wirecutters;/obj/item/weapon/wrench;/obj/item/device/analyzer;/obj/item/device/t_scanner;/obj/item/weapon/screwdriver" + product_amounts = "10;5;3;5;5;5;5;5" + product_hidden = "/obj/item/weapon/weldingtool/hugeetank;/obj/item/clothing/gloves/fyellow" + product_hideamt = "2;2" + product_coin = "/obj/item/clothing/gloves/yellow" + product_coin_amt = "1" + +/obj/machinery/vending/engivend + name = "Engi-Vend" + desc = "Spare tool vending. What? Did you expect some witty description?" + icon_state = "engivend" + icon_deny = "engivend-deny" + req_access_txt = "11" //Engineering Equipment access + product_paths = "/obj/item/clothing/glasses/meson;/obj/item/device/multitool;/obj/item/weapon/airlock_electronics;/obj/item/weapon/module/power_control;/obj/item/weapon/cell/high" + product_amounts = "2;4;10;10;10" + product_hidden = "/obj/item/weapon/cell/potato" + product_hideamt = "3" + product_coin = "/obj/item/weapon/storage/belt/utility" + product_coin_amt = "3" + +//This one's from bay12 +/obj/machinery/vending/engineering + name = "Robco Tool Maker" + desc = "Everything you need for do-it-yourself station repair." + icon_state = "engi" + icon_deny = "engi-deny" + req_access_txt = "11" + product_paths = "/obj/item/clothing/under/rank/chief_engineer;/obj/item/clothing/under/rank/engineer;/obj/item/clothing/shoes/orange;/obj/item/clothing/head/helmet/hardhat;/obj/item/weapon/storage/belt/utility;/obj/item/clothing/glasses/meson;/obj/item/clothing/gloves/yellow;/obj/item/weapon/screwdriver;/obj/item/weapon/crowbar;/obj/item/weapon/wirecutters;/obj/item/device/multitool;/obj/item/weapon/wrench;/obj/item/device/t_scanner;/obj/item/weapon/CableCoil/power;/obj/item/weapon/circuitry;/obj/item/weapon/cell;/obj/item/weapon/weldingtool;/obj/item/clothing/head/helmet/welding;/obj/item/weapon/light/tube;/obj/item/clothing/suit/fire;/obj/item/weapon/stock_parts/scanning_module;/obj/item/weapon/stock_parts/micro_laser;/obj/item/weapon/stock_parts/matter_bin;/obj/item/weapon/stock_parts/manipulator;/obj/item/weapon/stock_parts/console_screen" +// product_amounts = "4;4;4;4;4;4;4;12;12;12;12;12;12;8;4;8;8;8;10;4" + product_hidden = "" + product_hideamt = "" + product_coin = "" + product_coin_amt = "" + +//This one's from bay12 +/obj/machinery/vending/robotics + name = "Robotech Deluxe" + desc = "All the tools you need to create your own robot army." + icon_state = "robotics" + icon_deny = "robotics-deny" + req_access_txt = "29" + product_paths = "/obj/item/clothing/suit/storage/labcoat;/obj/item/clothing/under/rank/roboticist;/obj/item/weapon/cable_coil;/obj/item/device/flash;/obj/item/weapon/cell/high;/obj/item/device/assembly/prox_sensor;/obj/item/device/assembly/signaler;/obj/item/device/healthanalyzer;/obj/item/weapon/scalpel;/obj/item/weapon/circular_saw;/obj/item/weapon/tank/anesthetic;/obj/item/clothing/mask/medical;/obj/item/weapon/screwdriver;/obj/item/weapon/crowbar" + product_amounts = "4;4;4;4;12" + product_hidden = "" + product_hideamt = "" + product_coin = "" + product_coin_amt = "" diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm index 17f29cd17d..786468c0c4 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/device.dmi' icon_state = "syndbeacon" + use_power = 0 anchored = 1 density = 1 diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 6c8ea5effc..f75bd01ac4 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -1,6 +1,5 @@ /obj/mecha/combat - var/force = 30 - var/damtype = "brute" + force = 30 var/melee_cooldown = 10 var/melee_can_hit = 1 var/list/destroyable_obj = list(/obj/mecha, /obj/structure/window, /obj/structure/grille, /turf/simulated/wall) diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm index 1ebba1bc23..9ee9f3c3ca 100644 --- a/code/game/mecha/combat/durand.dm +++ b/code/game/mecha/combat/durand.dm @@ -8,7 +8,7 @@ health = 400 deflect_chance = 20 damage_absorption = list("brute"=0.5,"fire"=1.1,"bullet"=0.65,"laser"=0.85,"energy"=0.9,"bomb"=0.8) - max_temperature = 3000 + max_temperature = 30000 infra_luminosity = 8 force = 40 var/defence = 0 diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index dae8cd0698..7e8df94015 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -8,7 +8,7 @@ health = 300 deflect_chance = 15 damage_absorption = list("brute"=0.75,"fire"=1,"bullet"=0.8,"laser"=0.7,"energy"=0.85,"bomb"=1) - max_temperature = 3500 + max_temperature = 25000 infra_luminosity = 6 var/overload = 0 var/overload_coeff = 2 @@ -24,7 +24,7 @@ health = 400 deflect_chance = 25 damage_absorption = list("brute"=0.6,"fire"=0.8,"bullet"=0.6,"laser"=0.5,"energy"=0.65,"bomb"=0.8) - max_temperature = 4500 + max_temperature = 45000 overload_coeff = 1 wreckage = /obj/effect/decal/mecha_wreckage/gygax/dark max_equip = 4 diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm index bc35b987e1..622d5bb8ef 100644 --- a/code/game/mecha/combat/honker.dm +++ b/code/game/mecha/combat/honker.dm @@ -8,7 +8,7 @@ deflect_chance = 60 internal_damage_threshold = 60 damage_absorption = list("brute"=1.2,"fire"=1.5,"bullet"=1,"laser"=1,"energy"=1,"bomb"=1) - max_temperature = 3500 + max_temperature = 25000 infra_luminosity = 5 operation_req_access = list(access_clown) wreckage = /obj/effect/decal/mecha_wreckage/honker diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index 77e85890de..6e924e13eb 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -7,7 +7,7 @@ health = 500 deflect_chance = 25 damage_absorption = list("brute"=0.5,"fire"=0.7,"bullet"=0.45,"laser"=0.6,"energy"=0.7,"bomb"=0.7) - max_temperature = 5000 + max_temperature = 60000 infra_luminosity = 3 var/zoom = 0 var/thrusters = 0 diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm index d063fdf80c..b98f4697e5 100644 --- a/code/game/mecha/combat/phazon.dm +++ b/code/game/mecha/combat/phazon.dm @@ -9,7 +9,7 @@ health = 200 deflect_chance = 30 damage_absorption = list("brute"=0.7,"fire"=0.7,"bullet"=0.7,"laser"=0.7,"energy"=0.7,"bomb"=0.7) - max_temperature = 1000 + max_temperature = 25000 infra_luminosity = 3 wreckage = /obj/effect/decal/mecha_wreckage/phazon add_req_access = 1 diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index c68ca2d5af..28ccd5eccd 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -48,9 +48,9 @@ if(occupant) occupant_message("The sleeper is already occupied") return - for(var/mob/living/carbon/metroid/M in range(1,target)) + for(var/mob/living/carbon/slime/M in range(1,target)) if(M.Victim == target) - occupant_message("[target] will not fit into the sleeper because they have a Metroid latched onto their head.") + occupant_message("[target] will not fit into the sleeper because they have a slime latched onto their head.") return occupant_message("You start putting [target] into [src].") chassis.visible_message("[chassis] starts putting [target] into the [src].") diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 23e6a872c4..0cb83e5ac5 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -792,7 +792,7 @@ ER.set_ready_state(1) return var/cur_charge = ER.chassis.get_charge() - if(isnull(cur_charge)) + if(isnull(cur_charge) || !ER.chassis.cell) stop() ER.set_ready_state(1) ER.occupant_message("No powercell detected.") diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 4d6bd0dd53..c25616ae05 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -288,7 +288,7 @@ /obj/item/missile icon = 'icons/obj/grenade.dmi' - icon_state = "flashbang" + icon_state = "missile" var/primed = null throwforce = 15 diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 22337b5996..108fdafdb6 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -84,7 +84,7 @@ /obj/item/mecha_parts/part/durand_right_leg, /obj/item/mecha_parts/part/durand_armour ), -/* "H.O.N.K"=list( + "H.O.N.K"=list( /obj/item/mecha_parts/chassis/honker, /obj/item/mecha_parts/part/honker_torso, /obj/item/mecha_parts/part/honker_head, @@ -92,7 +92,7 @@ /obj/item/mecha_parts/part/honker_right_arm, /obj/item/mecha_parts/part/honker_left_leg, /obj/item/mecha_parts/part/honker_right_leg - ), */ + ), "Exosuit Equipment"=list( /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp, /obj/item/mecha_parts/mecha_equipment/tool/drill, @@ -106,9 +106,9 @@ ///obj/item/mecha_parts/mecha_equipment/jetpack, //TODO MECHA JETPACK SPRITE MISSING /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg, - /* /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar, + /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar, - /obj/item/mecha_parts/mecha_equipment/weapon/honker*/ + /obj/item/mecha_parts/mecha_equipment/weapon/honker ), "Cyborg Upgrade Modules" = list( @@ -401,17 +401,14 @@ /obj/machinery/mecha_part_fabricator/proc/process_queue() var/obj/item/part = listgetindex(src.queue, 1) if(!part) - if(remove_from_queue(1)) + remove_from_queue(1) + if(src.queue.len) return process_queue() else - // Most likely means we have an empty queue, so stop processing - return 0 + return if(!(part.vars.Find("construction_time")) || !(part.vars.Find("construction_cost")))//If it shouldn't be printed - if(remove_from_queue(1))//Take it out of the quene - return process_queue()//Then reprocess it - else - // Most likely means we have an empty queue, so stop processing - return 0 + remove_from_queue(1)//Take it out of the quene + return process_queue()//Then reprocess it temp = null while(part) if(stat&(NOPOWER|BROKEN)) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index acf60d5dd3..84cc3d100d 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -49,7 +49,7 @@ var/obj/item/device/radio/radio = null - var/max_temperature = 2500 + var/max_temperature = 25000 var/internal_damage_threshold = 50 //health percentage below which internal damage is possible var/internal_damage = 0 //contains bitflags @@ -470,23 +470,6 @@ user.attack_log += text("\[[time_stamp()]\] attacked [src.name]") return - -/obj/mecha/proc/attack_critter(obj/effect/critter/C) - src.log_message("Attack by creature. Attacker - [C].",1) - var/damage = max(0, rand(C.melee_damage_lower - 5, C.melee_damage_upper - 5 )) - - if(!prob(src.deflect_chance) && damage > 0) - src.take_damage(damage) - src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) - playsound(src.loc, "sparks", 50, 1) - visible_message("\red [C] hits [src.name]'s armor!") - else - src.log_append_to_last("Armor saved.") - src.occupant_message("\blue [C]'s attack is stopped by the armor.") - visible_message("\blue [C] rebounds off [src.name]'s armor!") - return - - /obj/mecha/hitby(atom/movable/A as mob|obj) //wrapper src.log_message("Hit by [A].",1) call((proc_res["dynhitby"]||src), "dynhitby")(A) @@ -983,7 +966,7 @@ usr << "\red Access denied" src.log_append_to_last("Permission denied.") return - for(var/mob/living/carbon/metroid/M in range(1,usr)) + for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) usr << "You're too busy getting your life sucked out of you." return @@ -1500,7 +1483,7 @@ return if (href_list["change_name"]) if(usr != src.occupant) return - var/newname = strip_html_simple(input(occupant,"Choose new exosuit name","Rename exosuit",initial(name)) as text) + var/newname = strip_html_simple(input(occupant,"Choose new exosuit name","Rename exosuit",initial(name)) as text, MAX_NAME_LEN) if(newname && trim(newname)) name = newname else diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 57708a31c4..da461662f8 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -118,15 +118,14 @@ return M.get_log_html() -/obj/item/weapon/storage/mechatrackingbox - +/obj/item/weapon/storage/box/mechabeacons + name = "Exosuit Tracking Beacons" New() - new /obj/item/mecha_parts/mecha_tracking(src) - new /obj/item/mecha_parts/mecha_tracking(src) - new /obj/item/mecha_parts/mecha_tracking(src) - new /obj/item/mecha_parts/mecha_tracking(src) - new /obj/item/mecha_parts/mecha_tracking(src) - new /obj/item/mecha_parts/mecha_tracking(src) - new /obj/item/mecha_parts/mecha_tracking(src) ..() - return + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm index 379959925a..f3deea3626 100644 --- a/code/game/mecha/medical/odysseus.dm +++ b/code/game/mecha/medical/odysseus.dm @@ -4,7 +4,7 @@ icon_state = "odysseus" initial_icon = "odysseus" step_in = 2 - max_temperature = 1500 + max_temperature = 15000 health = 120 wreckage = /obj/effect/decal/mecha_wreckage/odysseus internal_damage_threshold = 35 diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 3288cc6971..2ad11bb021 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -2,9 +2,8 @@ desc = "Autonomous Power Loader Unit. The workhorse of the exosuit world." name = "APLU \"Ripley\"" icon_state = "ripley" - initial_icon = "ripley" step_in = 6 - max_temperature = 1000 + max_temperature = 20000 health = 200 wreckage = /obj/effect/decal/mecha_wreckage/ripley var/list/cargo = new @@ -20,8 +19,7 @@ desc = "Standart APLU chassis was refitted with additional thermal protection and cistern." name = "APLU \"Firefighter\"" icon_state = "firefighter" - initial_icon = "firefighter" - max_temperature = 4500 + max_temperature = 65000 health = 250 lights_power = 8 damage_absorption = list("fire"=0.5,"bullet"=0.8,"bomb"=0.5) @@ -31,7 +29,6 @@ desc = "OH SHIT IT'S THE DEATHSQUAD WE'RE ALL GONNA DIE" name = "DEATH-RIPLEY" icon_state = "deathripley" - initial_icon = "deathripley" step_in = 2 opacity=0 lights_power = 60 @@ -47,7 +44,6 @@ /obj/mecha/working/ripley/mining desc = "An old, dusty mining ripley." name = "APLU \"Miner\"" - initial_icon = "ripley" /obj/mecha/working/ripley/mining/New() ..() @@ -114,16 +110,4 @@ return -/obj/mecha/working/ripley/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/fluff/butcher_royce_1)) - src.icon_state = "titan" - src.initial_icon = "titan" - src.name = "APLU \"Titan's Fist\"" - src.desc = "This ordinary mining Ripley has been customized to look like a unit of the Titans Fist." - user << "You spend some quality time with the Ripley, customising it to look like a \"Titan's Fist\" APLU." - user.drop_item() - del(W) - return - else - ..() \ No newline at end of file diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index 263e64d02a..b86bf3404d 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -358,8 +358,9 @@ Alien plants should do something if theres a lot of poison */ /var/const //for the status var BURST = 0 - GROWING = 1 - GROWN = 2 + BURSTING = 1 + GROWING = 2 + GROWN = 3 MIN_GROWTH_TIME = 1800 //time it takes to grow a hugger MAX_GROWTH_TIME = 3000 @@ -394,8 +395,7 @@ Alien plants should do something if theres a lot of poison return if(GROWN) user << "\red You retrieve the child." - loc.contents += GetFacehugger()//need to write the code for giving it to the alien later - Burst() + Burst(0) return else return attack_hand(user) @@ -416,12 +416,20 @@ Alien plants should do something if theres a lot of poison proc/Burst(var/kill = 1) //drops and kills the hugger if any is remaining var/obj/item/clothing/mask/facehugger/child = GetFacehugger() - if(kill && istype(child)) - loc.contents += child - child.Die() - icon_state = "egg_hatched" - status = BURST + flick("egg_opening", src) + status = BURSTING + spawn(15) + status = BURST + loc.contents += child//need to write the code for giving it to the alien later + if(kill && istype(child)) + child.Die() + else + for(var/mob/M in range(1,src)) + if(CanHug(M)) + child.Attach(M) + break + return @@ -462,23 +470,12 @@ Alien plants should do something if theres a lot of poison healthcheck() /obj/effect/alien/egg/HasProximity(atom/movable/AM as mob|obj) - if(!CanHug(AM)) - return - if(status == GROWN && iscarbon(AM) && !isalien(AM)) - - var/mob/living/carbon/C = AM - if(C.stat == CONSCIOUS && C.has_disease(/datum/disease/alien_embryo)) + if(status == GROWN) + if(!CanHug(AM)) return - status = BURST - flick("egg_opening", src) //Play animation - var/turf/pos = get_turf(src) - spawn(18) // Wait until the animation finishes - Burst(0) - var/obj/item/clothing/mask/facehugger/child = GetFacehugger() - child.loc = pos - if(!CanHug(AM)) - return - if(AM && in_range(AM, pos)) - child.Attach(AM) + var/mob/living/carbon/C = AM + if(C.stat == CONSCIOUS && C.status_flags & XENO_HOST) + return + Burst(0) diff --git a/code/game/objects/effects/decals/Cleanable/aliens.dm b/code/game/objects/effects/decals/Cleanable/aliens.dm index b8b990f6ff..7ee6aaa3b5 100644 --- a/code/game/objects/effects/decals/Cleanable/aliens.dm +++ b/code/game/objects/effects/decals/Cleanable/aliens.dm @@ -26,7 +26,9 @@ if (i > 0) var/obj/effect/decal/cleanable/xenoblood/b = new /obj/effect/decal/cleanable/xenoblood/xsplatter(src.loc) for(var/datum/disease/D in src.viruses) - b.viruses += D.Copy() + var/datum/disease/ND = D.Copy(1) + b.viruses += ND + ND.holder = b if (step_to(src, get_step(src, direction), 0)) break diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 2086df3b85..516c0d74ca 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -71,7 +71,10 @@ if (i > 0) var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc) for(var/datum/disease/D in src.viruses) - b.viruses += D.Copy() + var/datum/disease/ND = D.Copy(1) + b.viruses += ND + ND.holder = b + if (step_to(src, get_step(src, direction), 0)) break diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index c6190a6a73..27afdadeca 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -457,13 +457,13 @@ steam.start() -- spawns the effect var/area/A = get_area(location) var/where = "[A.name] | [location.x], [location.y]" - var/whereLink = "[where]" + var/whereLink = "[where]" if(carry.my_atom.fingerprintslast) var/mob/M = get_mob_by_key(carry.my_atom.fingerprintslast) var/more = "" if(M) - more = "(?)" + more = "(?)" message_admins("A chemical smoke reaction has taken place in ([whereLink])[contained]. Last associated key is [carry.my_atom.fingerprintslast][more].", 0, 1) log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last associated key is [carry.my_atom.fingerprintslast].") else diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm index 92be8ed4dd..ae8fc7220a 100644 --- a/code/game/objects/effects/gibs.dm +++ b/code/game/objects/effects/gibs.dm @@ -47,10 +47,10 @@ if(viruses.len > 0) for(var/datum/disease/D in viruses) if(prob(virusProb)) - var/datum/disease/viruus = D.Copy() + var/datum/disease/viruus = D.Copy(1) gib.viruses += viruus viruus.holder = gib - viruus.spread_type = CONTACT_FEET + gib.blood_DNA = list() if(MobDNA) gib.blood_DNA[MobDNA.unique_enzymes] = MobDNA.b_type diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index ba91849c24..b72dafb4c3 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -101,6 +101,8 @@ //SUBCLASSES. Spawn a bunch of items and disappear likewise /obj/effect/landmark/costume/chicken/New() new /obj/item/clothing/suit/chickensuit(src.loc) + new /obj/item/clothing/head/chicken(src.loc) + new /obj/item/weapon/reagent_containers/food/snacks/egg(src.loc) del(src) /obj/effect/landmark/costume/gladiator/New() @@ -171,7 +173,7 @@ /obj/effect/landmark/costume/nightowl/New() new /obj/item/clothing/under/owl(src.loc) - new /obj/item/clothing/mask/owl_mask(src.loc) + new /obj/item/clothing/mask/gas/owl_mask(src.loc) del(src) /obj/effect/landmark/costume/waiter/New() @@ -218,6 +220,7 @@ /obj/effect/landmark/costume/fakewizard/New() new /obj/item/clothing/suit/wizrobe/fake(src.loc) new /obj/item/clothing/head/wizard/fake(src.loc) + new /obj/item/weapon/staff/(src.loc) del(src) /obj/effect/landmark/costume/sexyclown/New() diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index b2c9caaa15..a74f1a170a 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -3,9 +3,7 @@ icon = 'icons/obj/items.dmi' var/icon/blood_overlay = null //this saves our blood splatter overlay, which will be processed not to go over the edges of the sprite var/abstract = 0 - var/force = 0 var/item_state = null - var/damtype = "brute" var/r_speed = 1.0 var/health = null var/burn_point = null @@ -63,6 +61,16 @@ /obj/item/blob_act() return +//user: The mob that is suiciding +//damagetype: The type of damage the item will inflict on the user +//bruteloss = 1 +//fireloss = 2 +//toxloss = 4 +//oxyloss = 8 +//This proc will return an array. The first element of the list should always be the suicide message that players will see, next is the damagetype +/obj/item/proc/suicide_act(mob/user) + return + /obj/item/verb/move_to_top() set name = "Move To Top" set category = "Object" @@ -163,22 +171,36 @@ user.put_in_active_hand(src) return +// Due to storage type consolidation this should get used more now. +// I have cleaned it up a little, but it could probably use more. -Sayu /obj/item/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/storage)) var/obj/item/weapon/storage/S = W if(S.use_to_pickup) - if(!S.can_be_inserted(src)) - return if(S.collection_mode) //Mode is set to collect all items on a tile and we clicked on a valid one. if(isturf(src.loc)) - for(var/obj/item/I in src.loc) - if(I != src) //We'll do the one we clicked on last. - if(!S.can_be_inserted(I)) - continue - S.handle_item_insertion(I, 1) //The 1 stops the "You put the [src] into [S]" insertion message from being displayed. - S.handle_item_insertion(src) + var/list/rejections = list() + var/success = 0 + var/failure = 0 + for(var/obj/item/I in src.loc) + if(I.type in rejections) // To limit bag spamming: any given type only complains once + continue + if(!S.can_be_inserted(I)) // Note can_be_inserted still makes noise when the answer is no + rejections += I.type // therefore full bags are still a little spammy + failure = 1 + continue + success = 1 + S.handle_item_insertion(I, 1) //The 1 stops the "You put the [src] into [S]" insertion message from being displayed. + if(success && !failure) + user << "You put everything in [S]." + else if(success) + user << "You put some things in [S]." + else + user << "You fail to pick anything up with [S]." + + else if(S.can_be_inserted(src)) + S.handle_item_insertion(src) return @@ -225,75 +247,75 @@ power *= 2 if(!istype(M, /mob/living/carbon/human)) - if(istype(M, /mob/living/carbon/metroid)) - var/mob/living/carbon/metroid/Metroid = M + if(istype(M, /mob/living/carbon/slime)) + var/mob/living/carbon/slime/slime = M if(prob(25)) user << "\red [src] passes right through [M]!" return if(power > 0) - Metroid.attacked += 10 + slime.attacked += 10 - if(Metroid.Discipline && prob(50)) // wow, buddy, why am I getting attacked?? - Metroid.Discipline = 0 + if(slime.Discipline && prob(50)) // wow, buddy, why am I getting attacked?? + slime.Discipline = 0 if(power >= 3) - if(istype(Metroid, /mob/living/carbon/metroid/adult)) + if(istype(slime, /mob/living/carbon/slime/adult)) if(prob(5 + round(power/2))) - if(Metroid.Victim) - if(prob(80) && !Metroid.client) - Metroid.Discipline++ - Metroid.Victim = null - Metroid.anchored = 0 + if(slime.Victim) + if(prob(80) && !slime.client) + slime.Discipline++ + slime.Victim = null + slime.anchored = 0 spawn() - if(Metroid) - Metroid.SStun = 1 + if(slime) + slime.SStun = 1 sleep(rand(5,20)) - if(Metroid) - Metroid.SStun = 0 + if(slime) + slime.SStun = 0 spawn(0) - if(Metroid) - Metroid.canmove = 0 - step_away(Metroid, user) + if(slime) + slime.canmove = 0 + step_away(slime, user) if(prob(25 + power)) sleep(2) - if(Metroid && user) - step_away(Metroid, user) - Metroid.canmove = 1 + if(slime && user) + step_away(slime, user) + slime.canmove = 1 else if(prob(10 + power*2)) - if(Metroid) - if(Metroid.Victim) - if(prob(80) && !Metroid.client) - Metroid.Discipline++ + if(slime) + if(slime.Victim) + if(prob(80) && !slime.client) + slime.Discipline++ - if(Metroid.Discipline == 1) - Metroid.attacked = 0 + if(slime.Discipline == 1) + slime.attacked = 0 spawn() - if(Metroid) - Metroid.SStun = 1 + if(slime) + slime.SStun = 1 sleep(rand(5,20)) - if(Metroid) - Metroid.SStun = 0 + if(slime) + slime.SStun = 0 - Metroid.Victim = null - Metroid.anchored = 0 + slime.Victim = null + slime.anchored = 0 spawn(0) - if(Metroid && user) - step_away(Metroid, user) - Metroid.canmove = 0 + if(slime && user) + step_away(slime, user) + slime.canmove = 0 if(prob(25 + power*4)) sleep(2) - if(Metroid && user) - step_away(Metroid, user) - Metroid.canmove = 1 + if(slime && user) + step_away(slime, user) + slime.canmove = 1 var/showname = "." @@ -319,7 +341,7 @@ else switch(src.damtype) if("brute") - if(istype(src, /mob/living/carbon/metroid)) + if(istype(src, /mob/living/carbon/slime)) M.adjustBrainLoss(power) else @@ -504,6 +526,10 @@ if(!disable_warning) usr << "You somehow have a suit with no defined allowed items for suit storage, stop that." return 0 + if(src.w_class > 3) + if(!disable_warning) + usr << "The [name] is too big to attach." + return 0 if( istype(src, /obj/item/device/pda) || istype(src, /obj/item/weapon/pen) || is_type_in_list(src, H.wear_suit.allowed) ) return 1 return 0 @@ -623,7 +649,7 @@ user << "\red You're going to need to remove that mask/helmet/glasses first." return - if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/carbon/metroid))//Aliens don't have eyes./N Metroids also don't have eyes! + if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/carbon/slime))//Aliens don't have eyes./N slimes also don't have eyes! user << "\red You cannot locate any eyes on this creature!" return diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index 03c43d2b09..4ed920fd12 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -37,7 +37,7 @@ else var/obj/item/weapon/cable_coil/C = new /obj/item/weapon/cable_coil(loc) C.amount = 10 - usr << "You cut cables and disassemble the unused power terminal." + usr << "You cut the cables and disassemble the unused power terminal." del(T) new /obj/machinery/power/apc(loc, ndir, 1) del(src) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 15fc782f0d..508af9a598 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -64,7 +64,7 @@ move an amendment to the drawing. "} if (AREA_SPECIAL) text += {" -This place doesn't noted on these blueprints.
+This place isn't noted on these blueprints.
"} else return @@ -114,7 +114,7 @@ move an amendment to the drawing. usr << "\red Error! Please notify administration!" return var/list/turf/turfs = res - var/str = sanitize(trim(input(usr,"New area title","Blueprints editing"))) + var/str = trim(stripped_input(usr,"New area title","Blueprints editing", "", MAX_NAME_LEN)) if(!str || !length(str)) //cancel return if(length(str) > 50) @@ -147,7 +147,7 @@ move an amendment to the drawing. var/area/A = get_area() //world << "DEBUG: edit_area" var/prevname = A.name - var/str = sanitize(trim(input(usr,"New area title","Blueprints editing",prevname))) + var/str = trim(stripped_input(usr,"New area title","Blueprints editing", prevname, MAX_NAME_LEN)) if(!str || !length(str) || str==prevname) //cancel return if(length(str) > 50) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 4cf441e2be..1c6fe70e8c 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -2,7 +2,7 @@ /obj/item/bodybag name = "body bag" - desc = "A folded bag designed to contain dead things." + desc = "A folded bag designed for the storage and transportation of cadavers." icon = 'icons/obj/bodybag.dmi' icon_state = "bodybag_folded" @@ -12,29 +12,24 @@ del(src) -/obj/item/weapon/storage/body_bag_box +/obj/item/weapon/storage/box/bodybags name = "body bags" desc = "This box contains body bags." icon_state = "bodybags" - item_state = "syringe_kit" - foldable = /obj/item/stack/sheet/cardboard //BubbleWrap - - New() - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) ..() - return + new /obj/item/bodybag(src) + new /obj/item/bodybag(src) + new /obj/item/bodybag(src) + new /obj/item/bodybag(src) + new /obj/item/bodybag(src) + new /obj/item/bodybag(src) + new /obj/item/bodybag(src) /obj/structure/closet/body_bag name = "body bag" - desc = "A bag designed to contain dead things." + desc = "A plastic bag designed for the storage and transportation of cadavers." icon = 'icons/obj/bodybag.dmi' icon_state = "bodybag_closed" icon_closed = "bodybag_closed" @@ -61,7 +56,7 @@ else if(istype(W, /obj/item/weapon/wirecutters)) user << "You cut the tag off the bodybag" src.name = "body bag" - src.overlays = null + src.overlays.Cut() return diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 4fe457094f..836657f587 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -37,6 +37,7 @@ var/global/list/obj/item/device/pda/PDAs = list() var/notehtml = "" var/cart = "" //A place to stick cartridge menu information var/detonate = 1 // Can the PDA be blown up? + var/hidden = 0 // Is the PDA hidden from the PDA list? var/obj/item/weapon/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both. var/ownjob = null //related to above @@ -129,7 +130,7 @@ var/global/list/obj/item/device/pda/PDAs = list() icon_state = "pda-syn" name = "Military PDA" owner = "John Doe" - toff = 1 + hidden = 1 /obj/item/device/pda/chaplain icon_state = "pda-holy" @@ -165,6 +166,7 @@ var/global/list/obj/item/device/pda/PDAs = list() icon_state = "pda-bar" /obj/item/device/pda/atmos + default_cartridge = /obj/item/weapon/cartridge/atmos icon_state = "pda-atmo" /obj/item/device/pda/chemist @@ -181,10 +183,8 @@ var/global/list/obj/item/device/pda/PDAs = list() ttone = "data" detonate = 0 -/obj/item/device/pda/pai - icon_state = "NONE" - ttone = "data" - detonate = 0 +/obj/item/device/pda/ai/can_use() + return 1 /obj/item/device/pda/ai/attack_self(mob/user as mob) if ((honkamt > 0) && (prob(60)))//For clown virus. @@ -192,6 +192,9 @@ var/global/list/obj/item/device/pda/PDAs = list() playsound(loc, 'sound/items/bikehorn.ogg', 30, 1) return +/obj/item/device/pda/ai/pai + ttone = "assist" + /* * The Actual PDA */ @@ -222,8 +225,6 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/proc/can_use() - if(istype(src, /obj/item/device/pda/ai) || istype(src, /obj/item/device/pda/pai)) - return 1 if(!ismob(loc)) return 0 @@ -235,6 +236,15 @@ var/global/list/obj/item/device/pda/PDAs = list() else return 0 +/obj/item/device/pda/GetAccess() + if(id) + return id.GetAccess() + else + return ..() + +/obj/item/device/pda/GetID() + return id + /obj/item/device/pda/MouseDrop(obj/over_object as obj, src_location, over_location) var/mob/M = usr if((!istype(over_object, /obj/screen)) && !M.restrained() && !M.stat && can_use()) @@ -321,13 +331,15 @@ var/global/list/obj/item/device/pda/PDAs = list() dat += "- "
if (cartridge)
if (cartridge.access_janitor)
- dat += "