Hello there, proud operator of an NT-Sec Prisoner Rehabilitation Center. A solution to rising crime rates and falling productivity, these facilities are specifically designed for the safe, productive imprisonment of your most dangerous criminals.
To press a long-term prisoner into the service of the station, replace his equipment with prisoners' garb at one of the prison lockers, as per normal operating procedure. Before assigning a prisoner his ID, insert the ID into a prisoner management console and assign the prisoner a quota, based on the severity of his crime. A single sheet of most materials produces five points for the prisoner, and points can be expected to be produced at a rate of about 100 per minute, though punishments as severe as forced labor should be reserved for serious crimes of sentences not less than five minutes long. Once you have prepared the prisoner, place him in the secure northern half of the labor shuttle, and send him to the station. Once he meets his quota by feeding sheets to the stacker, he will be allowed to return to the station, and will be able to open the secure door to the prisoner release area.
Your station has been selected to carry out the Gateway Project.
The equipment will be shipped to you at the start of the next quarter. You are to prepare a secure location to house the equipment as outlined in the attached documents.
");
- if (area && pos_x && pos_y) { tdElem.append($("").text(area).addClass("tt").append($("").append($("").text("(" + pos_x + ", " + pos_y + ")")))); }
+ if (area && pos_x && pos_y)
+ {
+ tdElem.append($("").text(area).addClass("tt").append($("").append($("").text("(" + pos_x + ", " + pos_y + ")"))));
+ tdElem.css("cursor", "pointer").on("click", function()
+ {
+ window.clipboardData.setData("Text", pos_x + ", " + pos_y);
+ });
+ }
else { tdElem.text("Not Available"); }
trElem.append(tdElem);
@@ -363,20 +516,24 @@ function add(name, assignment, ijob, life_status, dam1, dam2, dam3, dam4, area,
var x = parseInt(pos_x);
var y = maxy - parseInt(pos_y);
- var tx = (translate(x - 1, scale_x) - 1.5).toFixed(0);
- var ty = (translate(y - 1, scale_y) + 3).toFixed(0);
+ var tx = translateX(x);
+ var ty = translateY(y);
- var dotElem = $("");
+ var dotElem = $("");
$("#minimap").append(dotElem);
+ var counter = 0;
+
function enable()
{
+ ++counter;
dotElem.addClass("active").css({ "border-color": color });
}
function disable()
{
+ ++counter;
dotElem.removeClass("active").css({ "border-color": "transparent" });
}
@@ -388,7 +545,27 @@ function add(name, assignment, ijob, life_status, dam1, dam2, dam3, dam4, area,
window.location.href = "byond://?src=" + hSrc + "&action=select_person&name=" + encodeURIComponent(name);
}
- trElem.on("mouseover", enable).on("mouseout", disable).on("click", click);
+ trElem.on("mouseover", function()
+ {
+ enable();
+
+ if (zoom_factor > 1.00)
+ {
+ var c = counter;
+ setTimeout(function()
+ {
+ if (c == counter)
+ {
+ var minimap = document.getElementById("minimap");
+ var half = $(minimap).height() / 2;
+ var offset = $(dotElem).offset();
+
+ minimap.scrollLeft = offset.left + minimap.scrollLeft - half;
+ minimap.scrollTop = offset.top + minimap.scrollTop - half;
+ }
+ }, 100);
+ }
+ }).on("mouseout", disable).on("click", click);
dotElem.on("mouseover", function()
{
trElem.addClass("hover");
@@ -402,6 +579,9 @@ function add(name, assignment, ijob, life_status, dam1, dam2, dam3, dam4, area,
}
}
+function translateX(n) { return (translate(n - 1.5, scale_x) ).toFixed(0); }
+function translateY(n) { return (translate(n + 0.75, scale_y) ).toFixed(0); }
+
function translate(n, scale)
{
return (n * tile_size) * scale;
diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm
index 1911b1067b3..20ea8b55b91 100644
--- a/code/game/machinery/computer/power.dm
+++ b/code/game/machinery/computer/power.dm
@@ -68,19 +68,35 @@
t += "Area Eqp./Lgt./Env. Load Cell"
- var/list/S = list(" Off","AOff"," On", " AOn")
- var/list/chg = list("N","C","F")
+ var/list/S = list(" Off","AOff"," On", " AOn")
+ var/list/chg = list("N","C","F")
+
+ var/percent = 0
+ var/c = ""
for(var/obj/machinery/power/apc/A in L)
- t += copytext(add_tspace("\The [A.area]", 30), 1, 30)
- t += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_lspace(A.lastused_total, 6)] [A.cell ? "[add_lspace(round(A.cell.percent()), 3)]% [chg[A.charging+1]]" : " N/C"] "
+ t += copytext(add_tspace("[format_text(A.area.name)]", 30), 1, 30)
+ t += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_lspace(A.lastused_total, 6)]"
+
+ if (A.cell)
+ percent = round(A.cell.percent())
+
+ c = "bad"
+ if (percent > 50)
+ c = "good"
+ else if (percent > 25)
+ c = "average"
+
+ t += "[add_lspace(percent, 4)]% [chg[A.charging+1]] "
+ else
+ t += " N/C "
t += ""
//user << browse(t, "window=powcomp;size=420x900")
//onclose(user, "powcomp")
- var/datum/browser/popup = new(user, "powcomp", name, 420, 450)
+ var/datum/browser/popup = new(user, "powcomp", name, 500, 450)
popup.set_content(t)
popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
popup.open()
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 53c8a341d23..e023131b2f6 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1096,7 +1096,7 @@ About the new airlock wires panel:
spawn(150)
autoclose()
else if(autoclose && !normalspeed)
- spawn(5)
+ spawn(11)
autoclose()
return ..()
@@ -1148,8 +1148,9 @@ About the new airlock wires panel:
operating = 0
air_update_turf(1)
update_freelook_sight()
- if(locate(/mob/living) in get_turf(src))
- open()
+ if(safe)
+ if(locate(/mob/living) in get_turf(src))
+ open()
return 1
/obj/machinery/door/airlock/New()
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index 659fa906fc9..c4df97166da 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -19,7 +19,7 @@
/obj/machinery/syndicatebomb/process()
if(active && !defused && (timer > 0)) //Tick Tock
- var/volume = (timer <= 10 ? 30 : 5) // Tick louder when the bomb is closer to being detonated.
+ var/volume = (timer <= 10 ? 40 : 10) // Tick louder when the bomb is closer to being detonated.
playsound(loc, beepsound, volume, 0)
timer--
if(active && !defused && (timer <= 0)) //Boom
@@ -188,7 +188,7 @@
if(adminlog)
message_admins(adminlog)
log_game(adminlog)
- explosion(get_turf(src),2,5,11, flame_range = 11)
+ explosion(get_turf(src),3,9,17, flame_range = 17)
if(src.loc && istype(src.loc,/obj/machinery/syndicatebomb/))
qdel(src.loc)
qdel(src)
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 40de63b5c4f..9b5afd89b42 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -1,3 +1,7 @@
+#define STANDARD_CHARGE 1
+#define CONTRABAND_CHARGE 2
+#define COIN_CHARGE 3
+
/datum/data/vending_product
var/product_name = "generic"
var/product_path = null
@@ -82,11 +86,10 @@
coin = null
..()
-
/obj/machinery/vending/snack/Destroy()
for(var/obj/item/weapon/reagent_containers/food/snacks/S in contents)
S.loc = get_turf(src)
- ..()
+ return ..()
/obj/machinery/vending/RefreshParts() //Better would be to make constructable child
if(component_parts)
@@ -97,9 +100,9 @@
build_inventory(contraband, 1, start_empty = 1)
build_inventory(premium, 0, 1, start_empty = 1)
for(var/obj/item/weapon/vending_refill/VR in component_parts)
- refill_inventory(VR, product_records)
- refill_inventory(VR, coin_records)
- refill_inventory(VR, hidden_records)
+ refill_inventory(VR, product_records, STANDARD_CHARGE)
+ refill_inventory(VR, coin_records, COIN_CHARGE)
+ refill_inventory(VR, hidden_records, CONTRABAND_CHARGE)
/obj/machinery/vending/ex_act(severity, target)
..()
@@ -136,31 +139,31 @@
else
product_records += R
-/obj/machinery/vending/proc/refill_inventory(obj/item/weapon/vending_refill/refill, datum/data/vending_product/machine)
+/obj/machinery/vending/proc/refill_inventory(obj/item/weapon/vending_refill/refill, datum/data/vending_product/machine, var/charge_type = STANDARD_CHARGE)
var/total = 0
-
var/to_restock = 0
+
for(var/datum/data/vending_product/machine_content in machine)
- if(machine_content.amount == 0 && refill.charges > 0)
+ if(machine_content.amount == 0 && refill.charges[charge_type] > 0)
machine_content.amount++
- refill.charges--
+ refill.charges[charge_type]--
total++
to_restock += machine_content.max_amount - machine_content.amount
- if(to_restock <= refill.charges)
+ if(to_restock <= refill.charges[charge_type])
for(var/datum/data/vending_product/machine_content in machine)
machine_content.amount = machine_content.max_amount
- refill.charges -= to_restock
+ refill.charges[charge_type] -= to_restock
total += to_restock
else
- var/tmp_charges = refill.charges
+ var/tmp_charges = refill.charges[charge_type]
for(var/datum/data/vending_product/machine_content in machine)
- if(refill.charges == 0)
+ if(refill.charges[charge_type] == 0)
break
var/restock = Ceiling(((machine_content.max_amount - machine_content.amount)/to_restock)*tmp_charges)
- if(restock > refill.charges)
- restock = refill.charges
+ if(restock > refill.charges[charge_type])
+ restock = refill.charges[charge_type]
machine_content.amount += restock
- refill.charges -= restock
+ refill.charges[charge_type] -= restock
total += restock
return total
@@ -263,7 +266,7 @@
else if(panel_open)
//if the panel is open we attempt to refill the machine
var/obj/item/weapon/vending_refill/canister = W
- if(canister.charges == 0)
+ if(canister.charges[STANDARD_CHARGE] == 0)
user << "This [canister.name] is empty!"
else
var/transfered = refill_inventory(canister,product_records,user)
@@ -279,21 +282,22 @@
/obj/machinery/vending/default_deconstruction_crowbar(obj/item/O)
- var/list/all_products = product_records + hidden_records + coin_records
- for(var/datum/data/vending_product/machine_content in all_products)
- while(machine_content.amount !=0)
- var/safety = 0 //to avoid infinite loop
- for(var/obj/item/weapon/vending_refill/VR in component_parts)
- safety++
- if(VR.charges < initial(VR.charges))
- VR.charges++
- machine_content.amount--
- if(!machine_content.amount)
- break
- else
- safety--
- if(safety <= 0)
- break
+ var/product_list = list(product_records, hidden_records, coin_records)
+ for(var/i=1, i<=3, i++)
+ for(var/datum/data/vending_product/machine_content in product_list[i])
+ while(machine_content.amount !=0)
+ var/safety = 0 //to avoid infinite loop
+ for(var/obj/item/weapon/vending_refill/VR in component_parts)
+ safety++
+ if(VR.charges[i] < VR.init_charges[i])
+ VR.charges[i]++
+ machine_content.amount--
+ if(!machine_content.amount)
+ break
+ else
+ safety--
+ if(safety <= 0) // all refill canisters are full
+ break
..()
/obj/machinery/vending/emag_act(mob/user)
@@ -637,8 +641,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/tonic = 8,
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola = 8, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/sodawater = 15,
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 30,/obj/item/weapon/reagent_containers/food/drinks/ice = 10,
- /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass = 8)
- contraband = list(/obj/item/weapon/reagent_containers/food/drinks/tea = 10)
+ /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass = 12)
+ contraband = list(/obj/item/weapon/reagent_containers/food/drinks/tea = 12)
vend_delay = 15
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!"
@@ -659,7 +663,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
icon_vend = "coffee-vend"
vend_delay = 34
products = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 25,/obj/item/weapon/reagent_containers/food/drinks/tea = 25,/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25)
- contraband = list(/obj/item/weapon/reagent_containers/food/drinks/ice = 10)
+ contraband = list(/obj/item/weapon/reagent_containers/food/drinks/ice = 12)
refill_canister = /obj/item/weapon/vending_refill/coffee
/obj/machinery/vending/snack
@@ -668,10 +672,10 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
product_slogans = "Try our new nougat bar!;Twice the calories for half the price!"
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!"
icon_state = "snack"
- products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 5,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 5,/obj/item/weapon/reagent_containers/food/snacks/chips =5,
- /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 5,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 5,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 5,
- /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 5)
- contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 7)
+ products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 6,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 6,/obj/item/weapon/reagent_containers/food/snacks/chips =6,
+ /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 6,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 6,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 6,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 6)
+ contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6)
refill_canister = /obj/item/weapon/vending_refill/snack
var/chef_compartment_access = "28"
@@ -735,14 +739,14 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
icon_state = "cigs"
products = list(/obj/item/weapon/storage/fancy/cigarettes = 5,
/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 3,
- /obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 2,
+ /obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 3,
/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 3,
/obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 3,
/obj/item/weapon/storage/box/matches = 10,
/obj/item/weapon/lighter/greyscale = 4,
/obj/item/weapon/storage/fancy/rollingpapers = 5)
- contraband = list(/obj/item/weapon/lighter = 4)
- premium = list(/obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold = 2, \
+ contraband = list(/obj/item/weapon/lighter = 3)
+ premium = list(/obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold = 3, \
/obj/item/weapon/storage/fancy/cigarettes/cigars = 1, /obj/item/weapon/storage/fancy/cigarettes/cigars/havana = 1, /obj/item/weapon/storage/fancy/cigarettes/cigars/cohiba = 1)
refill_canister = /obj/item/weapon/vending_refill/cigarette
@@ -855,7 +859,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/item/clothing/mask/fakemoustache = 1,/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,/obj/item/clothing/head/plaguedoctorhat = 1,/obj/item/clothing/mask/gas/plaguedoctor = 1,
/obj/item/clothing/suit/toggle/owlwings = 1, /obj/item/clothing/under/owl = 1,/obj/item/clothing/mask/gas/owl_mask = 1,
/obj/item/clothing/suit/toggle/owlwings/griffinwings = 1, /obj/item/clothing/under/griffin = 1, /obj/item/clothing/shoes/griffin = 1, /obj/item/clothing/head/griffin = 1,
- /obj/item/clothing/suit/apron = 1,/obj/item/clothing/under/waiter = 1,/obj/item/clothing/suit/miljacket = 1,
+ /obj/item/clothing/suit/apron = 1,/obj/item/clothing/under/waiter = 1,/obj/item/clothing/suit/jacket/miljacket = 1,
/obj/item/clothing/under/pirate = 1,/obj/item/clothing/suit/pirate = 1,/obj/item/clothing/head/pirate = 1,/obj/item/clothing/head/bandana = 1,
/obj/item/clothing/head/bandana = 1,/obj/item/clothing/under/soviet = 1,/obj/item/clothing/head/ushanka = 1,/obj/item/clothing/suit/imperium_monk = 1,
/obj/item/clothing/mask/gas/cyborg = 1,/obj/item/clothing/suit/holidaypriest = 1,/obj/item/clothing/head/wizard/marisa/fake = 1,
@@ -867,8 +871,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/item/clothing/under/maid = 1, /obj/item/clothing/under/janimaid = 1,/obj/item/clothing/glasses/cold=1,/obj/item/clothing/glasses/heat=1,
/obj/item/clothing/suit/whitedress = 1,
/obj/item/clothing/under/jester = 1, /obj/item/clothing/head/jester = 1)
- contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 1,/obj/item/clothing/glasses/sunglasses/garb = 1)
- premium = list(/obj/item/clothing/suit/hgpirate = 1, /obj/item/clothing/head/hgpiratecap = 1, /obj/item/clothing/head/helmet/roman = 1, /obj/item/clothing/head/helmet/roman/legionaire = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1, /obj/item/weapon/shield/riot/roman = 1)
+ contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 2,/obj/item/clothing/glasses/sunglasses/garb = 2)
+ premium = list(/obj/item/clothing/suit/hgpirate = 2, /obj/item/clothing/head/hgpiratecap = 2, /obj/item/clothing/head/helmet/roman = 1, /obj/item/clothing/head/helmet/roman/legionaire = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1, /obj/item/weapon/shield/riot/roman = 1)
refill_canister = /obj/item/weapon/vending_refill/autodrobe
/obj/machinery/vending/dinnerware
@@ -934,8 +938,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/item/weapon/scalpel = 2,/obj/item/weapon/circular_saw = 2,/obj/item/weapon/tank/internals/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5,
/obj/item/weapon/screwdriver = 5,/obj/item/weapon/crowbar = 5)
-//This one's from NTstation
-//don't forget to change the refill size if you change the machine's contents!
+
+//DON'T FORGET TO CHANGE THE REFILL SIZE IF YOU CHANGE THE MACHINE'S CONTENTS!
/obj/machinery/vending/clothing
name = "ClothesMate" //renamed to make the slogan rhyme
desc = "A vending machine for clothing."
@@ -950,7 +954,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/item/clothing/under/sl_suit=1,/obj/item/clothing/under/pants/jeans=3,/obj/item/clothing/under/pants/classicjeans=2,
/obj/item/clothing/under/pants/camo = 1,/obj/item/clothing/under/pants/blackjeans=2,/obj/item/clothing/under/pants/khaki=2,
/obj/item/clothing/under/pants/white=2,/obj/item/clothing/under/pants/red=1,/obj/item/clothing/under/pants/black=2,
- /obj/item/clothing/under/pants/tan=2,/obj/item/clothing/under/pants/track=1,/obj/item/clothing/suit/miljacket = 1,
+ /obj/item/clothing/under/pants/tan=2,/obj/item/clothing/under/pants/track=1,/obj/item/clothing/suit/jacket/miljacket = 1,
/obj/item/clothing/tie/blue=1, /obj/item/clothing/tie/red=1, /obj/item/clothing/tie/black=1, /obj/item/clothing/tie/horrible=1,
/obj/item/clothing/tie/scarf/red=1,/obj/item/clothing/tie/scarf/green=1,/obj/item/clothing/tie/scarf/darkblue=1,
/obj/item/clothing/tie/scarf/purple=1,/obj/item/clothing/tie/scarf/yellow=1,/obj/item/clothing/tie/scarf/orange=1,
@@ -963,7 +967,10 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/item/clothing/suit/ianshirt=1,/obj/item/clothing/shoes/laceup=2,/obj/item/clothing/shoes/sneakers/black=4,
/obj/item/clothing/shoes/sandal=1, /obj/item/clothing/gloves/fingerless=2,/obj/item/clothing/glasses/orange=1,/obj/item/clothing/glasses/red=1,
/obj/item/weapon/storage/belt/fannypack=1, /obj/item/weapon/storage/belt/fannypack/blue=1, /obj/item/weapon/storage/belt/fannypack/red=1)
- contraband = list(/obj/item/clothing/under/syndicate/tacticool=1,/obj/item/clothing/mask/balaclava=1,/obj/item/clothing/head/ushanka=1,/obj/item/clothing/under/soviet=1,/obj/item/weapon/storage/belt/fannypack/black=1)
+ contraband = list(/obj/item/clothing/under/syndicate/tacticool=1,/obj/item/clothing/mask/balaclava=1,/obj/item/clothing/head/ushanka=1,/obj/item/clothing/under/soviet=1,/obj/item/weapon/storage/belt/fannypack/black=2)
premium = list(/obj/item/clothing/under/suit_jacket/checkered=1,/obj/item/clothing/head/mailman=1,/obj/item/clothing/under/rank/mailman=1,/obj/item/clothing/suit/jacket/leather=1,/obj/item/clothing/suit/jacket/leather/overcoat=1,/obj/item/clothing/under/pants/mustangjeans=1)
refill_canister = /obj/item/weapon/vending_refill/clothing
+#undef STANDARD_CHARGE
+#undef CONTRABAND_CHARGE
+#undef COIN_CHARGE
\ No newline at end of file
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index 0fb3f9b694f..81346bf9f29 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -46,7 +46,7 @@
else
chassis.occupant << sound('sound/mecha/critdestr.ogg',volume=50)
chassis = null
- ..()
+ return ..()
/obj/item/mecha_parts/mecha_equipment/proc/critfail()
if(chassis)
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index 2182bf7b6c2..4870fb2d870 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -32,7 +32,7 @@
SSobj.processing.Remove(src)
for(var/atom/movable/AM in src)
AM.forceMove(get_turf(src))
- ..()
+ return ..()
/obj/item/mecha_parts/mecha_equipment/sleeper/Exit(atom/movable/O)
return 0
@@ -75,6 +75,7 @@
log_message("[patient] ejected. Life support functions disabled.")
patient.reset_view()
SSobj.processing.Remove(src)
+ patient = null
update_equip_info()
/obj/item/mecha_parts/mecha_equipment/sleeper/detach()
@@ -82,7 +83,6 @@
occupant_message("Unable to detach [src] - equipment occupied!")
return
SSobj.processing.Remove(src)
- update_equip_info()
return ..()
/obj/item/mecha_parts/mecha_equipment/sleeper/get_equip_info()
@@ -188,16 +188,16 @@
/obj/item/mecha_parts/mecha_equipment/sleeper/update_equip_info()
if(..())
- send_byjax(chassis.occupant,"msleeper.browser","lossinfo",get_patient_dam())
- send_byjax(chassis.occupant,"msleeper.browser","reagents",get_patient_reagents())
- send_byjax(chassis.occupant,"msleeper.browser","injectwith",get_available_reagents())
+ if(patient)
+ send_byjax(chassis.occupant,"msleeper.browser","lossinfo",get_patient_dam())
+ send_byjax(chassis.occupant,"msleeper.browser","reagents",get_patient_reagents())
+ send_byjax(chassis.occupant,"msleeper.browser","injectwith",get_available_reagents())
return 1
return
/obj/item/mecha_parts/mecha_equipment/sleeper/container_resist()
go_out()
-
/obj/item/mecha_parts/mecha_equipment/sleeper/process()
if(!chassis)
SSobj.processing.Remove(src)
@@ -259,7 +259,7 @@
/obj/item/mecha_parts/mecha_equipment/syringe_gun/Destroy()
SSobj.processing.Remove(src)
- ..()
+ return ..()
/obj/item/mecha_parts/mecha_equipment/syringe_gun/critfail()
..()
@@ -505,6 +505,7 @@
occupant_message("Reagent processing stopped.")
log_message("Reagent processing stopped.")
SSobj.processing.Remove(src)
+ return
if(anyprob(reliability))
critfail()
var/amount = synth_speed / processed_reagents.len
diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index 1ae8bb1cd2b..9f6a67799ae 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -205,7 +205,7 @@
SSobj.processing.Remove(src)
if(chassis)
chassis.overlays -= droid_overlay
- ..()
+ return ..()
/obj/item/mecha_parts/mecha_equipment/repair_droid/attach(obj/mecha/M as obj)
..()
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index ef4de9cf891..6c7b8006e47 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -317,7 +317,7 @@
/obj/item/mecha_parts/mecha_equipment/cable_layer/Destroy()
chassis.events.clearEvent("onMove",event)
- ..()
+ return ..()
/obj/item/mecha_parts/mecha_equipment/cable_layer/action(var/obj/item/stack/cable_coil/target)
if(!action_checks(target))
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index c8f2b1980fe..622686e70ec 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -269,7 +269,7 @@
updateUsrDialog()
sleep(30) //only sleep if called by user
- for(var/obj/machinery/computer/rdconsole/RDC in area_contents(get_area(src)))
+ for(var/obj/machinery/computer/rdconsole/RDC in oview(5,src))
if(!RDC.sync)
continue
for(var/datum/tech/T in RDC.files.known_tech)
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 6d9f0eef8b0..eaac2b0243a 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -133,13 +133,17 @@
equipment.Cut()
cell = null
internal_tank = null
- qdel(cabin_air)
+ if(loc)
+ loc.assume_air(cabin_air)
+ air_update_turf()
+ else
+ del(cabin_air)
cabin_air = null
qdel(spark_system)
spark_system = null
mechas_list -= src //global mech list
- ..()
+ return ..()
////////////////////////
////// Helpers /////////
@@ -234,6 +238,7 @@
var/datum/gas_mixture/leaked_gas = int_tank_air.remove_ratio(0.10)
if(loc)
loc.assume_air(leaked_gas)
+ air_update_turf()
else
del(leaked_gas)
diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm
index e6d498dd0f4..b379692d619 100644
--- a/code/game/mecha/mecha_defense.dm
+++ b/code/game/mecha/mecha_defense.dm
@@ -71,12 +71,12 @@
take_damage(damage)
check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
visible_message("[user] [user.attacktext] [src]!")
- add_logs(user, src, "attacked", admin=0)
+ add_logs(user, src, "attacked")
else
src.log_append_to_last("Armor saved.")
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
visible_message("The [user] rebounds off [src.name]'s armor!")
- add_logs(user, src, "attacked", admin=0)
+ add_logs(user, src, "attacked")
return
/obj/mecha/attack_tk()
diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm
index c0b716ab88c..c4d658f9199 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/game/mecha/working/ripley.dm
@@ -12,6 +12,7 @@
wreckage = /obj/structure/mecha_wreckage/ripley
var/list/cargo = new
var/cargo_capacity = 15
+ var/hides = 0
/obj/mecha/working/ripley/Move()
. = ..()
@@ -23,15 +24,14 @@
update_pressure()
/obj/mecha/working/ripley/Destroy()
- var/hides = round((initial(damage_absorption["brute"]) - damage_absorption["brute"])*10)
- for(var/i=0, i < hides, i++)
+ for(var/i=1, i <= hides, i++)
new /obj/item/asteroid/goliath_hide(loc) //If a goliath-plated ripley gets killed, all the plates drop
damage_absorption["brute"] = initial(damage_absorption["brute"])
for(var/atom/movable/A in cargo)
A.loc = loc
step_rand(A)
cargo.Cut()
- ..()
+ return ..()
/obj/mecha/working/ripley/go_out()
..()
@@ -47,12 +47,12 @@
/obj/mecha/working/ripley/update_icon()
..()
- if (damage_absorption["brute"] < 0.6 && damage_absorption["brute"] > 0.3)
+ if (hides)
overlays = null
- overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-open")
- else if (damage_absorption.["brute"] == 0.3)
- overlays = null
- overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-full-open")
+ if(hides < 3)
+ overlays += image("icon" = "mecha.dmi", "icon_state" = occupant ? "ripley-g" : "ripley-g-open")
+ else
+ overlays += image("icon" = "mecha.dmi", "icon_state" = occupant ? "ripley-g-full" : "ripley-g-full-open")
/obj/mecha/working/ripley/firefighter
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 8af07589f9c..07c8af45854 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -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/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index f8a00e2fd38..6aad3fe9b6c 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -193,7 +193,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.