diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 5cdb49657a..931a990085 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -8,6 +8,7 @@ icon_opened = "crateopen" icon_closed = "crate" climbable = 1 + var/points_per_crate = 5 // mouse_drag_pointer = MOUSE_ACTIVE_POINTER //??? var/rigged = 0 @@ -240,6 +241,7 @@ icon_state = "plasticcrate" icon_opened = "plasticcrateopen" icon_closed = "plasticcrate" + points_per_crate = 1 //5 crates per ordered crate, +5 for the crate it comes in. /obj/structure/closet/crate/internals name = "internals crate" diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 88cddb79da..e3b8e0d2ec 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -138,9 +138,8 @@ var/list/mechtoys = list( /datum/controller/supply //supply points var/points = 50 - var/points_per_process = 1 + var/points_per_process = 1.5 var/points_per_slip = 2 - var/points_per_crate = 5 var/points_per_platinum = 5 // 5 points per sheet var/points_per_phoron = 5 //control @@ -193,12 +192,13 @@ var/list/mechtoys = list( // Must be in a crate! if(istype(MA,/obj/structure/closet/crate)) - callHook("sell_crate", list(MA, area_shuttle)) + var/obj/structure/closet/crate/CR = MA + callHook("sell_crate", list(CR, area_shuttle)) - points += points_per_crate + points += CR.points_per_crate var/find_slip = 1 - for(var/atom in MA) + for(var/atom in CR) // Sell manifests var/atom/A = atom if(find_slip && istype(A,/obj/item/weapon/paper/manifest)) diff --git a/html/changelogs/Anewbe - Cargo.yml b/html/changelogs/Anewbe - Cargo.yml new file mode 100644 index 0000000000..ecae40bdd0 --- /dev/null +++ b/html/changelogs/Anewbe - Cargo.yml @@ -0,0 +1,37 @@ +################################ +# 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: Anewbe + +# 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: + - bugfix: "Removed the exploit by which you could gain cargo points by ordering plastic crates." + - rscadd: "Upped cargo point gain by 50%."