| Transmit: |
- [(radio.wires & 4) ? "En" : "Dis" ]abled
+ | [radio.broadcasting ? "En" : "Dis" ]abled
|
| Receive: |
- [(radio.wires & 2) ? "En" : "Dis" ]abled
-
- |
-
-
- | Signal Pulser: |
- [(radio.wires & 1) ? "En" : "Dis" ]abled
+ | [radio.listening ? "En" : "Dis" ]abled
|
@@ -261,10 +255,11 @@
removePersonality()
if(href_list["wires"])
var/t1 = text2num(href_list["wires"])
- if (radio.wires & t1)
- radio.wires &= ~t1
- else
- radio.wires |= t1
+ switch(t1)
+ if(4)
+ radio.ToggleBroadcast()
+ if(2)
+ radio.ToggleReception()
if(href_list["setlaws"])
var/newlaws = copytext(sanitize(input("Enter any additional directives you would like your pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", pai.pai_laws) as message),1,MAX_MESSAGE_LEN)
if(newlaws)
@@ -309,4 +304,10 @@
/obj/item/device/paicard/emp_act(severity)
for(var/mob/M in src)
M.emp_act(severity)
- ..()
\ No newline at end of file
+ ..()
+
+/obj/item/device/paicard/ex_act(severity)
+ if(pai)
+ pai.ex_act(severity)
+ else
+ del(src)
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index dad292fd472..bb6f0d91f54 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -108,6 +108,12 @@
Speaker: [list ? "Engaged" : "Disengaged"]
"}
+/obj/item/device/radio/proc/ToggleBroadcast()
+ broadcasting = !broadcasting && !(wires.IsIndexCut(WIRE_TRANSMIT) || wires.IsIndexCut(WIRE_SIGNAL))
+
+/obj/item/device/radio/proc/ToggleReception()
+ listening = !listening && !(wires.IsIndexCut(WIRE_RECEIVE) || wires.IsIndexCut(WIRE_SIGNAL))
+
/obj/item/device/radio/Topic(href, href_list)
//..()
if (usr.stat || !on)
@@ -135,11 +141,11 @@
return
else if (href_list["talk"])
- broadcasting = !(wires.IsIndexCut(WIRE_TRANSMIT) || wires.IsIndexCut(WIRE_SIGNAL)) && text2num(href_list["talk"])
+ ToggleBroadcast()
else if (href_list["listen"])
var/chan_name = href_list["ch_name"]
if (!chan_name)
- listening = !(wires.IsIndexCut(WIRE_RECEIVE) || wires.IsIndexCut(WIRE_SIGNAL)) && text2num(href_list["listen"])
+ ToggleReception()
else
if (channels[chan_name] & FREQ_LISTENING)
channels[chan_name] &= ~FREQ_LISTENING
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index 35a80a1b4e1..9b58a812ce1 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -128,11 +128,7 @@ datum/nano_item_lists
var/mob/living/carbon/human/A = usr
A.put_in_any_hand_if_possible(I)
- if(istype(I ,/obj/item/weapon/storage/box/) && I.contents.len>0)
- for(var/atom/o in I)
- purchase_log += "\icon[o]"
- else
- purchase_log += "\icon[I]"
+ purchase_log[UI] = purchase_log[UI] + 1
return 1
return 0
@@ -192,7 +188,7 @@ datum/nano_item_lists
data["menu"] = nanoui_menu
data["nano_items"] = nanoui_items
data += nanoui_data
-
+
// update the ui if it exists, returns null if no ui is passed/found
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 0427960398d..d08377a7042 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -59,7 +59,7 @@
if(!proximity) return
if(disabled && !isrobot(user))
return 0
- if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))
+ if(istype(get_area(A),/area/shuttle)||istype(get_area(A),/turf/space/transit))
return 0
return alter_turf(A,user,(mode == 3))
diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm
index 3dc57db6549..03776c78ded 100644
--- a/code/game/objects/items/weapons/implants/implantcase.dm
+++ b/code/game/objects/items/weapons/implants/implantcase.dm
@@ -3,128 +3,159 @@
/obj/item/weapon/implantcase
name = "Glass Case"
desc = "A case containing an implant."
+ icon = 'icons/obj/items.dmi'
icon_state = "implantcase-0"
item_state = "implantcase"
throw_speed = 1
throw_range = 5
w_class = 1.0
var/obj/item/weapon/implant/imp = null
- proc
- update()
+/obj/item/weapon/implantcase/proc/update()
+ if (src.imp)
+ src.icon_state = text("implantcase-[]", src.imp.item_color)
+ else
+ src.icon_state = "implantcase-0"
+ return
- update()
- if (src.imp)
- src.icon_state = text("implantcase-[]", src.imp.item_color)
+/obj/item/weapon/implantcase/attackby(obj/item/weapon/I as obj, mob/user as mob)
+ ..()
+ if (istype(I, /obj/item/weapon/pen))
+ var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text
+ if (user.get_active_hand() != I)
+ return
+ if((!in_range(src, usr) && src.loc != user))
+ return
+ t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
+ if(t)
+ src.name = text("Glass Case - '[]'", t)
else
- src.icon_state = "implantcase-0"
- return
-
-
- attackby(obj/item/weapon/I as obj, mob/user as mob)
- ..()
- if (istype(I, /obj/item/weapon/pen))
- var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text
- if (user.get_active_hand() != I)
+ src.name = "Glass Case"
+ else if(istype(I, /obj/item/weapon/reagent_containers/syringe))
+ if(!src.imp) return
+ if(!src.imp.allow_reagents) return
+ if(src.imp.reagents.total_volume >= src.imp.reagents.maximum_volume)
+ user << "\red [src] is full."
+ else
+ spawn(5)
+ I.reagents.trans_to(src.imp, 5)
+ user << "\blue You inject 5 units of the solution. The syringe now contains [I.reagents.total_volume] units."
+ else if (istype(I, /obj/item/weapon/implanter))
+ var/obj/item/weapon/implanter/M = I
+ if (M.imp)
+ if ((src.imp || M.imp.implanted))
return
- if((!in_range(src, usr) && src.loc != user))
- return
- t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
- if(t)
- src.name = text("Glass Case- '[]'", t)
- else
- src.name = "Glass Case"
- else if(istype(I, /obj/item/weapon/reagent_containers/syringe))
- if(!src.imp) return
- if(!src.imp.allow_reagents) return
- if(src.imp.reagents.total_volume >= src.imp.reagents.maximum_volume)
- user << "\red [src] is full."
- else
- spawn(5)
- I.reagents.trans_to(src.imp, 5)
- user << "\blue You inject 5 units of the solution. The syringe now contains [I.reagents.total_volume] units."
- else if (istype(I, /obj/item/weapon/implanter))
- if (I:imp)
- if ((src.imp || I:imp.implanted))
+ M.imp.loc = src
+ src.imp = M.imp
+ M.imp = null
+ src.update()
+ M.update()
+ else
+ if (src.imp)
+ if (M.imp)
return
- I:imp.loc = src
- src.imp = I:imp
- I:imp = null
- src.update()
- I:update()
- else
- if (src.imp)
- if (I:imp)
- return
- src.imp.loc = I
- I:imp = src.imp
- src.imp = null
- update()
- I:update()
- return
-
+ src.imp.loc = M
+ M.imp = src.imp
+ src.imp = null
+ update()
+ M.update()
+ return
/obj/item/weapon/implantcase/tracking
- name = "Glass Case- 'Tracking'"
+ name = "Glass Case - 'Tracking'"
desc = "A case containing a tracking implant."
- icon = 'icons/obj/items.dmi'
icon_state = "implantcase-b"
-
- New()
- src.imp = new /obj/item/weapon/implant/tracking( src )
- ..()
- return
-
+/obj/item/weapon/implantcase/tracking/New()
+ src.imp = new /obj/item/weapon/implant/tracking( src )
+ ..()
+ return
/obj/item/weapon/implantcase/explosive
- name = "Glass Case- 'Explosive'"
+ name = "Glass Case - 'Explosive'"
desc = "A case containing an explosive implant."
- icon = 'icons/obj/items.dmi'
icon_state = "implantcase-r"
-
- New()
- src.imp = new /obj/item/weapon/implant/explosive( src )
- ..()
- return
-
+/obj/item/weapon/implantcase/explosive/New()
+ src.imp = new /obj/item/weapon/implant/explosive( src )
+ ..()
+ return
/obj/item/weapon/implantcase/chem
- name = "Glass Case- 'Chem'"
+ name = "Glass Case - 'Chem'"
desc = "A case containing a chemical implant."
- icon = 'icons/obj/items.dmi'
icon_state = "implantcase-b"
-/obj/item/weapon/implantcase/chem/New()
+/obj/item/weapon/implantcase/chem/New()
src.imp = new /obj/item/weapon/implant/chem( src )
..()
return
/obj/item/weapon/implantcase/loyalty
- name = "Glass Case- 'Loyalty'"
+ name = "Glass Case - 'Loyalty'"
desc = "A case containing a loyalty implant."
- icon = 'icons/obj/items.dmi'
icon_state = "implantcase-r"
-
- New()
- src.imp = new /obj/item/weapon/implant/loyalty( src )
- ..()
- return
+/obj/item/weapon/implantcase/loyalty/New()
+ src.imp = new /obj/item/weapon/implant/loyalty( src )
+ ..()
+ return
/obj/item/weapon/implantcase/death_alarm
- name = "Glass Case- 'Death Alarm'"
+ name = "Glass Case - 'Death Alarm'"
desc = "A case containing a death alarm implant."
- icon = 'icons/obj/items.dmi'
icon_state = "implantcase-b"
- New()
- src.imp = new /obj/item/weapon/implant/death_alarm( src )
- ..()
- return
+/obj/item/weapon/implantcase/death_alarm/New()
+ src.imp = new /obj/item/weapon/implant/death_alarm( src )
+ ..()
+ return
+
+
+/obj/item/weapon/implantcase/freedom
+ name = "Glass Case - 'Freedom'"
+ desc = "A case containing a freedom implant."
+ icon_state = "implantcase-r"
+
+/obj/item/weapon/implantcase/freedom/New()
+ src.imp = new /obj/item/weapon/implant/freedom( src )
+ ..()
+ return
+
+
+/obj/item/weapon/implantcase/adrenalin
+ name = "Glass Case - 'Adrenalin'"
+ desc = "A case containing an adrenalin implant."
+ icon_state = "implantcase-b"
+
+/obj/item/weapon/implantcase/adrenalin/New()
+ src.imp = new /obj/item/weapon/implant/adrenalin( src )
+ ..()
+ return
+
+
+/obj/item/weapon/implantcase/dexplosive
+ name = "Glass Case - 'Explosive'"
+ desc = "A case containing an explosive."
+ icon_state = "implantcase-r"
+
+/obj/item/weapon/implantcase/dexplosive/New()
+ src.imp = new /obj/item/weapon/implant/dexplosive( src )
+ ..()
+ return
+
+
+/obj/item/weapon/implantcase/health
+ name = "Glass Case - 'Health'"
+ desc = "A case containing a health tracking implant."
+ icon_state = "implantcase-b"
+
+/obj/item/weapon/implantcase/health/New()
+ src.imp = new /obj/item/weapon/implant/health( src )
+ ..()
+ return
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 291418f5108..12078e0addf 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -452,11 +452,11 @@
del(src)
//BubbleWrap END
-/obj/item/weapon/storage/hear_talk(mob/M as mob, text)
+/obj/item/weapon/storage/hear_talk(mob/M as mob, text, verb, datum/language/speaking)
for (var/atom/A in src)
if(istype(A,/obj/))
var/obj/O = A
- O.hear_talk(M, text)
+ O.hear_talk(M, text, verb, speaking)
//Returns the storage depth of an atom. This is the number of storage items the atom is contained in before reaching toplevel (the area).
//Returns -1 if the atom was not found on container.
diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm
index 8177c746d70..0514e7d1d25 100644
--- a/code/game/objects/items/weapons/tape.dm
+++ b/code/game/objects/items/weapons/tape.dm
@@ -45,6 +45,7 @@
W.forceMove(src)
icon_state = W.icon_state + "_taped"
name = W.name + " (taped)"
+ overlays = W.overlays
/obj/item/weapon/ducttape/attack_self(mob/user as mob)
if(!stuck)
@@ -56,6 +57,7 @@
stuck.forceMove(get_turf(src))
user.put_in_hands(stuck)
stuck = null
+ overlays = null
del(src)
/obj/item/weapon/ducttape/afterattack(var/A, mob/user as mob, flag, params)
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 44fc441926f..ba696b6850b 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -126,7 +126,7 @@
return
-/obj/proc/hear_talk(mob/M as mob, text)
+/obj/proc/hear_talk(mob/M as mob, text, verb, datum/language/speaking)
if(talking_atom)
talking_atom.catchMessage(text, M)
/*
diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index d9ed995845d..83923831506 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -102,4 +102,5 @@
prob(3);/obj/item/stack/cable_coil,\
prob(2);/obj/random/toolbox,\
prob(2);/obj/item/weapon/storage/belt/utility,\
- prob(5);/obj/random/tool)
\ No newline at end of file
+ prob(5);/obj/random/tool,\
+ prob(2);/obj/item/weapon/tape_roll)
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 44c2c3b9002..8ff522a8585 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -293,11 +293,11 @@
else
icon_state = icon_opened
-/obj/structure/closet/hear_talk(mob/M as mob, text)
+/obj/structure/closet/hear_talk(mob/M as mob, text, verb, datum/language/speaking)
for (var/atom/A in src)
if(istype(A,/obj/))
var/obj/O = A
- O.hear_talk(M, text)
+ O.hear_talk(M, text, verb, speaking)
/obj/structure/closet/attack_generic(var/mob/user, var/damage, var/attack_message = "destroys", var/wallbreaker)
if(!damage || !wallbreaker)
diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
index 3d21575c749..e67fea38494 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
@@ -1,4 +1,5 @@
//Alium nests. Essentially beds with an unbuckle delay that only aliums can buckle mobs to.
+#define NEST_RESIST_TIME 1200
/obj/structure/stool/bed/nest
name = "alien nest"
@@ -19,12 +20,16 @@
buckled_mob.old_y = 0
unbuckle()
else
+ if(world.time <= buckled_mob.last_special+NEST_RESIST_TIME)
+ return
+ buckled_mob.last_special = world.time
buckled_mob.visible_message(\
"[buckled_mob.name] struggles to break free of the gelatinous resin...",\
"You struggle to break free from the gelatinous resin...",\
"You hear squelching...")
- spawn(1200)
+ spawn(NEST_RESIST_TIME)
if(user && buckled_mob && user.buckled == src)
+ buckled_mob.last_special = world.time
buckled_mob.pixel_y = 0
buckled_mob.old_y = 0
unbuckle()
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 4ac8aa6c465..608bd782dc7 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -163,31 +163,32 @@
/obj/structure/window/attackby(obj/item/W as obj, mob/user as mob)
if(!istype(W)) return//I really wish I did not need this
- if(W.flags & NOBLUDGEON) return
-
if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
var/obj/item/weapon/grab/G = W
- if (istype(G.affecting, /mob/living))
+ if(istype(G.affecting,/mob/living))
var/mob/living/M = G.affecting
var/state = G.state
del(W) //gotta delete it here because if window breaks, it won't get deleted
switch (state)
if(1)
+ M.visible_message("[user] slams [M] against \the [src]!")
M.apply_damage(7)
hit(10)
- visible_message("\red [user] slams [M] against \the [src]!")
if(2)
+ M.visible_message("[user] bashes [M] against \the [src]!")
if (prob(50))
M.Weaken(1)
M.apply_damage(10)
hit(25)
- visible_message("\red [user] bashes [M] against \the [src]!")
if(3)
+ M.visible_message("[user] crushes [M] against \the [src]!")
M.Weaken(5)
M.apply_damage(20)
hit(50)
- visible_message("\red [user] crushes [M] against \the [src]!")
return
+
+ if(W.flags & NOBLUDGEON) return
+
if(istype(W, /obj/item/weapon/screwdriver))
if(reinf && state >= 1)
state = 3 - state
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 80a70d5c049..d2cd7a18d54 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -86,7 +86,7 @@
//Finally, check objects/mobs to block entry that are not on the border
for(var/atom/movable/obstacle in src)
- if(obstacle.flags & ~ON_BORDER)
+ if(!(obstacle.flags & ON_BORDER))
if(!obstacle.CanPass(mover, mover.loc, 1, 0) && (forget != obstacle))
mover.Bump(obstacle, 1)
return 0
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 93b2824ebe1..07bca599952 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -169,17 +169,29 @@ var/global/floorIsLava = 0
Shade
"}
-
- if (M.client)
- body += {"
+ body += {"
Other actions:
- Forcesay |
+ Forcesay
+ "}
+ if (M.client)
+ body += {" |
Thunderdome 1 |
Thunderdome 2 |
Thunderdome Admin |
Thunderdome Observer |
"}
+ // language toggles
+ body += "
Languages:
"
+ var/f = 1
+ for(var/k in all_languages)
+ var/datum/language/L = all_languages[k]
+ if(!f) body += " | "
+ else f = 0
+ if(L in M.languages)
+ body += "[k]"
+ else
+ body += "[k]"
body += {"
