diff --git a/code/datums/supplypacks/atmospherics.dm b/code/datums/supplypacks/atmospherics.dm index 0c8d3748d1..fdbb4cafc3 100644 --- a/code/datums/supplypacks/atmospherics.dm +++ b/code/datums/supplypacks/atmospherics.dm @@ -80,4 +80,29 @@ cost = 25 containertype = /obj/structure/closet/crate/secure/large containername = "Disposal Dispenser Crate" - access = access_atmospherics \ No newline at end of file + access = access_atmospherics + +/datum/supply_packs/atmos/internals + name = "Internals crate" + contains = list( + /obj/item/clothing/mask/gas = 3, + /obj/item/weapon/tank/air = 3 + ) + cost = 10 + containertype = /obj/structure/closet/crate/internals + containername = "Internals crate" + +/datum/supply_packs/atmos/evacuation + name = "Emergency equipment" + contains = list( + /obj/item/weapon/storage/toolbox/emergency = 2, + /obj/item/clothing/suit/storage/hazardvest = 2, + /obj/item/clothing/suit/storage/vest = 2, + /obj/item/weapon/tank/emergency_oxygen/engi = 4, + /obj/item/clothing/suit/space/emergency = 4, + /obj/item/clothing/head/helmet/space/emergency = 4, + /obj/item/clothing/mask/gas = 4 + ) + cost = 35 + containertype = /obj/structure/closet/crate/internals + containername = "Emergency crate" diff --git a/code/datums/supplypacks/contraband.dm b/code/datums/supplypacks/contraband.dm index 14761d6cd9..c33b2b120c 100644 --- a/code/datums/supplypacks/contraband.dm +++ b/code/datums/supplypacks/contraband.dm @@ -31,7 +31,7 @@ cost = 25 containertype = /obj/structure/closet/crate containername = "Special Ops crate" - hidden = 1 + contraband = 1 /datum/supply_packs/security/bolt_rifles_mosin name = "Surplus militia rifles" @@ -40,6 +40,6 @@ /obj/item/ammo_magazine/clip/a762 = 6 ) cost = 50 - hidden = 1 + contraband = 1 containertype = /obj/structure/closet/crate/secure/weapon containername = "Weapons crate" \ No newline at end of file diff --git a/code/datums/supplypacks/misc.dm b/code/datums/supplypacks/misc.dm index 21b8481854..4fa22ddc50 100644 --- a/code/datums/supplypacks/misc.dm +++ b/code/datums/supplypacks/misc.dm @@ -70,28 +70,3 @@ cost = 10 containertype = "/obj/structure/closet/crate" containername = "Webbing crate" - -/datum/supply_packs/atmos/internals - name = "Internals crate" - contains = list( - /obj/item/clothing/mask/gas = 3, - /obj/item/weapon/tank/air = 3 - ) - cost = 10 - containertype = /obj/structure/closet/crate/internals - containername = "Internals crate" - -/datum/supply_packs/atmos/evacuation - name = "Emergency equipment" - contains = list( - /obj/item/weapon/storage/toolbox/emergency = 2, - /obj/item/clothing/suit/storage/hazardvest = 2, - /obj/item/clothing/suit/storage/vest = 2, - /obj/item/weapon/tank/emergency_oxygen/engi = 4, - /obj/item/clothing/suit/space/emergency = 4, - /obj/item/clothing/head/helmet/space/emergency = 4, - /obj/item/clothing/mask/gas = 4 - ) - cost = 35 - containertype = /obj/structure/closet/crate/internals - containername = "Emergency crate" \ No newline at end of file diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index 3f143c88d6..a73ebc91ed 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -50,12 +50,19 @@ containertype = /obj/structure/closet/crate containername = "Janitorial supplies" -/datum/supply_packs/supply/boxes - name = "Empty boxes" - contains = list(/obj/item/weapon/storage/box = 10) +/datum/supply_packs/supply/shipping + name = "Shipping supplies" + contains = list( + /obj/item/stack/material/cardboard/fifty, + /obj/item/weapon/packageWrap = 4, + /obj/item/weapon/wrapping_paper = 2, + /obj/item/device/destTagger, + /obj/item/weapon/hand_labeler, + /obj/item/weapon/wirecutters, + /obj/item/weapon/tape_roll = 2) cost = 10 containertype = "/obj/structure/closet/crate" - containername = "Empty box crate" + containername = "Shipping supplies crate" /datum/supply_packs/supply/bureaucracy contains = list( diff --git a/code/game/machinery/computer/supply.dm b/code/game/machinery/computer/supply.dm index 4fcf7a737f..bb78fa00d5 100644 --- a/code/game/machinery/computer/supply.dm +++ b/code/game/machinery/computer/supply.dm @@ -8,7 +8,6 @@ circuit = /obj/item/weapon/circuitboard/supplycomp var/temp = null var/reqtime = 0 //Cooldown for requisitions - Quarxink - var/hacked = 0 var/can_order_contraband = 0 var/last_viewed_group = "categories" @@ -209,9 +208,8 @@ return /obj/machinery/computer/supplycomp/emag_act(var/remaining_charges, var/mob/user) - if(!hacked) + if(!can_order_contraband) user << "Special supplies unlocked." - hacked = 1 can_order_contraband = 1 req_access = list() return 1 @@ -267,18 +265,9 @@ temp += "Request from: [last_viewed_group]

" for(var/supply_name in supply_controller.supply_packs ) var/datum/supply_packs/N = supply_controller.supply_packs[supply_name] - if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != last_viewed_group) continue //Have to send the type instead of a reference to + if((N.contraband && !can_order_contraband) || N.group != last_viewed_group) continue //Have to send the type instead of a reference to temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage - /*temp = "Supply points: [supply_controller.points]

Request what?

" - - for(var/supply_name in supply_controller.supply_packs ) - var/datum/supply_packs/N = supply_controller.supply_packs[supply_name] - if(N.hidden && !hacked) continue - if(N.contraband && !can_order_contraband) continue - temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage - temp += "
OK"*/ - else if (href_list["doorder"]) if(world.time < reqtime) for(var/mob/V in hearers(src)) diff --git a/code/game/objects/items/weapons/circuitboards/computer/supply.dm b/code/game/objects/items/weapons/circuitboards/computer/supply.dm index 882e2714f6..5924e19ac0 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/supply.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/supply.dm @@ -1,5 +1,5 @@ #ifndef T_BOARD -#error T_BOARD macro is not defined but we need it! +#error T_BOARD macro is not defined but we need it! #endif /obj/item/weapon/circuitboard/supplycomp @@ -28,7 +28,6 @@ catastasis = "STANDARD" switch( alert("Current receiver spectrum is set to: [catastasis]","Multitool-Circuitboard interface","Switch to [opposite_catastasis]","Cancel") ) - //switch( alert("Current receiver spectrum is set to: " {(src.contraband_enabled) ? ("BROAD") : ("STANDARD")} , "Multitool-Circuitboard interface" , "Switch to " {(src.contraband_enabled) ? ("STANDARD") : ("BROAD")}, "Cancel") ) if("Switch to STANDARD","Switch to BROAD") src.contraband_enabled = !src.contraband_enabled diff --git a/code/modules/reagents/reagent_containers/drinkingglass/drinkingglass.dm b/code/modules/reagents/reagent_containers/drinkingglass/drinkingglass.dm index c367d8b09c..8d19e49330 100644 --- a/code/modules/reagents/reagent_containers/drinkingglass/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/drinkingglass/drinkingglass.dm @@ -25,6 +25,8 @@ possible_transfer_amounts = list(5,10,15,30) flags = OPENCONTAINER + matter = list("glass" = 60) + /obj/item/weapon/reagent_containers/food/drinks/glass2/examine(mob/M as mob) ..() diff --git a/code/modules/reagents/reagent_containers/drinkingglass/glass_types.dm b/code/modules/reagents/reagent_containers/drinkingglass/glass_types.dm index feec8bf16e..a0d484ddab 100644 --- a/code/modules/reagents/reagent_containers/drinkingglass/glass_types.dm +++ b/code/modules/reagents/reagent_containers/drinkingglass/glass_types.dm @@ -7,6 +7,7 @@ volume = 30 possible_transfer_amounts = list(5,10,15,30) rim_pos = list(23,13,20) // y, x0, x1 + matter = list("glass" = 60) /obj/item/weapon/reagent_containers/food/drinks/glass2/rocks name = "rocks glass" @@ -16,6 +17,7 @@ volume = 20 possible_transfer_amounts = list(5,10,20) rim_pos = list(21, 10, 23) + matter = list("glass" = 40) /obj/item/weapon/reagent_containers/food/drinks/glass2/shake name = "milkshake glass" @@ -25,6 +27,7 @@ volume = 30 possible_transfer_amounts = list(5,10,15,30) rim_pos = list(25, 13, 21) + matter = list("glass" = 30) /obj/item/weapon/reagent_containers/food/drinks/glass2/cocktail name = "cocktail glass" @@ -34,6 +37,7 @@ volume = 15 possible_transfer_amounts = list(5,10,15) rim_pos = list(22, 13, 21) + matter = list("glass" = 30) /obj/item/weapon/reagent_containers/food/drinks/glass2/shot name = "shot glass" @@ -43,6 +47,7 @@ volume = 5 possible_transfer_amounts = list(1,2,5) rim_pos = list(17, 13, 21) + matter = list("glass" = 10) /obj/item/weapon/reagent_containers/food/drinks/glass2/pint name = "pint glass" @@ -52,6 +57,7 @@ volume = 60 possible_transfer_amounts = list(5,10,15,30,60) rim_pos = list(25, 12, 21) + matter = list("glass" = 120) /obj/item/weapon/reagent_containers/food/drinks/glass2/mug name = "glass mug" @@ -61,6 +67,7 @@ volume = 40 possible_transfer_amounts = list(5,10,20,40) rim_pos = list(22, 12, 20) + matter = list("glass" = 80) /obj/item/weapon/reagent_containers/food/drinks/glass2/wine name = "wine glass" @@ -70,3 +77,4 @@ volume = 25 possible_transfer_amounts = list(5, 10, 15, 25) rim_pos = list(25, 12, 21) + matter = list("glass" = 50) \ No newline at end of file diff --git a/html/changelogs/Yoshax - MoreCargoStuff.yml b/html/changelogs/Yoshax - MoreCargoStuff.yml new file mode 100644 index 0000000000..53df2eb63e --- /dev/null +++ b/html/changelogs/Yoshax - MoreCargoStuff.yml @@ -0,0 +1,38 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Yoshax + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "The empty box supply crate has been replaced with a shipping crate. Which contains what you need to send stuff places!" + - maptweak: "The chef now gets a destination tagger and packaging paper to send people food." + - bugfix: "Drinking glasses now have a material cost in the autolathe." \ No newline at end of file diff --git a/maps/polaris-1.dmm b/maps/polaris-1.dmm index 125178d8a2..7fa1ea0985 100644 --- a/maps/polaris-1.dmm +++ b/maps/polaris-1.dmm @@ -1259,7 +1259,7 @@ "ayk" = (/obj/structure/closet/secure_closet/medical3,/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/effect/floor_decal/corner/paleblue/full{dir = 1},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "ayl" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/reagentgrinder,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "aym" = (/turf/simulated/floor/tiled,/area/hallway/secondary/chapel_hallway) -"ayn" = (/obj/structure/closet/chefcloset,/obj/item/glass_jar,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/device/retail_scanner/civilian,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) +"ayn" = (/obj/structure/closet/chefcloset,/obj/item/glass_jar,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/device/retail_scanner/civilian,/obj/item/weapon/soap/nanotrasen,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "ayo" = (/obj/structure/table/standard,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_5) "ayp" = (/obj/structure/closet/emcloset,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/chapel_hallway) "ayq" = (/obj/structure/table/standard,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_6)