"
- if(src.cargo.len)
- for(var/obj/O in src.cargo)
+ if(cargo.len)
+ for(var/obj/O in cargo)
output += "
Unload : [O]
"
else
output += "Nothing"
diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm
index 212a5d6c4f3..fa39e40ca87 100644
--- a/code/game/objects/effects/forcefields.dm
+++ b/code/game/objects/effects/forcefields.dm
@@ -8,7 +8,8 @@
density = 1
unacidable = 1
-
+/obj/effect/forcefield/CanAtmosPass(turf/T)
+ return !density
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 7fd3cbf8d70..7ebec0531f1 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -101,6 +101,7 @@
/obj/item/weapon/paper/crumpled = 1,
/obj/item/weapon/pen = 1,
/obj/item/weapon/reagent_containers/spray/pestspray = 1,
+ /obj/item/weapon/reagent_containers/glass/rag = 3,
/obj/item/weapon/stock_parts/cell = 3,
/obj/item/weapon/storage/belt/utility = 2,
/obj/item/weapon/storage/box = 2,
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 7d58a796021..3feb6b0dff3 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -27,7 +27,6 @@
/obj/item/stack/Destroy()
if (usr && usr.machine==src)
usr << browse(null, "window=stack")
- src.loc = null
..()
/obj/item/stack/examine(mob/user)
@@ -186,8 +185,6 @@
if(is_cyborg)
return source.energy < cost
if (amount < 1)
- if(usr)
- usr.unEquip(src, 1)
qdel(src)
return 1
return 0
diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm
index 2320d528651..91c8e9cc2b9 100644
--- a/code/game/objects/items/weapons/RPD.dm
+++ b/code/game/objects/items/weapons/RPD.dm
@@ -575,7 +575,7 @@ var/global/list/RPD_recipes=list(
return 0
user << "
You start building pipes..."
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
- if(do_after(user, 2, target = A))
+ if(do_after(user, 20, target = A))
var/obj/structure/disposalconstruct/C = new (A, queued_p_type ,queued_p_dir)
if(!C.can_place())
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 0b4a0a45c51..f1c7722dd53 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -141,26 +141,26 @@ update_label("John Doe", "Clowny")
if(user.mind.special_role)
usr << "
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)
- if(!src.registered_name)
- //Stop giving the players unsanitized unputs! You are giving ways for players to intentionally crash clients! -Nodrak
- var t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name)as text | null),1,26)
- if(!t || t == "Unknown" || t == "floor" || t == "wall" || t == "r-wall") //Same as mob/new_player/prefrences.dm
- if (t)
- alert("Invalid name.")
- return
- src.registered_name = t
+ if(istype(user, /mob/living) && user.mind)
+ if(user.mind.special_role)
+ if(alert(user, "Action", "Agent ID", "Show", "Forge") == "Forge")
+ var t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", registered_name ? registered_name : (ishuman(user) ? user.real_name : user.name))as text | null),1,26)
+ if(!t || t == "Unknown" || t == "floor" || t == "wall" || t == "r-wall") //Same as mob/new_player/prefrences.dm
+ if (t)
+ alert("Invalid name.")
+ return
+ registered_name = t
- var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")as text | null),1,MAX_MESSAGE_LEN)
- if(!u)
- src.registered_name = ""
- return
- src.assignment = u
- update_label()
- user << "
You successfully forge the ID card."
- else
- ..()
+ var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")as text | null),1,MAX_MESSAGE_LEN)
+ if(!u)
+ registered_name = ""
+ return
+ assignment = u
+ update_label()
+ user << "
You successfully forge the ID card."
+ return
+ ..()
/obj/item/weapon/card/id/syndicate_command
name = "syndicate ID card"
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 8af07589f9c..6cb5747539f 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -120,7 +120,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W, mob/user, params)
..()
- if(!lit && smoketime > 0)
+ if(!lit && smoketime > 0 && is_hot(W))
var/lighting_text = is_lighter(W,user)
if(lighting_text)
light(lighting_text)
@@ -143,10 +143,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/lighting_text = null
if(istype(O, /obj/item/weapon/weldingtool))
lighting_text = "
[user] casually lights the [name] with [O], what a badass."
+ else if(istype(O, /obj/item/weapon/lighter/greyscale)) // we have to check for this first -- zippo lighters are default
+ lighting_text = "
After some fiddling, [user] manages to light their [name] with [O]."
else if(istype(O, /obj/item/weapon/lighter))
lighting_text = "
With a single flick of their wrist, [user] smoothly lights their [name] with [O]. Damn they're cool."
- else if(istype(O, /obj/item/weapon/lighter/greyscale))
- lighting_text = "
After some fiddling, [user] manages to light their [name] with [O]."
else if(istype(O, /obj/item/weapon/melee/energy))
lighting_text = "
[user] swings their [O], barely missing their nose. They light their [name] in the process."
else if(istype(O, /obj/item/device/assembly/igniter))
@@ -195,9 +195,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
//can't think of any other way to update the overlays :<
if(ismob(loc))
var/mob/M = loc
- M.update_inv_wear_mask(0)
- M.update_inv_l_hand(0)
- M.update_inv_r_hand(0)
+ M.update_inv_wear_mask()
+ M.update_inv_l_hand()
+ M.update_inv_r_hand()
/obj/item/clothing/mask/cigarette/proc/handle_reagents()
@@ -365,7 +365,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
lit = 0
icon_state = icon_off
item_state = icon_off
- M.update_inv_wear_mask(0)
+ M.update_inv_wear_mask()
packeditem = 0
name = "empty [initial(name)]"
SSobj.processing.Remove(src)
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index f674359c449..fd1c0971718 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -323,6 +323,12 @@
else
return 1
+/obj/item/weapon/twohanded/shockpaddles/Topic(href, href_list)
+ if(href_list["reenter"])
+ var/mob/dead/observer/ghost = usr
+ if(istype(ghost))
+ ghost.reenter_corpse(ghost)
+
/obj/item/weapon/twohanded/shockpaddles/attack(mob/M, mob/user)
var/halfwaycritdeath = (config.health_threshold_crit + config.health_threshold_dead) / 2
@@ -400,7 +406,7 @@
return
var/mob/dead/observer/ghost = H.get_ghost()
if(ghost)
- ghost << "
Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)"
+ ghost << "
Your heart is being defibrillated. Re-enter your corpse if you want to be revived! (Click to re-enter)"
ghost << 'sound/effects/genetics.ogg'
user.visible_message("
[user] begins to place [src] on [M.name]'s chest.", "
You begin to place [src] on [M.name]'s chest...")
busy = 1
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index 35d9b8540f5..c4169a526a6 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -158,4 +158,13 @@
sleep(2)
else
- return ..()
\ No newline at end of file
+ return ..()
+
+/obj/item/weapon/extinguisher/AltClick(mob/user)
+ EmptyExtinguisher(user)
+
+/obj/item/weapon/extinguisher/proc/EmptyExtinguisher(var/mob/user)
+ if(loc == user && reagents.total_volume)
+ reagents.clear_reagents()
+ user.visible_message("[user] empties out \the [src] onto the floor using the release valve.", "
You quietly empty out \the [src] using its release valve.")
+ return
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index f8a00e2fd38..20242e9a5f0 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -94,6 +94,9 @@
/obj/item/weapon/restraints/handcuffs/cable/white
icon_state = "cuff_white"
+/obj/item/weapon/restraints/handcuffs/alien
+ icon_state = "handcuffAlien"
+
/obj/item/weapon/restraints/handcuffs/cable/attackby(obj/item/I, mob/user, params)
..()
if(istype(I, /obj/item/stack/rods))
@@ -193,7 +196,7 @@
if(!C.legcuffed) //beartrap can't cuff your leg if there's already a beartrap or legcuffs.
C.legcuffed = src
src.loc = C
- C.update_inv_legcuffed(0)
+ C.update_inv_legcuffed()
feedback_add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart.
else if(isanimal(L))
var/mob/living/simple_animal/SA = L
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index 7e69597ba3d..08a4a762d0c 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -709,7 +709,7 @@
Microwave:
Use it to cook or boil food ingredients (meats, doughs, egg, spaghetti, donkpocket, etc...).
- It can cook multiple items at once. Use the higher power settings for faster (and riskier) cooking.
+ It can cook multiple items at once.
Processor:
Use it to process certain ingredients (meat into faggot, doughslice into spaghetti, potato into fries,etc...)
@@ -733,6 +733,8 @@
Donuts: 1u sugar + 1 pastry base
Fries: Process potato.
+
Sharing your food:
+ You can put your meals on your kitchen counter or load them in the snack vending machines.