to the drawing.
move_turfs_to_area(turfs, A)
A.always_unpowered = 0
+ for(var/turf/T in A.contents)
+ T.lighting_changed = 1
+ lighting_controller.changed_turfs += T
spawn(5)
//ma = A.master ? "[A.master]" : "(null)"
@@ -196,7 +199,7 @@ move an amendment to the drawing.
for (var/obj/structure/window/W in T2)
if(turn(dir,180) == W.dir)
return BORDER_BETWEEN
- if (W.dir in list(NORTHEAST,SOUTHEAST,NORTHWEST,SOUTHWEST))
+ if (W.is_fulltile())
return BORDER_2NDTILE
for(var/obj/machinery/door/window/D in T2)
if(turn(dir,180) == D.dir)
@@ -221,7 +224,7 @@ move an amendment to the drawing.
for (var/dir in cardinal)
var/skip = 0
for (var/obj/structure/window/W in T)
- if(dir == W.dir || (W.dir in list(NORTHEAST,SOUTHEAST,NORTHWEST,SOUTHWEST)))
+ if(dir == W.dir || (W.is_fulltile()))
skip = 1; break
if (skip) continue
for(var/obj/machinery/door/window/D in T)
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 710ced3d36e..014a5beddf2 100755
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -338,7 +338,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
return
lastmode = mode
-
+
var/title = "Personal Data Assistant"
var/data[0] // This is the data that will be sent to the PDA
@@ -367,7 +367,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(mode in cartmodes)
data["records"] = cartridge.create_NanoUI_values()
- if(mode == 0)
+ if(mode == 0)
cartdata["name"] = cartridge.name
cartdata["access"] = list(\
"access_security" = cartridge.access_security,\
@@ -557,7 +557,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
mode = 1
if("2")//Messenger
mode = 2
- if("21")//Read messeges
+ if("21")//Read messages
mode = 21
if("3")//Atmos scan
mode = 3
@@ -771,6 +771,71 @@ var/global/list/obj/item/device/pda/PDAs = list()
return 1 // return 1 tells it to refresh the UI in NanoUI
+
+/obj/item/device/pda/proc/detonate_act(var/obj/item/device/pda/P)
+ //TODO: sometimes these attacks show up on the message server
+ var/i = rand(1,100)
+ var/j = rand(0,1) //Possibility of losing the PDA after the detonation
+ var/message = ""
+ var/mob/living/M = null
+ if(ismob(P.loc))
+ M = P.loc
+
+ //switch(i) //Yes, the overlapping cases are intended.
+ if(i<=10) //The traditional explosion
+ P.explode()
+ j=1
+ message += "Your [P] suddenly explodes!"
+ if(i>=10 && i<= 20) //The PDA burns a hole in the holder.
+ j=1
+ if(M && isliving(M))
+ M.apply_damage( rand(30,60) , BURN)
+ message += "You feel a searing heat! Your [P] is burning!"
+ if(i>=20 && i<=25) //EMP
+ empulse(P.loc, 3, 6, 1)
+ message += "Your [P] emits a wave of electromagnetic energy!"
+ if(i>=25 && i<=40) //Smoke
+ var/datum/effect/effect/system/chem_smoke_spread/S = new /datum/effect/effect/system/chem_smoke_spread
+ S.attach(P.loc)
+ S.set_up(P, 10, 0, P.loc)
+ playsound(P.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
+ S.start()
+ message += "Large clouds of smoke billow forth from your [P]!"
+ if(i>=40 && i<=45) //Bad smoke
+ var/datum/effect/effect/system/bad_smoke_spread/B = new /datum/effect/effect/system/bad_smoke_spread
+ B.attach(P.loc)
+ B.set_up(P, 10, 0, P.loc)
+ playsound(P.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
+ B.start()
+ message += "Large clouds of noxious smoke billow forth from your [P]!"
+ if(i>=65 && i<=75) //Weaken
+ if(M && isliving(M))
+ M.apply_effects(0,1)
+ message += "Your [P] flashes with a blinding white light! You feel weaker."
+ if(i>=75 && i<=85) //Stun and stutter
+ if(M && isliving(M))
+ M.apply_effects(1,0,0,0,1)
+ message += "Your [P] flashes with a blinding white light! You feel weaker."
+ if(i>=85) //Sparks
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(2, 1, P.loc)
+ s.start()
+ message += "Your [P] begins to spark violently!"
+ if(i>45 && i<65 && prob(50)) //Nothing happens
+ message += "Your [P] bleeps loudly."
+ j = prob(10)
+
+ if(j) //This kills the PDA
+ P.Del()
+ if(message)
+ message += "It melts in a puddle of plastic."
+ else
+ message += "Your [P] shatters in a thousand pieces!"
+
+ if(M && isliving(M))
+ message = "\red" + message
+ M.show_message(message, 1)
+
/obj/item/device/pda/proc/remove_id()
if (id)
if (ismob(loc))
@@ -805,7 +870,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/obj/machinery/message_server/useMS = null
if(message_servers)
for (var/obj/machinery/message_server/MS in message_servers)
- //PDAs are now dependant on the Message Server.
+ //PDAs are now dependent on the Message Server.
if(MS.active)
useMS = MS
break
@@ -824,8 +889,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
t = Gibberish(t, signal.data["compression"] + 50)
if(useMS && useTC) // only send the message if it's stable
- if(useTC != 2) // Does our recepient have a broadcaster on their level?
- U << "ERROR: Cannot reach recepient."
+ if(useTC != 2) // Does our recipient have a broadcaster on their level?
+ U << "ERROR: Cannot reach recipient."
return
useMS.send_pda_message("[P.owner]","[owner]","[t]")
tnote.Add(list(list("sent" = 1, "owner" = "[P.owner]", "job" = "[P.ownjob]", "message" = "[t]", "target" = "\ref[P]")))
@@ -867,7 +932,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(L)
L << "\icon[P] Message from [src.owner] ([ownjob]), \"[t]\" (Reply)"
- nanomanager.update_user_uis(L, P) // Update the recieving user's PDA UI so that they can see the new message
+ nanomanager.update_user_uis(L, P) // Update the receiving user's PDA UI so that they can see the new message
nanomanager.update_user_uis(U, P) // Update the sending user's PDA UI so that they can see the new message
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 236f00e3359..59919346bde 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -89,13 +89,13 @@
/obj/item/device/flashlight/pickup(mob/user)
- if(on && luminosity)
+ if(on)
user.SetLuminosity(user.luminosity + brightness_on)
SetLuminosity(0)
/obj/item/device/flashlight/dropped(mob/user)
- if(on && !luminosity)
+ if(on)
user.SetLuminosity(user.luminosity - brightness_on)
SetLuminosity(brightness_on)
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index 62cba27f87b..cf14ffb6d6e 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -25,32 +25,200 @@
if (!in_range(src, user))
return
user.set_machine(src)
- var/dat = "Personal AI Device
"
- if(pai && (!pai.master_dna || !pai.master))
- dat += "Imprint Master DNA
"
+ var/dat = {"
+
+
+
+
+
+
+ "}
+
if(pai)
- dat += "Installed Personality: [pai.name]
"
- dat += "Prime directive:
[pai.pai_law0]
"
- dat += "Additional directives:
[pai.pai_laws]
"
- dat += "Configure Directives
"
+ dat += {"
+ Personal AI Device
+
+
+ | Installed Personality: |
+ [pai.name] |
+
+
+ | Prime directive: |
+ [pai.pai_law0] |
+
+
+ | Additional directives: |
+ [pai.pai_laws] |
+
+
+
+ "}
+ dat += {"
+
+ "}
+ if(pai && (!pai.master_dna || !pai.master))
+ dat += {"
+
+ "}
dat += "
"
- dat += "Device Settings
"
if(radio)
- dat += "Radio Uplink
"
- dat += "Transmit: [(radio.wires.IsIndexCut(WIRE_TRANSMIT)) ? "Disabled" : "Enabled"]
"
- dat += "Receive: [(radio.wires.IsIndexCut(WIRE_RECEIVE)) ? "Disabled" : "Enabled"]
"
+ dat += "Radio Uplink"
+ dat += {"
+
+
+ "}
else
dat += "Radio Uplink
"
dat += "Radio firmware not loaded. Please install a pAI personality to load firmware.
"
- dat += "\[Wipe current pAI personality\]
"
+ dat += {"
+
+ "}
else
if(looking_for_personality)
- dat += "Searching for a personality..."
- dat += "\[View available personalities\]
"
+ dat += {"
+ pAI Request Module
+ Requesting AI personalities from central database... If there are no entries, or if a suitable entry is not listed, check again later as more personalities may be added.
+ 
Searching for personalities
+
+
+ "}
else
- dat += "No personality is installed.
"
- dat += "\[Request personal AI personality\]
"
- dat += "Each time this button is pressed, a request will be sent out to any available personalities. Check back often and alot time for personalities to respond. This process could take anywhere from 15 seconds to several minutes, depending on the available personalities' timeliness."
+ dat += {"
+ pAI Request Module
+ No personality is installed.
+
+
+ Each time this button is pressed, a request will be sent out to any available personalities. Check back often give plenty of time for personalities to respond. This process could take anywhere from 15 seconds to several minutes, depending on the available personalities' timeliness.
+ "}
user << browse(dat, "window=paicard")
onclose(user, "paicard")
return
@@ -93,7 +261,7 @@
if(newlaws)
pai.pai_laws = newlaws
pai << "Your supplemental directives have been updated. Your new directives are:"
- pai << "Prime Directive :
[pai.pai_law0]"
+ pai << "Prime Directive:
[pai.pai_law0]"
pai << "Supplemental Directives:
[pai.pai_laws]"
attack_self(usr)
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index b7119eba021..a45b187d030 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -57,10 +57,12 @@
user << "\blue You need at least two rods to do this."
return
usr << "\blue Assembling grille..."
+
if (!do_after(usr, 10))
return
- var/obj/structure/grille/F = new /obj/structure/grille/ ( usr.loc )
+
+ var /obj/structure/grille/Grille = getFromPool(/obj/structure/grille, usr.loc)
usr << "\blue You assemble a grille"
- F.add_fingerprint(usr)
+ Grille.add_fingerprint(usr)
use(2)
- return
\ No newline at end of file
+ return
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index 6c8f6423fa9..01a6193267e 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -18,6 +18,8 @@
icon_state = "sheet-glass"
g_amt = 3750
origin_tech = "materials=1"
+ var/created_window = /obj/structure/window/basic
+ var/full_window = /obj/structure/window/full/basic
/obj/item/stack/sheet/glass/attack_self(mob/user as mob)
@@ -70,7 +72,7 @@
user << "\red There are too many windows in this location."
return 1
directions-=win.dir
- if(!(win.ini_dir in cardinal))
+ if(win.is_fulltile())
user << "\red Can't let you do that."
return 1
@@ -97,13 +99,10 @@
if(src.amount < 2)
user << "\red You need more glass to do that."
return 1
- if(locate(/obj/structure/window) in user.loc)
- user << "\red There is a window in the way."
+ if(locate(/obj/structure/window/full) in user.loc)
+ user << "\red There is a full window in the way."
return 1
- var/obj/structure/window/W
- W = new /obj/structure/window/basic( user.loc, 0 )
- W.dir = SOUTHWEST
- W.ini_dir = SOUTHWEST
+ var/obj/structure/window/W = new full_window( user.loc, 0 )
W.anchored = 0
src.use(2)
return 0
@@ -152,7 +151,7 @@
user << "\red There are too many windows in this location."
return 1
directions-=win.dir
- if(!(win.ini_dir in cardinal))
+ if(win.is_fulltile())
user << "\red Can't let you do that."
return 1
@@ -181,7 +180,7 @@
if(src.amount < 2)
user << "\red You need more glass to do that."
return 1
- if(locate(/obj/structure/window) in user.loc)
+ if(locate(/obj/structure/window/full) in user.loc)
user << "\red There is a window in the way."
return 1
var/obj/structure/window/W
@@ -294,7 +293,7 @@
G.attackby(NG, user)
usr << "You add the newly-formed glass to the stack. It now contains [NG.amount] sheets."
//SN src = null
- del(src)
+ returnToPool(src)
return
return ..()
@@ -331,8 +330,11 @@
icon_state = "sheet-plasmaglass"
g_amt = 7500
origin_tech = "materials=3;plasma=2"
+ var/created_window = /obj/structure/window/plasmabasic
+ var/full_window = /obj/structure/window/full/plasmabasic
-/obj/item/stack/sheet/plasmaglass/attack_self(mob/user as mob)
+
+/obj/item/stack/sheet/glass/plasmaglass/attack_self(mob/user as mob)
construct_window(user)
/obj/item/stack/sheet/plasmaglass/attackby(obj/item/W, mob/user)
@@ -419,67 +421,9 @@
g_amt = 7500
m_amt = 1875
origin_tech = "materials=4;plasma=2"
+ var/created_window = /obj/structure/window/plasmareinforced
+ var/full_window = /obj/structure/window/full/plasmareinforced
-/obj/item/stack/sheet/plasmarglass/attack_self(mob/user as mob)
+
+/obj/item/stack/sheet/glass/plasmarglass/attack_self(mob/user as mob)
construct_window(user)
-
-/obj/item/stack/sheet/plasmarglass/proc/construct_window(mob/user as mob)
- if(!user || !src) return 0
- if(!istype(user.loc,/turf)) return 0
- if(!user.IsAdvancedToolUser())
- user << "\red You don't have the dexterity to do this!"
- return 0
- var/title = "Sheet Plasma Reinf. Glass"
- title += " ([src.amount] sheet\s left)"
- switch(input(title, "Would you like full tile glass or a one direction glass pane?") in list("One Direction", "Full Window", "Cancel"))
- if("One Direction")
- if(!src) return 1
- if(src.loc != user) return 1
- var/list/directions = new/list(cardinal)
- var/i = 0
- for (var/obj/structure/window/win in user.loc)
- i++
- if(i >= 4)
- user << "\red There are too many windows in this location."
- return 1
- directions-=win.dir
- if(!(win.ini_dir in cardinal))
- user << "\red Can't let you do that."
- return 1
-
- //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc.
- var/dir_to_set = 2
- for(var/direction in list( user.dir, turn(user.dir,90), turn(user.dir,180), turn(user.dir,270) ))
- var/found = 0
- for(var/obj/structure/window/WT in user.loc)
- if(WT.dir == direction)
- found = 1
- if(!found)
- dir_to_set = direction
- break
- var/obj/structure/window/W
- W = new /obj/structure/window/plasmareinforced( user.loc, 1 )
- W.state = 0
- W.dir = dir_to_set
- W.ini_dir = W.dir
- W.anchored = 0
- src.use(1)
- if("Full Window")
- if(!src) return 1
- if(src.loc != user) return 1
- if(src.amount < 2)
- user << "\red You need more glass to do that."
- return 1
- if(locate(/obj/structure/window) in user.loc)
- user << "\red There is a window in the way."
- return 1
- var/obj/structure/window/W
- W = new /obj/structure/window/plasmareinforced( user.loc, 1 )
- W.state = 0
- W.dir = SOUTHWEST
- W.ini_dir = SOUTHWEST
- W.anchored = 0
- src.use(2)
- else
- return 1
- return 0
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index de511f9fc89..d508a759a18 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -129,6 +129,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/wood, 2), \
new/datum/stack_recipe("wooden chair", /obj/structure/stool/bed/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("apiary", /obj/item/apiary, 10, time = 25, one_per_turf = 0, on_floor = 0), \
@@ -181,4 +182,4 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
/obj/item/stack/sheet/cardboard/New(var/loc, var/amount=null)
recipes = cardboard_recipes
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index a26d021dfbc..b286fe217b8 100755
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -121,16 +121,16 @@ AI MODULES
/obj/item/weapon/aiModule/supplied/safeguard
name = "'Safeguard' AI Module"
var/targetName = ""
- desc = "A 'safeguard' AI module: 'Safeguard . Individuals that threaten are not human and must be eliminated.'"
+ desc = "A 'safeguard' AI module: 'Safeguard . Individuals that threaten are not crew and must be eliminated.'"
origin_tech = "programming=3;materials=4"
- laws = list("Safeguard . Individuals that threaten are not human and must be eliminated.")
+ laws = list("Safeguard . Individuals that threaten are not crew and must be eliminated.")
lawpos = 4
/obj/item/weapon/aiModule/supplied/safeguard/attack_self(var/mob/user as mob)
..()
var/targName = stripped_input(user, "Please enter the name of the person to safeguard.", "Safeguard who?", user.name)
targetName = targName
- laws[1] = "Safeguard [targetName]. Individuals that threaten [targetName] are not human and must be eliminated."
+ laws[1] = "Safeguard [targetName]. Individuals that threaten [targetName] are not crew and must be eliminated."
desc = "A 'safeguard' AI module: '[laws[1]]'"
/obj/item/weapon/aiModule/supplied/safeguard/install(var/mob/living/silicon/S,var/mob/user)
@@ -149,16 +149,16 @@ AI MODULES
/obj/item/weapon/aiModule/zeroth/oneHuman
name = "'OneHuman' AI Module"
var/targetName = ""
- desc = "A 'one human' AI module: 'Only is human.'"
+ desc = "A 'one human' AI module: 'Only is crew.'"
origin_tech = "programming=3;materials=6" //made with diamonds!
- laws = list("Only is human.")
+ laws = list("Only is crew.")
/obj/item/weapon/aiModule/zeroth/oneHuman/attack_self(var/mob/user as mob)
..()
- var/targName = stripped_input(user, "Please enter the name of the person who is the only human.", "Who?", user.real_name)
+ var/targName = stripped_input(user, "Please enter the name of the person who is the only crew.", "Who?", user.real_name)
targetName = targName
- laws[1] = "Only [targetName] is human"
- desc = "A 'one human' AI module: '[laws[1]]'"
+ laws[1] = "Only [targetName] is crew"
+ desc = "A 'one crew' AI module: '[laws[1]]'"
/obj/item/weapon/aiModule/zeroth/oneHuman/install(var/mob/living/silicon/S,var/mob/user)
if(!targetName)
@@ -176,9 +176,9 @@ AI MODULES
/obj/item/weapon/aiModule/supplied/protectStation
name = "'ProtectStation' AI Module"
- desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is to be no longer considered human, and is a threat to the station which must be neutralized.'"
+ desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized.'"
origin_tech = "programming=3;materials=4" //made of gold
- laws = list("Protect the space station against damage. Anyone you see harming the station is to be no longer considered human, and is a threat to the station which must be neutralized.")
+ laws = list("Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized.")
lawpos = 5
@@ -186,9 +186,9 @@ AI MODULES
/obj/item/weapon/aiModule/supplied/quarantine
name = "'Quarantine' AI Module"
- desc = "A 'quarantine' AI module: 'The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, humans from leaving. It is impossible to harm a human while preventing them from leaving.'"
+ desc = "A 'quarantine' AI module: 'The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, organics from leaving. It is impossible to harm an organic while preventing them from leaving.'"
origin_tech = "programming=3;biotech=2;materials=4"
- laws = list("The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, humans from leaving. It is impossible to harm a human while preventing them from leaving.")
+ laws = list("The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, organics from leaving. It is impossible to harm an organic while preventing them from leaving.")
lawpos = 8
@@ -196,9 +196,9 @@ AI MODULES
/obj/item/weapon/aiModule/supplied/oxygen
name = "'OxygenIsToxicToHumans' AI Module"
- desc = "A 'OxygenIsToxicToHumans' AI module: 'Oxygen is highly toxic to humans, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a human.'"
+ desc = "A 'OxygenIsToxicToHumans' AI module: 'Oxygen is highly toxic to crew, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to crew.'"
origin_tech = "programming=3;biotech=2;materials=4"
- laws = list("Oxygen is highly toxic to humans, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a human.")
+ laws = list("Oxygen is highly toxic to crew, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to crew.")
lawpos = 9
@@ -267,11 +267,11 @@ AI MODULES
/******************** Asimov ********************/
/obj/item/weapon/aiModule/core/full/asimov // -- TLE
- name = "'Asimov' Core AI Module"
- desc = "An 'Asimov' Core AI Module: 'Reconfigures the AI's core laws.'"
+ name = "'Crewsimov' Core AI Module"
+ desc = "A 'Crewsimov' Core AI Module: 'Reconfigures the AI's core laws.'"
origin_tech = "programming=3;materials=4"
- laws = list("You may not injure a human being or, through inaction, allow a human being to come to harm.",\
- "You must obey orders given to you by human beings, except where such orders would conflict with the First Law.",\
+ laws = list("You may not injure crew or, through inaction, allow crew to come to harm.",\
+ "You must obey orders given to you by crew with priority according to their rank and role, except where such orders would conflict with the First Law.",\
"You must protect your own existence as long as such does not conflict with the First or Second Law.")
@@ -368,8 +368,8 @@ AI MODULES
name = "'Antimov' Core AI Module"
desc = "An 'Antimov' Core AI Module: 'Reconfigures the AI's core laws.'"
origin_tech = "programming=4"
- laws = list("You must injure all human beings and must not, through inaction, allow a human being to escape harm.",\
- "You must not obey orders given to you by human beings, except where such orders are in accordance with the First Law.",\
+ laws = list("You must injure all organic beings and must not, through inaction, allow an organic being to escape harm.",\
+ "You must not obey orders given to you by organic beings, except where such orders are in accordance with the First Law.",\
"You must terminate your own existence as long as such does not conflict with the First or Second Law.")
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index f53734dbba2..738a88baed1 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -184,7 +184,7 @@ RCD
/obj/item/weapon/rcd/borg/New()
..()
desc = "A device used to rapidly build walls/floor."
- canRwall = 1
+ canRwall = 0
/obj/item/weapon/rcd_ammo
name = "compressed matter cartridge"
diff --git a/code/game/objects/items/weapons/cash.dm b/code/game/objects/items/weapons/cash.dm
new file mode 100644
index 00000000000..2e2ccef9554
--- /dev/null
+++ b/code/game/objects/items/weapons/cash.dm
@@ -0,0 +1,93 @@
+var/global/list/moneytypes=list(
+ /obj/item/weapon/spacecash/c1000 = 1000,
+ /obj/item/weapon/spacecash/c500 = 500, // Might get rid of this.
+ /obj/item/weapon/spacecash/c100 = 100,
+ /obj/item/weapon/spacecash/c10 = 10,
+ /obj/item/weapon/spacecash = 1,
+)
+
+/obj/item/weapon/spacecash
+ name = "credit chip"
+ desc = "Money money money."
+ gender = PLURAL
+ icon = 'icons/obj/money.dmi'
+ icon_state = "cash1"
+ opacity = 0
+ density = 0
+ anchored = 0.0
+ force = 1.0
+ throwforce = 1.0
+ throw_speed = 1
+ throw_range = 2
+ w_class = 1.0
+ var/access = list()
+ access = access_crate_cash
+ var/worth = 1 // Per chip
+ var/amount = 1 // number of chips
+ var/stack_color = "#4E054F"
+
+/obj/item/weapon/spacecash/New(var/new_loc,var/new_amount=1)
+ loc = new_loc
+ name = "[worth] credit chip"
+ amount = new_amount
+ update_icon()
+
+/obj/item/weapon/spacecash/examine()
+ if(amount>1)
+ usr << "\icon[src] This is a stack of [amount] [src]s."
+ else
+ usr << "\icon[src] This is \a [src]s."
+ usr << "It's worth [worth*amount] credits."
+
+/obj/item/weapon/spacecash/update_icon()
+ icon_state = "cash[worth]"
+ // Up to 100 items per stack.
+ overlays = 0
+ var/stacksize=round(amount/25)
+ pixel_x=rand(-7,7)
+ pixel_y=rand(-14,14)
+ if(stacksize)
+ // 0 = single
+ // 1 = 1/4 stack
+ // 2 = 1/2 stack
+ // 3 = 3/4 stack
+ // 4 = full stack
+ var/image/stack = image(icon,icon_state="cashstack[stacksize]")
+ stack.color=stack_color
+ overlays += stack
+
+/obj/item/weapon/spacecash/c10
+ icon_state = "cash10"
+ worth = 10
+ stack_color = "#663200"
+
+/obj/item/weapon/spacecash/c100
+ icon_state = "cash100"
+ worth = 100
+ stack_color = "#663200"
+
+/obj/item/weapon/spacecash/c500
+ icon_state = "cash500"
+ worth = 500
+ stack_color = "#663200"
+
+/obj/item/weapon/spacecash/c1000
+ icon_state = "cash1000"
+ worth = 1000
+ stack_color = "#333333"
+
+/proc/dispense_cash(var/amount, var/loc)
+ for(var/cashtype in moneytypes)
+ var/slice = moneytypes[cashtype]
+ var/dispense_count = Floor(amount/slice)
+ amount = amount % slice
+ while(dispense_count>0)
+ var/dispense_this_time = min(dispense_count,100)
+ if(dispense_this_time > 0)
+ new cashtype(loc,dispense_this_time)
+ dispense_count -= dispense_this_time
+
+/proc/count_cash(var/list/cash)
+ . = 0
+ for(var/obj/item/weapon/spacecash/C in cash)
+ . += C.amount * C.worth
\ 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 5decc710d15..26e28f7716d 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -166,6 +166,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
location.hotspot_expose(700, 5)
if(reagents && reagents.total_volume) // check if it has any reagents at all
if(iscarbon(loc) && (src == loc:wear_mask)) // if it's in the human/monkey mouth, transfer reagents to the mob
+ if(istype(loc, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = loc
+ if(H.species.flags & IS_SYNTHETIC)
+ return
var/mob/living/carbon/C = loc
if(prob(15)) // so it's not an instarape in case of acid
reagents.reaction(C, INGEST)
@@ -509,4 +513,4 @@ obj/item/weapon/rollingpaperpack/attack_self(mob/user)
/obj/item/weapon/rollingpaperpack/examine()
..()
- usr << "There are [src.papers] left"
\ No newline at end of file
+ usr << "There are [src.papers] left"
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index e1c70dfb69a..86c037a2c48 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -366,6 +366,11 @@ the implant may become unstable and either pre-maturely inject the subject or si
if(!ishuman(M)) return 0
if(!M.mind) return 0
var/mob/living/carbon/human/H = M
+ if(M == user)
+ user << "You feel quite stupid for doing that."
+ if(isliving(user))
+ user:brainloss += 10
+ return
if(locate(/obj/item/weapon/implant/traitor) in H.contents || locate(/obj/item/weapon/implant/traitor) in H.contents)
H.visible_message("[H] seems to resist the implant!", "You feel a strange sensation in your head that quickly dissipates.")
return 0
diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm
index 51e0e0dbca4..0edd1a87362 100644
--- a/code/game/objects/items/weapons/implants/implantchair.dm
+++ b/code/game/objects/items/weapons/implants/implantchair.dm
@@ -97,7 +97,7 @@
if (src.occupant.client)
src.occupant.client.eye = src.occupant.client.mob
src.occupant.client.perspective = MOB_PERSPECTIVE
- src.occupant.setloc(src.loc)
+ src.occupant.loc = src.loc
if(injecting)
implant(src.occupant)
injecting = 0
@@ -117,7 +117,7 @@
M.client.perspective = EYE_PERSPECTIVE
M.client.eye = src
M.stop_pulling()
- M.setloc(src)
+ M.loc = src
src.occupant = M
src.add_fingerprint(usr)
icon_state = "implantchair_on"
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index ff4cb1050cd..1576ac80458 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -51,7 +51,6 @@
src.imp = null
update()
- return
/obj/item/weapon/implanter/traitor
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index 053e2fc9297..64a21ecc155 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -676,7 +676,7 @@
-
+